aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2019-09-216-2/+126
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2019-09-204-0/+32
| | | |
* | | | Merge pull request #17017 from ritsute/fix/css-actions.creatableRoeland Jago Douma2019-09-191-2/+2
|\ \ \ \ | | | | | | | | | | fix "create folder" icon overlaying home icon
| * | | | fix "create folder" icon overlaying home iconritsute2019-09-061-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Brandon <brandon.yeow@websparks.sg>
* | | | | Merge pull request #17206 from nextcloud/logger-catch-exceptionsRoeland Jago Douma2019-09-191-24/+31
|\ \ \ \ \ | | | | | | | | | | | | catch exceptions that occur during logging
| * | | | | catch exceptions that occur during loggingRobin Appelman2019-09-191-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #17207 from nextcloud/fix/federated-file-sharing-l10nJoas Schilling2019-09-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix l10n in federated file sharing
| * | | | | Fix l10n in federated file sharingChristoph Wurst2019-09-191-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-09-1952-8/+420
| | | | |
* | | | | Merge pull request #17201 from ↵Roeland Jago Douma2019-09-182-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/tiny_authentication_bug_mostly_affecting_french_people Use the actual password to update the tokens
| * | | | | Use the actual password to update the tokensRoeland Jago Douma2019-09-182-3/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #17194 from ↵Roeland Jago Douma2019-09-181-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/17166/delete-temp-tokens-only-for-current-user Add uid to delete temp token query
| * | | | | Add uid to delete temp token queryDaniel Kesselberg2019-09-181-1/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #17175 from ↵Roeland Jago Douma2019-09-181-0/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/noid/make-getById-work-for-files-in-appdata Fix getById for files in appdata and the root mount
| * | | | | Fix getById for files in appdata and the root mountJoas Schilling2019-09-171-0/+44
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the path we are currently in is inside the appdata_* folder, the original getById method does not work, because it can only look inside the user's mount points. But the user has no mount point for the root storage. So in that case we directly check the mount of the root if it contains the id. If it does we check if the path is inside the path we are working in. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-09-1894-168/+430
| | | | |
* | | | | Add theme class to body and fix for theme selection (#16929)John Molakvoæ2019-09-1817-44/+203
|\ \ \ \ \ | | | | | | | | | | | | Add theme class to body and fix for theme selection
| * | | | | Removed duplicate defintion of app name and rebased/rebuilt.Janis Köhr2019-09-164-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Janis Köhr <janis.koehr@novatec-gmbh.de>
| * | | | | Added copyright for contributionJanis Köhr2019-09-165-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Janis Köhr <janis.koehr@novatec-gmbh.de>
| * | | | | Change name of high contrast theme to high contrast modeJanis Köhr2019-09-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Janis Köhr <janis.koehr@novatec-gmbh.de>
| * | | | | Add highcontrast style for dark modeJanis Köhr2019-09-162-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Janis Köhr <janis.koehr@novatec-gmbh.de>
| * | | | | Changed highcontrast from array (theme) to object (flag/filter)Janis Köhr2019-09-165-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Janis Köhr <janis.koehr@novatec-gmbh.de>