aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move settings to an appChristoph Wurst2019-09-28320-314/+902
| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* Remove input id on login form (#17294)John Molakvoæ2019-09-2825-160/+163
|\ | | | | Remove input id on login form
| * Remove input id on login formJohn Molakvoæ (skjnldsv)2019-09-2825-160/+163
| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | [tx-robot] updated from transifexNextcloud bot2019-09-2822-8/+110
| |
* | Merge pull request #17258 from nextcloud/smb-timeout-configRoeland Jago Douma2019-09-272-1/+11
|\ \ | | | | | | add (hidden) option to configure smb timeout
| * | Update apps/files_external/lib/Lib/Backend/SMB.phpRobin Appelman2019-09-251-1/+1
| | | | | | | | | Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
| * | add (hidden) option to configure smb timeoutRobin Appelman2019-09-252-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | hidden from ui to prevent clutter ```occ files_external:config <mount> timeout 30``` Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #17286 from ↵Joas Schilling2019-09-271-1/+1
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/bugfix/noid/correctly-detect-mimetype-from-uploads Correctly detect the mimetype from uploads
| * | Correctly detect the mimetype from uploadsJoas Schilling2019-09-261-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #17245 from nextcloud/bugfix/noid/fix-migrationRoeland Jago Douma2019-09-263-3/+12
|\ \ \ | |/ / |/| | Fix "Cannot add a NOT NULL column with default value NULL"
| * | Fix "Cannot add a NOT NULL column with default value NULL"Joas Schilling2019-09-263-3/+12
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #17264 from nextcloud/move-from-storage-wrappersRoeland Jago Douma2019-09-263-21/+134
|\ \ | | | | | | handle moveFromStorage within the same storage even when storage wrap…
| * | handle moveFromStorage within the same storage even when storage wrappers ↵Robin Appelman2019-09-253-21/+134
| |/ | | | | | | | | | | | | | | | | | | are applied to the source storage the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #14913 from nextcloud/bugfix/6954/scan-external-s3Roeland Jago Douma2019-09-261-4/+51
|\ \ | | | | | | Fix directory detection for s3
| * | Use local variable for directory nameDaniel Kesselberg2019-09-231-2/+3
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Don't strip path from directory prefixDaniel Kesselberg2019-09-231-1/+6
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Fill directory cache from opendirDaniel Kesselberg2019-09-231-1/+3
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Change visibility to private (from protected)Daniel Kesselberg2019-09-231-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Rename $location to $pathDaniel Kesselberg2019-09-231-7/+7
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Add method to check if directory existsDaniel Kesselberg2019-09-231-2/+41
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #17252 from nextcloud/bugfix/noid/user-0-can-not-commentRoeland Jago Douma2019-09-262-5/+5
|\ \ \ | | | | | | | | Fix user with id 0 to be able to comment
| * | | Fix user with id 0 to be able to commentJoas Schilling2019-09-252-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-deleteRoeland Jago Douma2019-09-263-3/+90
|\ \ \ \ | | | | | | | | | | dont delete cache entries if deleting an object from object store failed
| * | | | dont delete cache entries if deleting an object from object store failedRobin Appelman2019-09-253-3/+90
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #17181 from nextcloud/feature/noid/talk-attachmentJoas Schilling2019-09-261-0/+37
|\ \ \ \ | | | | | | | | | | Add talk-attachment as a rich object type
| * | | | Add talk-attachment as a rich object typeJoas Schilling2019-09-171-0/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-09-262-0/+12
| | | | |
* | | | | Merge pull request #17254 from nextcloud/fix/double_escapeRoeland Jago Douma2019-09-257-49/+50
|\ \ \ \ \ | | | | | | | | | | | | Properly import DOMPurify in l10n.js
| * | | | | Properly import DOMPurify in l10n.jsRoeland Jago Douma2019-09-257-49/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bunch of warning in the console. And fixed the doube escaping. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Fix spaces being collapsed in move dialog (#17240)John Molakvoæ2019-09-251-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix spaces being collapsed in move dialog
| * | | | | Fix spaces being collapsed in move dialogGary Kim2019-09-241-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | Merge pull request #17253 from nextcloud/fix/apptoken_creationRoeland Jago Douma2019-09-255-6/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix apptoken creation
| * | | | | Fix apptoken creationRoeland Jago Douma2019-09-255-6/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems there was a small bug in #15936 This inverts the check and add the property Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-09-2528-208/+488
| | | | |
* | | | | Merge pull request #16641 from nextcloud/enh/files_additionalscriptsRoeland Jago Douma2019-09-2411-19/+168
|\ \ \ \ \ | |_|_|_|/ |/| | | | Files additionalscripts to real event
| * | | | Move over comments to the new eventRoeland Jago Douma2019-09-234-9/+51
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add new LoadAdditionalScriptsEventRoeland Jago Douma2019-09-237-10/+117
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This adds a new event that is in the new style of event dispatching. This should allow more lazy loading and better sepeartion of concerns Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / [tx-robot] updated from transifexNextcloud bot2019-09-2434-180/+200
|/ / /
* | | Merge pull request #17163 from ↵Roeland Jago Douma2019-09-232-21/+26
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/print-error-on-data-dir-error Print error on data dir error
| * | | Print the error pages as error so we load less scripts and might be able to ↵Joas Schilling2019-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | view it Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Print plain error when the error page errors tooJoas Schilling2019-09-161-20/+25
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #17232 from ↵Roeland Jago Douma2019-09-232-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/handlebars-4.2.1 Bump handlebars from 4.2.0 to 4.2.1 in /build
| * | | | Bump handlebars from 4.2.0 to 4.2.1 in /builddependabot-preview[bot]2019-09-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/v4.2.1/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | Merge pull request #17234 from nextcloud/dependabot/npm_and_yarn/dompurify-2.0.1Roeland Jago Douma2019-09-238-12/+12
|\ \ \ \ \ | |/ / / / |/| | | | Bump dompurify from 2.0.0 to 2.0.1
| * | | | Bump dompurify from 2.0.0 to 2.0.1dependabot-preview[bot]2019-09-238-12/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.0.0...2.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #17233 from ↵Roeland Jago Douma2019-09-2210-148/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/handlebars-4.2.1 Bump handlebars from 4.2.0 to 4.2.1
| * | | | Bump handlebars from 4.2.0 to 4.2.1dependabot-preview[bot]2019-09-2210-155/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/v4.2.1/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | Merge pull request #17235 from ↵Roeland Jago Douma2019-09-222-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-cli-3.3.9 Bump webpack-cli from 3.3.8 to 3.3.9
| * | | | | Bump webpack-cli from 3.3.8 to 3.3.9dependabot-preview[bot]2019-09-222-11/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.8 to 3.3.9. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.9/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.8...v3.3.9) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* / / / / [tx-robot] updated from transifexNextcloud bot2019-09-222-0/+4
|/ / / /