summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-09-0710-2/+58
* Merge pull request #6332 from lukanetconsult/hotfix/6028-realpath-on-webrootMorris Jobke2017-09-062-64/+68
|\
| * Refactor webroot detection in resource locatortux-rampage2017-09-062-64/+68
* | Merge pull request #5304 from nextcloud/bugfix/2855/dont_send_invitations_for...Morris Jobke2017-09-064-5/+134
|\ \ | |/ |/|
| * Sabre/VObject returns DateTimeImmutable, not a simple DateTimeGeorg Ehrke2017-09-052-7/+13
| * don't send invitation emails for past eventsGeorg Ehrke2017-09-054-5/+128
* | Merge pull request #5571 from Luzifer/5570_backend_adminMorris Jobke2017-09-063-0/+10
|\ \
| * | Add @since tag to constantKnut Ahlers2017-09-051-0/+3
| * | Allow group backend to declare users as adminsKnut Ahlers2017-06-303-0/+7
* | | Merge pull request #6377 from nextcloud/fix-included-fileMorris Jobke2017-09-061-1/+1
|\ \ \
| * | | Properly include fileLukas Reschke2017-09-061-1/+1
* | | | Merge pull request #6247 from nextcloud/oauth-state-undefinedMorris Jobke2017-09-062-0/+13
|\ \ \ \
| * | | | Fix testsMorris Jobke2017-09-061-0/+12
| * | | | Fix undefined index oauthStateMorris Jobke2017-09-061-0/+1
| |/ / /
* | | | Merge pull request #6384 from nextcloud/failed-storage-testsMorris Jobke2017-09-061-8/+7
|\ \ \ \
| * | | | adjust tests to new failed storage handlingRobin Appelman2017-09-061-8/+7
| |/ / /
* | | | Merge pull request #6364 from nextcloud/fix_login_loopMorris Jobke2017-09-062-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix login with basic authRoeland Jago Douma2017-09-052-2/+5
| | |/ | |/|
* | | Merge pull request #6370 from nextcloud/fix-alternative-loginsMorris Jobke2017-09-062-6/+27
|\ \ \
| * | | Fix layout of alternative login buttonsMorris Jobke2017-09-062-6/+27
* | | | Merge pull request #5415 from nextcloud/search-cache-nodeMorris Jobke2017-09-066-15/+55
|\ \ \ \
| * | | | Fix testRobin Appelman2017-08-261-3/+3
| * | | | cache nodes from search resultsRobin Appelman2017-08-265-12/+52
* | | | | [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
|\ \ \ \ \ \