summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-09-0612-0/+48
* Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-nameMorris Jobke2017-09-0513-55/+51
|\
| * Fix testsMorris Jobke2017-09-052-2/+6
| * Fix unit testsJoas Schilling2017-09-041-1/+1
| * Merge setMetaData into constructorJoas Schilling2017-09-0410-41/+34
| * Set the meta data before everythingJoas Schilling2017-09-041-12/+11
* | Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_WizardMorris Jobke2017-09-051-1/+1
|\ \
| * | recognize groupOfUniqueNames as valid LDAP group objectTobias Brunner2017-07-071-1/+1
* | | [tx-robot] updated from transifexNextcloud bot2017-09-052-0/+14
* | | Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixesMorris Jobke2017-09-042-26/+132
|\ \ \
| * | | LDAP: Simplify conditions in establishConnectionJarkko Lehtoranta2017-07-231-9/+6
| * | | LDAP: Add testStartTlsNegotiationFailure unit testJarkko Lehtoranta2017-07-231-0/+50
| * | | LDAP: Add testBindWithInvalidCredentials unit testJarkko Lehtoranta2017-07-231-0/+44
| * | | LDAP: Use imported exception in Connection classJarkko Lehtoranta2017-07-231-4/+4
| * | | LDAP: Clean-up doConnectJarkko Lehtoranta2017-07-231-11/+14
| * | | LDAP: Throw an exception if disabling LDAP referrals failsJarkko Lehtoranta2017-07-231-0/+2
| * | | LDAP: Fix testUseBackupServer unit testJarkko Lehtoranta2017-07-231-0/+4
| * | | LDAP: Throw an exception if Start TLS failsJarkko Lehtoranta2017-07-231-1/+3
| * | | LDAP: Remove unnecessary "recursion" fixJarkko Lehtoranta2017-07-231-7/+0
| * | | LDAP: Don't handle invalid credentials as a connection errorJarkko Lehtoranta2017-07-231-2/+9
| * | | LDAP: Connect to backup server only if it exists + handle errorsJarkko Lehtoranta2017-07-231-3/+7
* | | | Merge pull request #6082 from nextcloud/theming-fix-white-element-colorMorris Jobke2017-09-048-44/+45
|\ \ \ \
| * | | | Update autoloaderMorris Jobke2017-09-042-0/+2
| * | | | Cleanup theming styles to fit the new login pageJulius Härtl2017-09-041-32/+25
| * | | | Fix tests for primary element colorJulius Härtl2017-09-041-1/+4
| * | | | Use separate element color in themingJulius Härtl2017-09-045-15/+18
|/ / / /
* | | | Merge pull request #6254 from nextcloud/async-bus-splitMorris Jobke2017-09-046-105/+208
|\ \ \ \
| * | | | Add proper EOLMorris Jobke2017-09-042-2/+2
| * | | | allow configuring the command busRobin Appelman2017-08-241-30/+41
| * | | | split async test bus for easier subclassingRobin Appelman2017-08-246-76/+168
* | | | | Merge pull request #6196 from nextcloud/downstream-26539-2Morris Jobke2017-09-046-3/+138
|\ \ \ \ \
| * | | | | Fix broken testsMorris Jobke2017-09-042-1/+7
| * | | | | show storage as unavailable in the file listRobin Appelman2017-09-041-1/+2
| * | | | | set the exception for failedstorageRobin Appelman2017-09-041-2/+9
| * | | | | Use the FailedStorage insteadMorris Jobke2017-09-042-31/+1
| * | | | | Handle invalid ext storage backend to keep mount point visibleVincent Petry2017-09-045-2/+153
* | | | | | Merge pull request #6064 from nextcloud/fix-5219-absolute-path-must-be-relati...Morris Jobke2017-09-041-6/+13
|\ \ \ \ \ \
| * | | | | | Don't lock in the appdata_ directoryJoas Schilling2017-08-101-1/+1
| * | | | | | Still throw a locked exception when the path is not relative to $user/files/Joas Schilling2017-08-101-5/+12
* | | | | | | Merge pull request #6120 from nextcloud/public_upload_share_api_fixblizzz2017-09-042-7/+18
|\ \ \ \ \ \ \
| * | | | | | | Update to new test caseRoeland Jago Douma2017-08-161-7/+17
| * | | | | | | Public upload share permission handlingRoeland Jago Douma2017-08-161-0/+1
* | | | | | | | Merge pull request #6309 from nextcloud/new-dav-eventRoeland Jago Douma2017-09-042-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | also allow to register additional plugins if the old endpoint is usedBjoern Schiessle2017-08-301-0/+5
| * | | | | | | | add a new dav event to allow apps to register their own sabredav pluginsBjoern Schiessle2017-08-301-0/+3
* | | | | | | | | Merge pull request #6351 from nhirokinet/masterMorris Jobke2017-09-041-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | not to backquote LIMIT on CalDavBackend.phpnhirokinet2017-09-031-1/+1
* | | | | | | | | | Merge pull request #6326 from nextcloud/fix_4654_3375Roeland Jago Douma2017-09-041-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pass new value to triggerChangeRoeland Jago Douma2017-08-311-3/+4
* | | | | | | | | | | Merge pull request #6342 from nextcloud/rich-link-previewRoeland Jago Douma2017-09-041-8/+22
|\ \ \ \ \ \ \ \ \ \ \