summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* TypoJohn Molakvoæ (skjnldsv)2018-08-151-1/+1
* Ellipsis long username/mails in share viewJohn Molakvoæ (skjnldsv)2018-08-151-0/+4
* Fix footer and public min-heightJohn Molakvoæ (skjnldsv)2018-08-153-22/+24
* Undo button fix in themingJohn Molakvoæ (skjnldsv)2018-08-151-0/+2
* [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
|\
| * don't add new LDAP configs if one is already presentArthur Schiwon2018-08-122-2/+8
| * improve fail info and disable cache for a caseArthur Schiwon2018-08-122-1/+2
| * Phpunit changed, use proper Assert classArthur Schiwon2018-08-121-7/+7
| * tests for user storage locationArthur Schiwon2018-08-104-197/+44
| * convert pagination testsArthur Schiwon2018-08-094-57/+84
| * convert connection testsArthur Schiwon2018-08-093-172/+31
| * fix prov testsArthur Schiwon2018-08-091-0/+1
| * simplify tests and move some out to a new feature as we need a pristineArthur Schiwon2018-08-093-27/+35
| * integration test to ensure entries without displayname don't cause troubleArthur Schiwon2018-08-093-93/+22
| * login does not save the responseArthur Schiwon2018-08-091-0/+1
| * convert LDAP offline and backup server integration testsArthur Schiwon2018-08-093-124/+40
| * FIX: emit assignedUserId only for usersArthur Schiwon2018-08-091-5/+5
| * integration test checking the group filterArthur Schiwon2018-08-093-127/+74
| * check user detailsArthur Schiwon2018-08-092-2/+29
| * behat integration tests for LDAP, basic setupArthur Schiwon2018-08-094-1/+58
* | Merge pull request #10680 from nextcloud/fix/noid/update_lockdownmanagerscopeRoeland Jago Douma2018-08-141-0/+3
|\ \
| * | Update the scope of the lockdownmanagerRoeland Jago Douma2018-08-141-0/+3
* | | Merge pull request #10679 from nextcloud/fix/10667/dialog-button-layoutRoeland Jago Douma2018-08-141-17/+8
|\ \ \
| * | | switches the oc dialog button row to flexMichael Weimann2018-08-131-17/+8
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2018-08-146-0/+14
* | | Merge pull request #10660 from danielkesselberg/bugfix/noid/fix-warning-signo...Julius Härtl2018-08-131-2/+2
|\ \ \ | |/ / |/| |
| * | Pass HttpHeader as arrayDaniel Kesselberg2018-08-121-2/+2
* | | Merge pull request #10621 from nextcloud/feature/noid/add-tos-to-enterprise-b...blizzz2018-08-132-3/+5
|\ \ \
| * | | Add the ToS app to the enterprise bundleJoas Schilling2018-08-092-3/+5
* | | | Merge pull request #10592 from nextcloud/allow-external-actions-userslistRoeland Jago Douma2018-08-135-8/+39
|\ \ \ \
| * | | | Allow external actions to users listJohn Molakvoæ (skjnldsv)2018-08-135-8/+39
* | | | | Merge pull request #10659 from danielkesselberg/feature/noid/remove-xcacheRoeland Jago Douma2018-08-136-170/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update autoloaderDaniel Kesselberg2018-08-122-2/+0
| * | | | Drop support for xcacheDaniel Kesselberg2018-08-124-168/+0
| | |/ / | |/| |
* | | | Merge pull request #10666 from nextcloud/update/crl2Roeland Jago Douma2018-08-131-10/+10
|\ \ \ \
| * | | | Another CRL bumpRoeland Jago Douma2018-08-131-10/+10
|/ / / /
* | | | Merge pull request #10664 from nextcloud/update/crlRoeland Jago Douma2018-08-131-10/+11
|\ \ \ \
| * | | | Update CRLRoeland Jago Douma2018-08-131-10/+11
* | | | | [tx-robot] updated from transifexNextcloud bot2018-08-1350-38/+234
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-08-1130-0/+52
* | | | Merge pull request #10610 from nextcloud/fix/noid/dontcountwithldapRoeland Jago Douma2018-08-101-6/+11
|\ \ \ \ | |/ / / |/| | |
| * | | do not trigger counting on LDAPArthur Schiwon2018-08-101-6/+11
* | | | Merge pull request #10639 from nextcloud/bugfix/10607/appsettings-fixesRoeland Jago Douma2018-08-104-10/+5
|\ \ \ \
| * | | | RecompileRoeland Jago Douma2018-08-101-3800/+123
| * | | | Bump bundled javascript from settingsJulius Härtl2018-08-102-124/+3800
| * | | | Sort apps by a proper hierarchical order (active, update, name)Julius Härtl2018-08-101-7/+3
| * | | | Fix removeing apps in the sidebarJulius Härtl2018-08-101-1/+1
* | | | | Merge pull request #10642 from nextcloud/bump/autoloadersRoeland Jago Douma2018-08-1020-20/+20
|\ \ \ \ \
| * | | | | Bump autoloadersRoeland Jago Douma2018-08-1020-20/+20