aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15859 from nextcloud/deprecate/oc-redirect-reloadRoeland Jago Douma2019-06-264-3/+5
|\ | | | | Deprecate window.location wrappers for redirect and reload
| * Deprecate window.location wrappers for redirect and reloadChristoph Wurst2019-06-254-3/+5
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | [tx-robot] updated from transifexNextcloud bot2019-06-2610-2/+68
| |
* | Merge pull request #16055 from nextcloud/design/native-fontsJan-Christoph Borchardt2019-06-2637-140/+43
|\ \ | | | | | | Use native font stack
| * | Use native font stackJan-Christoph Borchardt2019-06-247-299/+6
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Move font from Nunito to Noto SansJan-Christoph Borchardt2019-06-2236-113/+309
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #16021 from ↵Roeland Jago Douma2019-06-252-0/+6
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fall-back-to-black-for-non-color-values Fall back to black for non-color values
| * | | Fall back to black for non-color valuesJoas Schilling2019-06-202-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #16027 from ↵Roeland Jago Douma2019-06-251-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/check-if-uploading-is-enabled-before-verifying Check if uploading to lookup server is enabled before verifying
| * | | | Check if uploading to lookup server is enabled before verifyingJoas Schilling2019-06-211-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #15832 from ↵Roeland Jago Douma2019-06-252-2/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | nextcloud/bugfix/noid/fulltext-search-groupfolders Fix full text search for groupfolders
| * | | | Fix full text search for groupfoldersMorris Jobke2019-06-172-2/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #15956 from nextcloud/bugfix/noid/fix_checkapp_occRoeland Jago Douma2019-06-251-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix appid argument for integrity:check-app
| * | | | | Fix appid argument for integrity:check-appGeorg Ehrke2019-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #15970 from ↵Roeland Jago Douma2019-06-2531-89/+98
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-loader-3.0.0 Bump css-loader from 2.1.1 to 3.0.0
| * | | | | | Bump css-loader from 2.1.1 to 3.0.0dependabot-preview[bot]2019-06-2531-89/+98
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v2.1.1...v3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #16013 from nextcloud/versions-preview-string-idRoeland Jago Douma2019-06-256-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix previews of versions with non numeric version ids
| * | | | | | fix previews and rollback of versions with non numeric version idsRobin Appelman2019-06-196-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #15870 from nextcloud/preview-provider-v2Roeland Jago Douma2019-06-2536-138/+353
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add new Provider interface for preview providers
| * | | | | | Add new Provider interface for preview providersRobin Appelman2019-06-1736-138/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the main difference is passing the `File` object to the provider instead of a `View` + path Old providers will still continue to work as before Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #15971 from ↵Roeland Jago Douma2019-06-251-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/tests/ui-regression/pixelmatch-tw-5.0.2 Update pixelmatch requirement from ^4.0.2 to ^5.0.2 in /tests/ui-regression
| * | | | | | | Update pixelmatch requirement in /tests/ui-regressiondependabot-preview[bot]2019-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [pixelmatch](https://github.com/mapbox/pixelmatch) to permit the latest version. - [Release notes](https://github.com/mapbox/pixelmatch/releases) - [Commits](https://github.com/mapbox/pixelmatch/compare/v4.0.2...v5.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | | Merge pull request #16024 from ↵Roeland Jago Douma2019-06-251-1/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/15944/fix-return-code-user-provision Forward OCSException to initiator
| * | | | | | | | Forward OCSException to initiatorDaniel Kesselberg2019-06-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | Merge pull request #15777 from nextcloud/feature/ocp-event-dispatcherRoeland Jago Douma2019-06-2537-123/+524
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add event dispatcher to OCP
| * | | | | | | | | Add event dispatcher to OCPChristoph Wurst2019-06-2537-123/+524
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2518-24/+152
| | | | | | | | |
* | | | | | | | | Merge pull request #16043 from ↵Roeland Jago Douma2019-06-246-21/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/dompurify-1.0.11 Bump dompurify from 1.0.10 to 1.0.11
| * | | | | | | | | Bump dompurify from 1.0.10 to 1.0.11dependabot-preview[bot]2019-06-246-21/+21
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 1.0.10 to 1.0.11. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/1.0.10...1.0.11) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | Merge pull request #16044 from nextcloud/dependabot/npm_and_yarn/webpack-4.35.0Roeland Jago Douma2019-06-242-10/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump webpack from 4.34.0 to 4.35.0
| * | | | | | | | | Bump webpack from 4.34.0 to 4.35.0dependabot-preview[bot]2019-06-232-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.34.0 to 4.35.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.34.0...v4.35.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | | | | Merge pull request #15888 from nextcloud/dav-write-forward-exceptionRobin Appelman2019-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | log inner exception during dav write
| * | | | | | | | | | log inner exception during dav writeRobin Appelman2019-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | | | Merge pull request #16033 from nextcloud/fix/noid/ldap-group-wiz-selectionblizzz2019-06-243-44/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix LDAP Wizard forgetting groups on select with search
| * | | | | | | | | | | fixes LDAP Wizard forgetting groups on select with searchArthur Schiwon2019-06-213-44/+32
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2420-6/+126
| | | | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2318-2/+24
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | changes the returned key from UserID to id, in accordance with getUserData ↵John Molakvoæ2019-06-225-13/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#16036) changes the returned key from UserID to id, in accordance with getUserData
| * | | | | | | | | | changes the returned key from UserID to id, in accordance with getUserDataArthur Schiwon2019-06-215-13/+13
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-222-0/+872
| | | | | | | | | |
* | | | | | | | | | Merge pull request #15997 from nextcloud/design/sidebar-iconJan-Christoph Borchardt2019-06-212-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add sidebar icon we use in Talk and Viewer already
| * | | | | | | | | | Add sidebar icon we use in Talk and Viewer alreadyJan-Christoph Borchardt2019-06-182-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | | | Merge pull request #15889 from nextcloud/touch-handle-backend-exceptionsRobin Appelman2019-06-212-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | handle storage exceptions when trying to set mtime
| * | | | | | | | | | fix testsRobin Appelman2019-06-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | | | | handle storage exceptions when trying to set mtimeRobin Appelman2019-06-061-1/+6
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not all storage backends can handle setting the mtime and they might not always handle that error correctly. Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | | Merge pull request #15540 from ↵Joas Schilling2019-06-211-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/prevent-faulty-logs-from-nested-setupFS-calls Prevent faulty logs from nested setupFS calls
| * | | | | | | | | | Prevent faulty logs from nested setupFS callsJoas Schilling2019-05-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | | | Merge pull request #15964 from nextcloud/enh/noid/user-creation-optionsblizzz2019-06-2113-24/+235
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Opt-in for generation userid, requiring email addresses
| * | | | | | | | | | uses "yes" and "no" for config switch over stringified numbersArthur Schiwon2019-06-213-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | | | rebuilt js files after rebaseArthur Schiwon2019-06-202-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>