Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-19 | 56 | -0/+158 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-18 | 232 | -748/+774 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-17 | 20 | -4/+38 |
| | |||||
* | Merge pull request #10236 from nextcloud/version/noid/13.0.5RC2v13.0.5RC2 | Morris Jobke | 2018-07-16 | 1 | -2/+2 |
|\ | | | | | 13.0.5 RC 2 | ||||
| * | 13.0.5 RC 2 | Morris Jobke | 2018-07-13 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-16 | 14 | -6/+74 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-15 | 12 | -2/+54 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-14 | 12 | -4/+472 |
|/ | |||||
* | Merge pull request #10233 from nextcloud/backport/10227/ldap-bind-loop | Morris Jobke | 2018-07-13 | 2 | -3/+3 |
|\ | | | | | [stable13] Only bind to ldap if configuration for the first server is set | ||||
| * | Fix tests for backup ldap server connection | Julius Härtl | 2018-07-13 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Only bind if configuration for the first server is available | Julius Härtl | 2018-07-13 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-13 | 26 | -0/+162 |
| | |||||
* | Merge pull request #10172 from nextcloud/version/noid/13.0.5RC1v13.0.5RC1 | Morris Jobke | 2018-07-12 | 1 | -2/+2 |
|\ | | | | | 13.0.5 RC 1 | ||||
| * | 13.0.5 RC 1 | Morris Jobke | 2018-07-12 | 1 | -2/+2 |
|/ | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | Merge pull request #10201 from nextcloud/smb-rename-invalidargument-retry-13 | Roeland Jago Douma | 2018-07-12 | 1 | -3/+18 |
|\ | | | | | [13] also retry rename operation on InvalidArgumentException | ||||
| * | Use ILogger for consts | Roeland Jago Douma | 2018-07-11 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | also retry rename operation on InvalidArgumentException | Robin Appelman | 2018-07-11 | 1 | -3/+17 |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-12 | 16 | -12/+54 |
| | | |||||
* | | Merge pull request #10202 from ↵ | Roeland Jago Douma | 2018-07-11 | 2 | -9/+58 |
|\ \ | |/ |/| | | | | | nextcloud/backport/10199/improve-url-detection-in-comments [stable13] Improve url detection in comments | ||||
| * | Improve url detection in comments | Joas Schilling | 2018-07-11 | 2 | -9/+58 |
|/ | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | Merge pull request #10195 from nextcloud/backport/10193/sanitize-parameter-13 | Morris Jobke | 2018-07-11 | 1 | -0/+1 |
|\ | | | | | [stable13] Sanitize parameters in createSessionToken() while logging | ||||
| * | Sanitize parameters in createSessionToken() while logging | Morris Jobke | 2018-07-11 | 1 | -0/+1 |
|/ | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | Merge pull request #10115 from nextcloud/backport/10098/ldap-image-attribute | Morris Jobke | 2018-07-11 | 9 | -51/+240 |
|\ | | | | | [stable13] allow admin to disable fetching of avatars as well as a specific attribute | ||||
| * | adjust and add more unit tests | Arthur Schiwon | 2018-07-05 | 4 | -19/+115 |
| | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | allow admin to disable fetching of avatars as well as a specific attribute | Arthur Schiwon | 2018-07-05 | 7 | -33/+126 |
| | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | Merge pull request #10189 from ↵ | Morris Jobke | 2018-07-11 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | nextcloud/backport/10020/email-address-misparsed-in-comments-and-chat [stable13] Fix "parsing" of email-addresses in comments and chat messages | ||||
| * | | Fix "parsing" of email-addresses in comments and chat messages | Joas Schilling | 2018-07-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | \\b matches any non-word character, including \@ and \- In order to not detect urls in the middle of email-addresses, we need to check for white space characters and beginning of the message instead. Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #10188 from ↵ | Morris Jobke | 2018-07-11 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/backport/10078/invalid-actor-and-calendar-for-link-shares [stable13] Correctly parse the subject parameters for link (un)shares of calendars | ||||
| * | | | Correctly parse the subject parameters for link (un)shares of calendars | Joas Schilling | 2018-07-11 | 1 | -0/+2 |
| |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #10185 from ↵ | Morris Jobke | 2018-07-11 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/backport/10161/correctly-handle-users-with-numeric-user-ids-13 [stable13] Correctly handle users with numeric user ids | ||||
| * | | | Correctly handle users with numeric user ids | Joas Schilling | 2018-07-11 | 1 | -1/+2 |
| |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #10186 from nextcloud/backport/10156/behat-3.3 | Morris Jobke | 2018-07-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | [stable13] Fix the behat version to 3.3.* | ||||
| * | | | Fix the behat version to 3.3.* | Joas Schilling | 2018-07-11 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #10170 from nextcloud/backport/9823/stable13 | Morris Jobke | 2018-07-11 | 6 | -7/+42 |
|\ \ \ | | | | | | | | | [stable13] Allow updating the token on session regeneration | ||||
| * | | | Allow updating the token on session regeneration | Roeland Jago Douma | 2018-07-09 | 6 | -7/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes when we force a session regeneration we want to update the current token for this session. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #10169 from nextcloud/backport/9955/stable13 | John Molakvoæ | 2018-07-11 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | [stable13] Request a valid property for DAV opendir | ||||
| * | | | Request a valid property for DAV opendir | Roeland Jago Douma | 2018-07-09 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | Apperently Sabre and Onedrive are not friends when requesting a single 404 property. I need to dig deeper on why this is. Anyways requesting a valid property makes it work like a charm. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #10180 from nextcloud/lock-negative-13 | Morris Jobke | 2018-07-11 | 2 | -2/+20 |
|\ \ \ | | | | | | | | | [13] prevent lock values from going negative with memcache backend | ||||
| * | | | prevent lock values from going negative with memcache backend | Robin Appelman | 2018-07-10 | 2 | -2/+20 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | This can be caused by the code releasing more locks then it acquires, once the lock value becomes negative it's likely that it will never be able to change into an exclusive lock again. Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-11 | 44 | -162/+364 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-07-10 | 520 | -2474/+3152 |
| |/ |/| | |||||
* | | Merge pull request #10166 from nextcloud/backport/10039/codecov-disabling | Morris Jobke | 2018-07-09 | 1 | -3/+4 |
|\ \ | | | | | | | [stable13] Disable codecov status and comment | ||||
| * | | Disable codecov status and comment | Morris Jobke | 2018-07-09 | 1 | -3/+4 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #10165 from nextcloud/backport/9914/settings-wording-13 | Morris Jobke | 2018-07-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | [stable13] Fixed English grammatical error on Settings page. | ||||
| * | | | Fixed English grammatical error on Settings page. | Jaczel | 2018-07-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #10164 from nextcloud/backport/9893/update-message-13 | Morris Jobke | 2018-07-09 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | [stable13] Update message shown when unsharing a file | ||||
| * | | Update message shown when unsharing a file | Kevin Ndung'u | 2018-07-09 | 1 | -1/+1 |
|/ / | | | | | | | Signed-off-by: Kevin Ndung'u <kevgathuku@gmail.com> | ||||
* | | Merge pull request #10121 from nextcloud/stable13-allow-disable-encryption | Morris Jobke | 2018-07-09 | 1 | -2/+6 |
|\ \ | |/ |/| | [stable13] allow to disable encryption | ||||
| * | allow to disable encryption | Bjoern Schiessle | 2018-07-05 | 1 | -2/+6 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | Merge pull request #10089 from nextcloud/backport/10083/stable13 | blizzz | 2018-07-05 | 4 | -13/+185 |
|\ \ | | | | | | | [stable13] let user set avatar in nextcloud von LDAP provides invalid image data |