Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-09-08 | 62 | -224/+316 |
* | Merge pull request #6360 from nextcloud/fix/session-timeout-refresh-csrf-token | Lukas Reschke | 2017-09-07 | 1 | -5/+8 |
|\ | |||||
| * | Fix failing csp/nonce check due to timed out session | Christoph Wurst | 2017-09-04 | 1 | -5/+8 |
* | | Merge pull request #6379 from nextcloud/ensure-password-complexity | Lukas Reschke | 2017-09-07 | 1 | -1/+3 |
|\ \ | |||||
| * | | Make sure the password contains special characters | Joas Schilling | 2017-09-07 | 1 | -1/+3 |
* | | | Merge pull request #6380 from nextcloud/cleanup-oci-setup | Lukas Reschke | 2017-09-07 | 1 | -173/+22 |
|\ \ \ | |/ / |/| | | |||||
| * | | cleanup oci setup code | Robin Appelman | 2017-09-06 | 1 | -173/+22 |
* | | | Merge pull request #6398 from nextcloud/revert-6394-navigation-mail-fix | Morris Jobke | 2017-09-07 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | Revert "Fix active entry highlight in certain apps" | Morris Jobke | 2017-09-07 | 1 | -2/+1 |
|/ / / | |||||
* | | | Merge pull request #6394 from nextcloud/navigation-mail-fix | Morris Jobke | 2017-09-07 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Fix active entry highlight in certain apps | Jan-Christoph Borchardt | 2017-09-07 | 1 | -1/+2 |
* | | | | Merge pull request #6329 from nextcloud/ldap-password | Morris Jobke | 2017-09-07 | 1 | -3/+9 |
|\ \ \ \ | |||||
| * | | | | Don't log LDAP password when server is not available | Joas Schilling | 2017-09-06 | 1 | -3/+9 |
* | | | | | Merge pull request #6381 from nextcloud/fix-error-message | Roeland Jago Douma | 2017-09-07 | 1 | -6/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix "Uninitialized string offset: 0 at \/media\/psf\/stable9\/lib\/private\/U... | Lukas Reschke | 2017-09-07 | 1 | -6/+6 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-09-07 | 10 | -2/+58 |
* | | | | Merge pull request #6332 from lukanetconsult/hotfix/6028-realpath-on-webroot | Morris Jobke | 2017-09-06 | 2 | -64/+68 |
|\ \ \ \ | |||||
| * | | | | Refactor webroot detection in resource locator | tux-rampage | 2017-09-06 | 2 | -64/+68 |
* | | | | | Merge pull request #5304 from nextcloud/bugfix/2855/dont_send_invitations_for... | Morris Jobke | 2017-09-06 | 4 | -5/+134 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Sabre/VObject returns DateTimeImmutable, not a simple DateTime | Georg Ehrke | 2017-09-05 | 2 | -7/+13 |
| * | | | | don't send invitation emails for past events | Georg Ehrke | 2017-09-05 | 4 | -5/+128 |
* | | | | | Merge pull request #5571 from Luzifer/5570_backend_admin | Morris Jobke | 2017-09-06 | 3 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Add @since tag to constant | Knut Ahlers | 2017-09-05 | 1 | -0/+3 |
| * | | | | | Allow group backend to declare users as admins | Knut Ahlers | 2017-06-30 | 3 | -0/+7 |
* | | | | | | Merge pull request #6377 from nextcloud/fix-included-file | Morris Jobke | 2017-09-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Properly include file | Lukas Reschke | 2017-09-06 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #6247 from nextcloud/oauth-state-undefined | Morris Jobke | 2017-09-06 | 2 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix tests | Morris Jobke | 2017-09-06 | 1 | -0/+12 |
| * | | | | | | Fix undefined index oauthState | Morris Jobke | 2017-09-06 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #6384 from nextcloud/failed-storage-tests | Morris Jobke | 2017-09-06 | 1 | -8/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | adjust tests to new failed storage handling | Robin Appelman | 2017-09-06 | 1 | -8/+7 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #6364 from nextcloud/fix_login_loop | Morris Jobke | 2017-09-06 | 2 | -2/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix login with basic auth | Roeland Jago Douma | 2017-09-05 | 2 | -2/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #6370 from nextcloud/fix-alternative-logins | Morris Jobke | 2017-09-06 | 2 | -6/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Fix layout of alternative login buttons | Morris Jobke | 2017-09-06 | 2 | -6/+27 |
* | | | | | | Merge pull request #5415 from nextcloud/search-cache-node | Morris Jobke | 2017-09-06 | 6 | -15/+55 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix test | Robin Appelman | 2017-08-26 | 1 | -3/+3 |
| * | | | | | | cache nodes from search results | Robin Appelman | 2017-08-26 | 5 | -12/+52 |
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-09-06 | 12 | -0/+48 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name | Morris Jobke | 2017-09-05 | 13 | -55/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix tests | Morris Jobke | 2017-09-05 | 2 | -2/+6 |
| * | | | | | | Fix unit tests | Joas Schilling | 2017-09-04 | 1 | -1/+1 |
| * | | | | | | Merge setMetaData into constructor | Joas Schilling | 2017-09-04 | 10 | -41/+34 |
| * | | | | | | Set the meta data before everything | Joas Schilling | 2017-09-04 | 1 | -12/+11 |
* | | | | | | | Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_Wizard | Morris Jobke | 2017-09-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | recognize groupOfUniqueNames as valid LDAP group object | Tobias Brunner | 2017-07-07 | 1 | -1/+1 |
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-09-05 | 2 | -0/+14 |
* | | | | | | | Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes | Morris Jobke | 2017-09-04 | 2 | -26/+132 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | LDAP: Simplify conditions in establishConnection | Jarkko Lehtoranta | 2017-07-23 | 1 | -9/+6 |
| * | | | | | | | LDAP: Add testStartTlsNegotiationFailure unit test | Jarkko Lehtoranta | 2017-07-23 | 1 | -0/+50 |