summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-06-14338-3476/+3040
|
* Merge pull request #9846 from nextcloud/feature/noid/add_stricter_cspsJohn Molakvoæ2018-06-136-2/+198
|\ | | | | Add stricter CSPs
| * Add stricter CSPsRoeland Jago Douma2018-06-136-2/+198
| | | | | | | | | | | | | | | | | | | | | | | | * Deprecate our default CSP * Add strict CSP that is always our strictest setting * Add strict eval CSP (disable unsafe-eval) * Add strict inline CSP (disables inline styles) This is just to move forward and have a incremental improvement of our CSP Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9859 from nextcloud/fix/noid/iconcontroller_timing_fixMorris Jobke2018-06-132-8/+4
|\ \ | | | | | | Fix possible test timing issues in IconController
| * | Fix possible test timing issues in IconControllerRoeland Jago Douma2018-06-132-8/+4
| |/ | | | | | | | | | | | | Since the response now handles the caching. We need to provide a default ITimeFactory mock. Else you might have failing tests. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9855 from ↵Roeland Jago Douma2018-06-135-0/+144
|\ \ | | | | | | | | | | | | nextcloud/feature/noid/cleanup-old-updater-backup-dirs Background job to clean up old backups of the updater
| * | Background job to clean up old backups of the updaterMorris Jobke2018-06-135-0/+144
| |/ | | | | | | | | | | | | * a one-time job gets scheduled after each update via a repair job * the job remove all directories inside data/updater-INSTANCEID/backups except the 3 most recent ones (determined by mtime of the folder) Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9852 from ↵Morris Jobke2018-06-138-240/+374
|\ \ | |/ |/| | | | | nextcloud/feature/noid/merge-setup-checks-into-one-controller Merge all setup checks into one controller
| * Merge all setup checks into one controllerMorris Jobke2018-06-138-240/+374
|/ | | | | | * renamed hasMissingIndexes to missingIndexes Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #9836 from ↵Morris Jobke2018-06-1315-246/+69
|\ | | | | | | | | nextcloud/feature/noid/merge-tips-and-tricks-into-setup-checks Merge tips & tricks section into setup checks
| * Merge tips & tricks section into setup checksMorris Jobke2018-06-1315-246/+69
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9850 from nextcloud/fix/noid/setup-check-empty-indexMorris Jobke2018-06-134-19/+25
|\ \ | |/ |/| Fix wrong hint about missing indexes
| * Fix wrong hint about missing indexesMorris Jobke2018-06-134-19/+25
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9833 from ↵John Molakvoæ2018-06-1312-71/+82
|\ \ | | | | | | | | | | | | nextcloud/dependabot/composer/build/integration/phpunit/phpunit-approx-6.5 Update phpunit/phpunit requirement to ~6.5 in /build/integration
| * | Fixed phpunit Test classJohn Molakvoæ (skjnldsv)2018-06-1311-70/+81
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Update phpunit/phpunit requirement to ~6.5 in /build/integrationdependabot[bot]2018-06-131-1/+1
|/ / | | | | | | | | | | | | | | Updates the requirements on [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) to permit the latest version. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-6.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/commits/6.5.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
* / [tx-robot] updated from transifexNextcloud bot2018-06-13196-1634/+1856
|/
* Merge pull request #9834 from nextcloud/copy-fixJohn Molakvoæ2018-06-1230-48/+460
|\ | | | | Copyright fix, changed vue settings output name and fixes template name
| * Fixed testsJohn Molakvoæ (skjnldsv)2018-06-123-4/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Indent fix and copy2John Molakvoæ (skjnldsv)2018-06-122-10/+17
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Copyright fix, changed vue settings output name and fixes template nameJohn Molakvoæ (skjnldsv)2018-06-1227-23/+429
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #9828 from nextcloud/gc-s3-listMorris Jobke2018-06-121-0/+5
|\ \ | | | | | | Fix listing s3 objects when using google cloud aws compatibility
| * | Fix listing s3 objects when using google cloud aws compatibilityRobin Appelman2018-06-111-0/+5
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-06-1256-2/+158
| | |
* | | Merge pull request #9473 from nextcloud/dav-upload-no-partfile-lockMorris Jobke2018-06-111-15/+23
|\ \ \ | |/ / |/| | properly lock the target file on dav upload when not using part files
| * | properly lock the target file on dav upload when not using part filesRobin Appelman2018-06-111-15/+23
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #9558 from nextcloud/fix/9489/trashbin_previewsMorris Jobke2018-06-115-55/+73
|\ \ | |/ |/| Previews on for all trashbin files
| * Previews on for all trashbin filesRoeland Jago Douma2018-06-055-55/+73
| | | | | | | | | | | | | | | | | | | | * Previews possible for all files in the trashbin * Set caching * Use the fileid to find the file * Fix test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9814 from nextcloud/bugfix/6032/delete_group_with_slashMorris Jobke2018-06-111-1/+1
|\ \ | | | | | | Make the DELETION of groups match greedy on the groupID
| * | Make the DELETION of groups match greedy on the groupIDRoeland Jago Douma2018-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | fixes #6032 Now since the match is greedy it will also eat the / Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9810 from nextcloud/tests/9769/apps-management-acceptanceJohn Molakvoæ2018-06-1110-5/+354
|\ \ \ | | | | | | | | Acceptance tests for apps management and minor fixes
| * | | Update asettings bundled javascriptJulius Härtl2018-06-092-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add key and fix disabled apps listingJulius Härtl2018-06-091-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Properly check for the sidebarJulius Härtl2018-06-092-3/+26
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add category field to apps that are only known from the app storeJulius Härtl2018-06-091-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Add basic acceptance tests for apps managementJulius Härtl2018-06-096-1/+326
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #9807 from nextcloud/fix-highlighting-of-the-upload-drop-zoneJohn Molakvoæ2018-06-112-16/+36
|\ \ \ \ | | | | | | | | | | Fix highlighting of the upload drop zone
| * | | | Do not show an error message when draging and dropping textDaniel Calviño Sánchez2018-06-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the browser reports a drag of items other than files (for example, text) and then triggers a drop event with no files no error message should be shown to the user, as in that case there would be no highlight of the drop zone and no indication that the drop would be valid (except for the mouse cursor); the error message should be shown only when the drop event with no files follows a file drag. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Remove no longer needed special handling for FirefoxDaniel Calviño Sánchez2018-06-081-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The highlighting was removed in Firefox when the cursor was no longer moving to handle the behaviour of reporting a file drag and then providing no files in the drop event. That behaviour (which was only present in Firefox 48 and 49) is already handled with the "dropnofiles" callback, so that special handling is no longer needed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Use "dropnofiles" callback to disable the drop state in the UIDaniel Calviño Sánchez2018-06-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a file is dragged from the desktop to the file list the file list is highlighted, and when the file is finally dropped or the drag operation is cancelled the highlighting is removed. In some cases, due to a wrong implementation, a browser may end a file drag with a drop with no files (for example, when a folder or text is dragged), which would cause the highlight to not be removed. Now those cases are handled with the "dropnofiles" callback, which restores the UI and also shows a message to the user. The error message is just a generic one, as in some cases it is not even possible to know whether the problem came from a text drag or a folder drag, and whether the problem appears or not depends on the browser, version and even operating system. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Add callback to clean up after misbehaved drag and drop eventsDaniel Calviño Sánchez2018-06-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The jQuery Plugin triggers the "dragover" callback when the browser triggers the "dragover" event and the types in their DataTransfer include a "Files" item. It also triggers the "drop" callback when the browser triggers the "drop" event and the list of files in its DataTransfer is not empty. Unfortunately some browsers may trigger "dragover" events with a DataTransfer that includes a "Files" item and then trigger a "drop" event with an empty list of files. When that happens the actions performed in the "dragXXX" callbacks could be left hanging if they were expected to be finished in the "drop" callback (for example, if the drop zone was highlighted during the drag to be then restored when the file was finally dropped). This commit adds the "dropnofiles" callback to be able to handle those situations. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Remove duplicated codeDaniel Calviño Sánchez2018-06-081-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "disableDropState" was set as the event handler in 8d4e5747f386a0, but the duplicated code was accidentally added back in 786e858d23c4a4. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #9798 from ↵Morris Jobke2018-06-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/enable_caldav_for_public_calendars enable caldav for webdav subtree public-calendars
| * | | | | enable caldav for webdav subtree public-calendarsGeorg Ehrke2018-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-116-0/+18
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-1010-4/+32
| |_|_|/ / |/| | | |
* | | | | Merge pull request #9802 from nextcloud/bugfix/noid/token_check_expire_betterMorris Jobke2018-06-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Make the token expiration also work for autocasting 0
| * | | | | Make the token expiration also work for autocasting 0Roeland Jago Douma2018-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some bad databases don't respect the default null apprently. Now even if they cast it to 0 it should work just fine. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-0932-0/+108
| | | | | |
* | | | | | Merge pull request #9793 from nextcloud/fix-mention-regexJohn Molakvoæ2018-06-082-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix mentions regex