aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | | | | | | makes users management page aware of the introduced optionsArthur Schiwon2019-06-197-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | ensures mapping of chosen useridArthur Schiwon2019-06-194-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | extends Provisioning API with optional userid and required emailArthur Schiwon2019-06-192-6/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-2120-2/+58
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-06-206-2/+44
| | | | | | | |
* | | | | | | | Let the user confirm the remote wipe (#15774)John Molakvoæ2019-06-193-17/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Let the user confirm the remote wipe
| * | | | | | | | Let the user confirm the remote wipeChristoph Wurst2019-06-193-17/+30
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Fix window scroll container (#16009)John Molakvoæ2019-06-191-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix window scroll container
| * | | | | | | | Fix window scroll containerJulius Härtl2019-06-191-2/+2
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | Add make clean (#16012)John Molakvoæ2019-06-191-1/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add make clean
| * | | | | | | | Add make cleanJohn Molakvoæ (skjnldsv)2019-06-191-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | | Bump webpack-cli from 3.3.3 to 3.3.4 (#15973)John Molakvoæ2019-06-192-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump webpack-cli from 3.3.3 to 3.3.4
| * | | | | | | | | Bump webpack-cli from 3.3.3 to 3.3.4dependabot-preview[bot]2019-06-192-5/+5
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.3 to 3.3.4. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/3.3.3...v3.3.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | | | Merge pull request #16011 from nextcloud/fix/noid/ldapprovider-return-one-baseblizzz2019-06-193-20/+83
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | (LDAP) API: return one base properly when multiple are configured
| * | | | | | | | fixes return type in php docArthur Schiwon2019-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * the backend already expects and works with the string Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | fixes returning the base when multiple are specifiedArthur Schiwon2019-06-192-19/+82
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reading the config directly will return the value with line breaks * using the proper accessor gives us all bases in an array * returns the first matching one * having user id provided for the group base is strange and does not let us operate like this. here we return the first one. might change in future, a backportable fix won't have an API change however. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #15988 from nextcloud/feature/shared-browserlist-configGeorg Ehrke2019-06-197-16/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Use shared browserslist config
| * | | | | | | Use shared browserslist configChristoph Wurst2019-06-197-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #15869 from nextcloud/multiple-version-backendsRobin Appelman2019-06-191-10/+21
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | fix loading multiple version backends from one app
| * | | | | | | fix loading multiple version backends from one appRobin Appelman2019-06-041-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>