summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7982 from nextcloud/11.0.7-rc3-prepv11.0.7RC3Morris Jobke2018-01-221-2/+2
|\ | | | | 11.0.7 RC3
| * 11.0.7 RC3Morris Jobke2018-01-221-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-222-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2018-01-21148-144/+178
|
* [tx-robot] updated from transifexNextcloud bot2018-01-202-0/+4
|
* [tx-robot] updated from transifexNextcloud bot2018-01-19108-106/+108
|
* Merge pull request #7936 from nextcloud/11.0.7-rc2-prepv11.0.7RC2Morris Jobke2018-01-181-2/+2
|\ | | | | 11.0.7 RC2
| * 11.0.7 RC2Morris Jobke2018-01-181-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-1814-0/+16
|
* [tx-robot] updated from transifexNextcloud bot2018-01-1722-0/+34
|
* [tx-robot] updated from transifexNextcloud bot2018-01-1666-126/+134
|
* [tx-robot] updated from transifexNextcloud bot2018-01-1520-10/+78
|
* [tx-robot] updated from transifexNextcloud bot2018-01-146-0/+8
|
* [tx-robot] updated from transifexNextcloud bot2018-01-12118-130/+140
|
* Merge pull request #7780 from nextcloud/11-7778Roeland Jago Douma2018-01-111-0/+0
|\ | | | | [stable11] Improve zip support
| * Improve zip supportMorris Jobke2018-01-101-0/+0
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-01-114-4/+8
|/
* [tx-robot] updated from transifexNextcloud bot2018-01-106-0/+20
|
* Merge pull request #7741 from nextcloud/11.0.7-rc1-prepv11.0.7RC1Roeland Jago Douma2018-01-091-2/+2
|\ | | | | 11.0.7 RC1
| * 11.0.7 RC1Morris Jobke2018-01-091-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7746 from nextcloud/composer_up_11Morris Jobke2018-01-092-11/+19
|\ \ | |/ |/| Update composer
| * Update composerRoeland Jago Douma2018-01-092-11/+19
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Properly catch InvalidTokenException for better error responseMorris Jobke2018-01-092-1/+50
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-0918-0/+52
|
* Merge pull request #7695 from nextcloud/stable11-7694Roeland Jago Douma2018-01-088-65/+57
|\ | | | | [stable11] Don't attempt to translate login names to uids when uids are provided
| * test adoption for stable12 and stable11Arthur Schiwon2018-01-051-3/+5
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * update autoloaderArthur Schiwon2018-01-042-19/+11
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * removes invalid tests, adapts another oneArthur Schiwon2018-01-041-33/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * never translate login names when requiring with a user idArthur Schiwon2018-01-043-22/+34
| | | | | | | | | | | | where appropriate, the preLoginNameUsedAsUserName hook should be thrown. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * extend tests for status quoArthur Schiwon2018-01-042-0/+19
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2018-01-082-0/+2
| |
* | Merge pull request #7718 from nextcloud/stable11-7662Roeland Jago Douma2018-01-071-7/+10
|\ \ | | | | | | [stable11] throw ServerNotAvailableException when LDAP is caught shutting down
| * | throw ServerNotAvailableException when LDAP is caught shutting downArthur Schiwon2018-01-051-7/+10
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-01-078-0/+22
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-01-0636-154/+388
|/ /
* / [tx-robot] updated from transifexNextcloud bot2018-01-0538-8/+274
|/
* [tx-robot] updated from transifexNextcloud bot2018-01-04600-1464/+6776
|
* Merge pull request #7673 from nextcloud/backport/6977/log-censor-11Roeland Jago Douma2018-01-032-0/+32
|\ | | | | [stable11] Added additional methods for removal of sensitive info
| * Unit tests for #6977Joas Schilling2018-01-031-0/+26
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Added additional methods for removal of sensitive infoJohannes Schlichenmaier2018-01-031-0/+6
|/ | | | Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* Merge pull request #7467 from nextcloud/update-user-agent-regex-stable11Björn Schießle2017-12-123-4/+18
|\ | | | | allow 'Nextcloud' in the user agent string of Android
| * fix dav unit testsBjoern Schiessle2017-12-121-3/+3
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * allow 'Nextcloud' in the user agent string of AndroidBjoern Schiessle2017-12-122-1/+15
|/ | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* [tx-robot] updated from transifexNextcloud bot2017-12-1120-162/+466
|
* [tx-robot] updated from transifexNextcloud bot2017-12-1034-112/+950
|
* [tx-robot] updated from transifexNextcloud bot2017-12-096-12/+344
|
* [tx-robot] updated from transifexNextcloud bot2017-12-0814-16/+128
|
* [tx-robot] updated from transifexNextcloud bot2017-12-0710-2/+148
|
* [tx-robot] updated from transifexNextcloud bot2017-12-0620-6/+88
|
* [tx-robot] updated from transifexNextcloud bot2017-12-058-42/+66
|