summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10172 from nextcloud/version/noid/13.0.5RC1v13.0.5RC1Morris Jobke2018-07-121-2/+2
|\
| * 13.0.5 RC 1Morris Jobke2018-07-121-2/+2
|/
* Merge pull request #10201 from nextcloud/smb-rename-invalidargument-retry-13Roeland Jago Douma2018-07-121-3/+18
|\
| * Use ILogger for constsRoeland Jago Douma2018-07-111-0/+1
| * also retry rename operation on InvalidArgumentExceptionRobin Appelman2018-07-111-3/+17
* | [tx-robot] updated from transifexNextcloud bot2018-07-1216-12/+54
* | Merge pull request #10202 from nextcloud/backport/10199/improve-url-detection...Roeland Jago Douma2018-07-112-9/+58
|\ \ | |/ |/|
| * Improve url detection in commentsJoas Schilling2018-07-112-9/+58
|/
* Merge pull request #10195 from nextcloud/backport/10193/sanitize-parameter-13Morris Jobke2018-07-111-0/+1
|\
| * Sanitize parameters in createSessionToken() while loggingMorris Jobke2018-07-111-0/+1
|/
* Merge pull request #10115 from nextcloud/backport/10098/ldap-image-attributeMorris Jobke2018-07-119-51/+240
|\
| * adjust and add more unit testsArthur Schiwon2018-07-054-19/+115
| * allow admin to disable fetching of avatars as well as a specific attributeArthur Schiwon2018-07-057-33/+126
* | Merge pull request #10189 from nextcloud/backport/10020/email-address-mispars...Morris Jobke2018-07-111-2/+2
|\ \
| * | Fix "parsing" of email-addresses in comments and chat messagesJoas Schilling2018-07-111-2/+2
* | | Merge pull request #10188 from nextcloud/backport/10078/invalid-actor-and-cal...Morris Jobke2018-07-111-0/+2
|\ \ \
| * | | Correctly parse the subject parameters for link (un)shares of calendarsJoas Schilling2018-07-111-0/+2
| |/ /
* | | Merge pull request #10185 from nextcloud/backport/10161/correctly-handle-user...Morris Jobke2018-07-111-1/+2
|\ \ \
| * | | Correctly handle users with numeric user idsJoas Schilling2018-07-111-1/+2
| |/ /
* | | Merge pull request #10186 from nextcloud/backport/10156/behat-3.3Morris Jobke2018-07-111-1/+1
|\ \ \
| * | | Fix the behat version to 3.3.*Joas Schilling2018-07-111-1/+1
| |/ /
* | | Merge pull request #10170 from nextcloud/backport/9823/stable13Morris Jobke2018-07-116-7/+42
|\ \ \
| * | | Allow updating the token on session regenerationRoeland Jago Douma2018-07-096-7/+42
* | | | Merge pull request #10169 from nextcloud/backport/9955/stable13John Molakvoæ2018-07-111-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Request a valid property for DAV opendirRoeland Jago Douma2018-07-091-1/+1
| |/ /
* | | Merge pull request #10180 from nextcloud/lock-negative-13Morris Jobke2018-07-112-2/+20
|\ \ \
| * | | prevent lock values from going negative with memcache backendRobin Appelman2018-07-102-2/+20
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2018-07-1144-162/+364
* | | [tx-robot] updated from transifexNextcloud bot2018-07-10520-2474/+3152
| |/ |/|
* | Merge pull request #10166 from nextcloud/backport/10039/codecov-disablingMorris Jobke2018-07-091-3/+4
|\ \
| * | Disable codecov status and commentMorris Jobke2018-07-091-3/+4
* | | Merge pull request #10165 from nextcloud/backport/9914/settings-wording-13Morris Jobke2018-07-091-1/+1
|\ \ \
| * | | Fixed English grammatical error on Settings page.Jaczel2018-07-091-1/+1
| |/ /
* | | Merge pull request #10164 from nextcloud/backport/9893/update-message-13Morris Jobke2018-07-091-1/+1
|\ \ \ | |/ / |/| |
| * | Update message shown when unsharing a fileKevin Ndung'u2018-07-091-1/+1
|/ /
* | Merge pull request #10121 from nextcloud/stable13-allow-disable-encryptionMorris Jobke2018-07-091-2/+6
|\ \ | |/ |/|
| * allow to disable encryptionBjoern Schiessle2018-07-051-2/+6
* | Merge pull request #10089 from nextcloud/backport/10083/stable13blizzz2018-07-054-13/+185
|\ \
| * | let user set avatar in nextcloud von LDAP provides invalid image dataArthur Schiwon2018-07-034-13/+185
* | | Merge pull request #10093 from nextcloud/smb-log-connection-errors-13Morris Jobke2018-07-032-1/+9
|\ \ \ | |/ / |/| |
| * | Improved logging of smb connection errorsRobin Appelman2018-07-032-1/+9
|/ /
* | Merge pull request #10076 from nextcloud/backport/10034/stable13blizzz2018-07-023-165/+132
|\ \
| * | constants belong to Util in 13Arthur Schiwon2018-07-021-8/+9
| * | lower log level for quota manipulation casesArthur Schiwon2018-07-023-161/+127
|/ /
* | Merge pull request #10044 from nextcloud/stable13-10040-fix-filenames-in-shar...Morris Jobke2018-06-291-4/+10
|\ \
| * | Check all paths for own files and sharesDaniel Calviño Sánchez2018-06-291-1/+7
| * | Fix filenames in sharing integration testsDaniel Calviño Sánchez2018-06-291-3/+3
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-06-2932-0/+50
* | Merge pull request #10032 from nextcloud/backport/10031/stable13Morris Jobke2018-06-282-11/+54
|\ \
| * | LDAP backup server should not be queried when auth failsArthur Schiwon2018-06-272-11/+54