summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update logic for forwardedForHeadersWorkingDaniel Kesselberg2018-10-252-28/+31
| | | | | | | | As discussed in https://github.com/nextcloud/server/issues/11594 when discovering if x-forwarded-for is working properly its not possible to use getRemoteAddr because the "client ip" is returned. For this check the ip of the last hop would be required. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Add REMOTE_ADDR to getHeaderDaniel Kesselberg2018-10-251-2/+6
| | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Merge pull request #12016 from nextcloud/wip/noid/icon-base64Morris Jobke2018-10-255-37/+122
|\ | | | | Directly embed icons into the icon-vars css file
| * Keep list of icons in a separate file for use in the accessibility appJulius Härtl2018-10-255-68/+106
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Remove default which didn't workJulius Härtl2018-10-251-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Properly track data urls as wellJulius Härtl2018-10-251-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Directly embed icons into the icon-vars css fileJulius Härtl2018-10-251-1/+48
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #11988 from nextcloud/docs/jsdoc-buildMorris Jobke2018-10-2514-5301/+3770
|\ \ | | | | | | JSdoc build fixes and move build script out of the root folder
| * | Remove buildjsdocs.sh from files checkerJulius Härtl2018-10-251-1/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Adjust some jsdocsJulius Härtl2018-10-247-8/+24
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix jsdocs build on server repoJulius Härtl2018-10-246-5292/+3746
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #11893 from caugner/7837-filesize-format-with-localeMorris Jobke2018-10-252-0/+71
|\ \ \ | | | | | | | | Formats file sizes using the user's locale
| * | | OC.getCanonicalLocale: fix testsClaas Augner2018-10-241-4/+8
| | | | | | | | | | | | Signed-off-by: Claas Augner <git@caugner.de>
| * | | humanFileSize: use toLocaleStringClaas Augner2018-10-242-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | humanFileSize: add test with locale humanFileSize: use canonical locale humanFileSize: skip test w/o toLocaleString support humanFileSize: stub getCanonicalLocale OC.getCanonicalLocale: cover undefined case humanFileSize: fix getCanonicalLocale stub Signed-off-by: Claas Augner <git@caugner.de>
* | | | Merge pull request #12039 from ↵Morris Jobke2018-10-251-6/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/fix-javascript-unit-tests-for-versionmodel-js Fix JavaScript unit tests for "versionmodel.js"
| * | | Set error expected by the DAV client for a failed moveDaniel Calviño Sánchez2018-10-251-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A revert triggers a move in the DAV client, and the DAV client expects a DAV error message to be provided by the server in case of failure; if no error message is given the client ends trying to get an attribute from an undefined object and "crashes". Besides that, if the revert fails the "done" callback of the promise (the first parameter of "then") is never called, so a "fail" callback should be used instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Wait for the promise to be fulfilled before running the next testDaniel Calviño Sánchez2018-10-251-4/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Jasmine 2.5 the "it" function takes an optional parameter that should be called when the async work is completed (returning a promise was introduced in Jasmine 2.7, so it is not supported yet in the tests). If the parameter is not declared then the next test is executed without waiting for the asynchronous work in the previous one to finish, which could cause that asynchronous work to finish while a different test is being run. Note that if that happens the test could still work as expected if it relied only in local variables. However, in the case of the successful revert tests, the stubs being checked are not the ones created when that test was initialized, but the ones created when the next test, the failed revert test, was initialized and the previous variables were replaced (although the model itself calls the proper stubs, as they are set through parameters in function calls). Besides all that, the checks in the failed revert test were never executed due to a different problem which will be fixed in the next commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-10-2538-52/+108
| | |
* | | Merge pull request #11889 from stweil/lgtmMorris Jobke2018-10-241-1/+1
|\ \ \ | | | | | | | | Remove replace call which does not replace anything
| * | | Remove replace call which does not replace anythingStefan Weil2018-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The original code replaced / by /. Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | | Merge pull request #12022 from nextcloud/fix/11485/fix_chuncked_uploadsMorris Jobke2018-10-241-1/+1
|\ \ \ \ | | | | | | | | | | Allow chunked uploads even if your quota is not sufficient
| * | | | Allow chunked uploads even if your quota is not sufficientRoeland Jago Douma2018-10-241-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11485 This allows uploads to shared folders. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #12018 from nextcloud/improve-encrypt-allMorris Jobke2018-10-244-10/+76
|\ \ \ \ | |_|_|/ |/| | | Improve encrypt all / decrypt all
| * | | skip already decrypted files on decrypt all commandBjoern Schiessle2018-10-242-10/+37
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | skip already encrypted files on encrypt all commandBjoern Schiessle2018-10-242-0/+39
|/ / / | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #11573 from nextcloud/gridview-tableMorris Jobke2018-10-2428-29/+483
|\ \ \ | | | | | | | | Files grid view
| * | | Fix FF performance and recals issuesJohn Molakvoæ (skjnldsv)2018-10-231-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Allow focus on input with keyboardJohn Molakvoæ (skjnldsv)2018-10-234-5/+11
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Restore table headJohn Molakvoæ (skjnldsv)2018-10-231-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Merge branch 'master' of https://github.com/nextcloud/server into gridview-tableJohn Molakvoæ (skjnldsv)2018-10-23132-793/+1637
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Add filepicker toggleJohn Molakvoæ (skjnldsv)2018-10-235-1/+72
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Filepicker gridJohn Molakvoæ (skjnldsv)2018-10-232-2/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Use preview-x & preview-y on public pagesJohn Molakvoæ (skjnldsv)2018-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix public background overrideJohn Molakvoæ (skjnldsv)2018-10-231-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Public fixes, request & default to gridJohn Molakvoæ (skjnldsv)2018-10-232-3/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Tooltip on hover onlyJohn Molakvoæ (skjnldsv)2018-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix grey background over thumbnailJohn Molakvoæ (skjnldsv)2018-10-231-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix table hidden on empty folderJohn Molakvoæ (skjnldsv)2018-10-231-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix translucent controls bar for dark themesJan-Christoph Borchardt2018-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Revert "Remove negative z-index on thumbnail-wrapper, caused thumbnails to ↵Jan-Christoph Borchardt2018-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not show" This reverts commit fb7fb1cebae5af129c4474a380e0f5e55f79569f. Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Reduce bottom whitespace on share link pageJan-Christoph Borchardt2018-10-181-3/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | More space for filename on public share page since there is no share iconJan-Christoph Borchardt2018-10-181-3/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Add back slightly translucent background for controls barJan-Christoph Borchardt2018-10-183-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | In "Deleted files", do not show "Restore" text next to icon as there is no spaceJan-Christoph Borchardt2018-10-181-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Fix tabbability to view-toggle, action on Enter to be fixedJan-Christoph Borchardt2018-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Adjustments for public share page, actions menu, view toggleJan-Christoph Borchardt2018-10-181-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Remove negative z-index on thumbnail-wrapper, caused thumbnails to not showJan-Christoph Borchardt2018-10-181-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | If there is a comment, show it instead of the share iconJan-Christoph Borchardt2018-10-181-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | If an avatar is present, show that instead of the iconJan-Christoph Borchardt2018-10-181-5/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Border radiusJohn Molakvoæ (skjnldsv)2018-10-181-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>