summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update unit testsBjoern Schiessle2018-08-151-1/+41
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* only warn about data lose on password reset if per-user keys are usedBjoern Schiessle2018-08-151-1/+10
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #10691 from nextcloud/various-beta14-design-fixesJulius Härtl2018-08-156-26/+45
|\ | | | | Various beta14 design fixes
| * Added feedback on autocomplete uiJohn Molakvoæ (skjnldsv)2018-08-152-4/+15
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * TypoJohn Molakvoæ (skjnldsv)2018-08-151-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Ellipsis long username/mails in share viewJohn Molakvoæ (skjnldsv)2018-08-151-0/+4
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix footer and public min-heightJohn Molakvoæ (skjnldsv)2018-08-153-22/+24
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Undo button fix in themingJohn Molakvoæ (skjnldsv)2018-08-151-0/+2
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #10689 from nextcloud/darktheme-theming-fixesJulius Härtl2018-08-151-1/+34
|\ \ | | | | | | Add default theming into accessibility compiler
| * | Add default theming into accessibility compilerJohn Molakvoæ (skjnldsv)2018-08-151-1/+34
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #10688 from nextcloud/fix/10492/disabled-users-navigationRoeland Jago Douma2018-08-154-3/+17
|\ \ | |/ |/| Fixes hiding the disabled users nav item if there are no disabled users
| * Fixes hiding the disabled users nav item if there are no disabled usersMichael Weimann2018-08-143-3/+3
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * Adds an acceptance test for the users settings navigation without disabled usersMichael Weimann2018-08-141-0/+14
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | [tx-robot] updated from transifexNextcloud bot2018-08-1514-0/+32
|/
* Merge pull request #8855 from nextcloud/feature/noid/ldap-integration-autotestsblizzz2018-08-1414-732/+358
|\ | | | | behat integration tests for LDAP
| * don't add new LDAP configs if one is already presentArthur Schiwon2018-08-122-2/+8
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * improve fail info and disable cache for a caseArthur Schiwon2018-08-122-1/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Phpunit changed, use proper Assert classArthur Schiwon2018-08-121-7/+7
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * tests for user storage locationArthur Schiwon2018-08-104-197/+44
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * convert pagination testsArthur Schiwon2018-08-094-57/+84
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * convert connection testsArthur Schiwon2018-08-093-172/+31
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix prov testsArthur Schiwon2018-08-091-0/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * simplify tests and move some out to a new feature as we need a pristineArthur Schiwon2018-08-093-27/+35
| | | | | | | | | | | | database for them Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * integration test to ensure entries without displayname don't cause troubleArthur Schiwon2018-08-093-93/+22
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * login does not save the responseArthur Schiwon2018-08-091-0/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * convert LDAP offline and backup server integration testsArthur Schiwon2018-08-093-124/+40
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * FIX: emit assignedUserId only for usersArthur Schiwon2018-08-091-5/+5
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * integration test checking the group filterArthur Schiwon2018-08-093-127/+74
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * check user detailsArthur Schiwon2018-08-092-2/+29
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * behat integration tests for LDAP, basic setupArthur Schiwon2018-08-094-1/+58
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #10680 from nextcloud/fix/noid/update_lockdownmanagerscopeRoeland Jago Douma2018-08-141-0/+3
|\ \ | | | | | | Update the scope of the lockdownmanager
| * | Update the scope of the lockdownmanagerRoeland Jago Douma2018-08-141-0/+3
| | | | | | | | | | | | | | | | | | We have the token anyway. So better the scope as well. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #10679 from nextcloud/fix/10667/dialog-button-layoutRoeland Jago Douma2018-08-141-17/+8
|\ \ \ | | | | | | | | switches the oc dialog button row to flex
| * | | switches the oc dialog button row to flexMichael Weimann2018-08-131-17/+8
| |/ / | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | [tx-robot] updated from transifexNextcloud bot2018-08-146-0/+14
| | |
* | | Merge pull request #10660 from ↵Julius Härtl2018-08-131-2/+2
|\ \ \ | |/ / |/| | | | | | | | danielkesselberg/bugfix/noid/fix-warning-signoff-checker Pass HttpHeader as array
| * | Pass HttpHeader as arrayDaniel Kesselberg2018-08-121-2/+2
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #10621 from ↵blizzz2018-08-132-3/+5
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/noid/add-tos-to-enterprise-bundle Add the ToS app to the enterprise bundle
| * | | Add the ToS app to the enterprise bundleJoas Schilling2018-08-092-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #10592 from nextcloud/allow-external-actions-userslistRoeland Jago Douma2018-08-135-8/+39
|\ \ \ \ | | | | | | | | | | Allow external actions to users list
| * | | | Allow external actions to users listJohn Molakvoæ (skjnldsv)2018-08-135-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Created fix Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #10659 from danielkesselberg/feature/noid/remove-xcacheRoeland Jago Douma2018-08-136-170/+0
|\ \ \ \ \ | |/ / / / |/| | | | Drop support for xcache
| * | | | Update autoloaderDaniel Kesselberg2018-08-122-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Drop support for xcacheDaniel Kesselberg2018-08-124-168/+0
| | |/ / | |/| | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #10666 from nextcloud/update/crl2Roeland Jago Douma2018-08-131-10/+10
|\ \ \ \ | | | | | | | | | | Another CRL bump
| * | | | Another CRL bumpRoeland Jago Douma2018-08-131-10/+10
|/ / / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #10664 from nextcloud/update/crlRoeland Jago Douma2018-08-131-10/+11
|\ \ \ \ | | | | | | | | | | Update CRL
| * | | | Update CRLRoeland Jago Douma2018-08-131-10/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-08-1350-38/+234
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-08-1130-0/+52
| | | |