summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make phpunit8 compatibleRoeland Jago Douma2019-11-27679-832/+831
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Allow php7.4Christoph Wurst2019-11-271-3/+3
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #18019 from nextcloud/enhancement/password-policy-eventsRoeland Jago Douma2019-11-278-48/+163
|\ | | | | Add typed events for password_policy
| * Add typed events for password_policyChristoph Wurst2019-11-278-48/+163
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #17834 from nextcloud/enh/noid/generic-event-replacement-tk2blizzz2019-11-276-5/+180
|\ \ | |/ |/| Public API's GenericEvent replacement (take 2)
| * Files first to use own GenericEventArthur Schiwon2019-11-263-5/+9
| | | | | | | | | | | | * those are added to 18 only anyway :) Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * add Nextcloud specific GenericEvent implementationArthur Schiwon2019-11-263-0/+171
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #17997 from nextcloud/enh/workflow-frontendRoeland Jago Douma2019-11-2710-109/+152
|\ \ | | | | | | More workflow frontend polishing
| * | Bump bundlesJulius Härtl2019-11-262-15/+15
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix wordingJulius Härtl2019-11-262-6/+9
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Rename to flowJulius Härtl2019-11-261-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add cancel button to restore previously saved ruleJulius Härtl2019-11-261-4/+15
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add hint about developer docsJulius Härtl2019-11-261-0/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move systemtags to general settingsJulius Härtl2019-11-262-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Small fixes for workflow frontendJulius Härtl2019-11-265-87/+112
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2019-11-2716-12/+112
|/ /
* | Merge pull request #18058 from nextcloud/enh/shareinfo/permissionmaskRoeland Jago Douma2019-11-262-29/+13
|\ \ | | | | | | Apply share permission mask to all files obtained via shareinfo
| * | Apply share permission mask to all files obtained via shareinfoRoeland Jago Douma2019-11-262-29/+13
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #17939 from nextcloud/fix/token-insert-conflict-handlingRoeland Jago Douma2019-11-262-19/+68
|\ \ \ | | | | | | | | Handle token insert conflicts
| * | | Handle token insert conflictsChristoph Wurst2019-11-262-19/+68
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Env-based SAML uses the "Apache auth" mechanism to log users in. In this code path, we first delete all existin auth tokens from the database, before a new one is inserted. This is problematic for concurrent requests as they might reach the same code at the same time, hence both trying to insert a new row wit the same token (the session ID). This also bubbles up and disables user_saml. As the token might still be OK (both request will insert the same data), we can actually just check if the UIDs of the conflict row is the same as the one we want to insert right now. In that case let's just use the existing entry and carry on. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #18123 from nextcloud/fixbug/18053/summary_not_alignedRoeland Jago Douma2019-11-262-2/+5
|\ \ \ | | | | | | | | fix summary elements alignment
| * | | fix summary elements alignmentGreta Doci2019-11-262-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | | | Merge pull request #17995 from nextcloud/fix/sharing/federation-orderRoeland Jago Douma2019-11-263-2/+6
|\ \ \ \ | |/ / / |/| | | Sort users and groups first in sharing input
| * | | Sort users and groups first in sharing inputJohn Molakvoæ (skjnldsv)2019-11-263-2/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #17948 from nextcloud/enh/check-if-property-is-boolRoeland Jago Douma2019-11-262-14/+53
|\ \ \ \ | |/ / / |/| | | Make isXXX available for bool properties only
| * | | Make isXXX available for bool properties onlyDaniel Kesselberg2019-11-162-14/+53
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #18026 from nextcloud/feature/noid/fix_overlappin_text_iconRoeland Jago Douma2019-11-264-7/+7
|\ \ \ \ | | | | | | | | | | fix share side bar icon and text overlapping
| * | | | fix min-heightGreta Doci2019-11-254-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | fix share side bar icon and text overlappingGreta Doci2019-11-202-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | | | | Merge pull request #18082 from nextcloud/design/style-updateRoeland Jago Douma2019-11-266-20038/+38
|\ \ \ \ \ | | | | | | | | | | | | Update style of log in page and header
| * | | | | Adjust gradient to theming valueJulius Härtl2019-11-251-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Update style of log in page and headerJan-Christoph Borchardt2019-11-236-20037/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #18013 from ↵Roeland Jago Douma2019-11-266-7/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-autocomplete-suggestions-with-numeric-users Fix autocomplete suggestions with numeric users
| * | | | | | Fix autocomplete suggestions with numeric user idsJoas Schilling2019-11-266-7/+8
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | add var for theming images , advanced options (#16815)John Molakvoæ2019-11-267-9/+23
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | add var for theming images , advanced options
| * | | | | Remove some whitespaceDaniel Kesselberg2019-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | fix test for new css vars / logoheader and faviconGuillaume COMPAGNON2019-11-241-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Guillaume COMPAGNON <gcompagnon@outlook.com>
| * | | | | add var for theming images , advanced optionsGuillaume COMPAGNON2019-11-246-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Guillaume COMPAGNON <gcompagnon@outlook.com>
* | | | | | Merge pull request #18025 from ↵Roeland Jago Douma2019-11-265-220/+333
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/refactor/extract-ownership-transfer-service Extract transfer ownership logic into a reusable service
| * | | | | | Extract transfer ownership logic into a reusable serviceChristoph Wurst2019-11-265-220/+333
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #18005 from nextcloud/fix/manual-app-instancesRoeland Jago Douma2019-11-263-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove some more direct app instance creations
| * | | | | Remove some more direct app instance creationsChristoph Wurst2019-11-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #18108 from nextcloud/refactor/strict-credential-storeRoeland Jago Douma2019-11-262-7/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add return type hint to credential store and make it strict
| * | | | | | Add return type hint to credential store and make it strictChristoph Wurst2019-11-252-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-11-2636-30/+168
| | | | | | |
* | | | | | | Merge pull request #18107 from nextcloud/undefined-index-ownerRoeland Jago Douma2019-11-251-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dont throw undefined index errors for storages that have no owner set
| * | | | | | | dont throw undefined index errors for storages that have no owner setRobin Appelman2019-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #18088 from ↵Roeland Jago Douma2019-11-2517-167/+167
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/handlebars-4.5.3 Bump handlebars from 4.5.2 to 4.5.3
| * | | | | | | | Bump handlebars from 4.5.2 to 4.5.3dependabot-preview[bot]2019-11-2517-167/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.2 to 4.5.3. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.2...v4.5.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | | | Improve tag icon (#18109)John Molakvoæ2019-11-253-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve tag icon