summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Fix call to OC.generateUrl for caldav birthday calendar on/offDaniel Kesselberg2018-08-201-2/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | | Merge pull request #10759 from ↵Morris Jobke2018-08-201-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport/10755/fix-comments-in-config-sample [stable13] Fix comment style in config sample
| * | | | | | | | Fix comment style in config sampleMorris Jobke2018-08-201-4/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | / [tx-robot] updated from transifexNextcloud bot2018-08-206-10/+16
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-186-0/+16
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-1610-120/+126
| | | | | |
* | | | | | Merge pull request #10646 from nextcloud/fix-password-reset-stable13blizzz2018-08-152-2/+51
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [stable13] only warn about data lose on password reset if per-user keys are used
| * | | | | update unit testsBjoern Schiessle2018-08-101-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | only warn about data lose on password reset if per-user keys are usedBjoern Schiessle2018-08-101-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-1514-0/+32
| | | | | |
* | | | | | Merge pull request #10682 from nextcloud/backport/10680/stable13Roeland Jago Douma2018-08-141-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable13] Update the scope of the lockdownmanager
| * | | | | | Update the scope of the lockdownmanagerRoeland Jago Douma2018-08-141-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have the token anyway. So better the scope as well. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-146-0/+14
| | | | | |
* | | | | | Merge pull request #10620 from nextcloud/mimetype-insert-if-not-exists-13blizzz2018-08-131-14/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | [13] use insertIfNotExists to store new mimetypes.
| * | | | | | use insertIfNotExists to store new mimetypes.Robin Appelman2018-08-091-14/+7
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also throw an error if we can't find the mimetype after insert Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-1350-38/+234
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-08-1130-0/+52
| |/ / / / |/| | | |
* | | | | Merge pull request #10581 from nextcloud/encryption-s3-fix-stable13Roeland Jago Douma2018-08-103-3/+28
|\ \ \ \ \ | | | | | | | | | | | | make file cache updates more robust
| * | | | | make file cache updates more robustBjoern Schiessle2018-08-083-3/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | only update the encrypted version after the write operation is finished and the stream is closed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* / / / / [tx-robot] updated from transifexNextcloud bot2018-08-10112-122/+122
|/ / / /
* / / / [tx-robot] updated from transifexNextcloud bot2018-08-0818-12/+146
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2018-08-0712-4/+70
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-08-0616-18/+62
| |
* | [tx-robot] updated from transifexNextcloud bot2018-08-0520-0/+36
| |
* | [tx-robot] updated from transifexNextcloud bot2018-08-0436-0/+52
| |
* | [tx-robot] updated from transifexNextcloud bot2018-08-03316-412/+432
| |
* | [tx-robot] updated from transifexNextcloud bot2018-08-0246-68/+78
| |
* | [tx-robot] updated from transifexNextcloud bot2018-08-0148-38/+38
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-3148-24/+102
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-302-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-2838-16/+152
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-2748-20/+272
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-26210-148/+490
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-25350-1366/+1380
| |
* | Merge pull request #10376 from nextcloud/background-scan-root-13Roeland Jago Douma2018-07-241-5/+0
|\ \ | | | | | | [13] Do scan the root storage in background scan
| * | Do scan the root storage in background scanRobin Appelman2018-07-241-5/+0
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-07-2422-4/+70
| |
* | Merge pull request #10350 from nextcloud/version/noid/13.0.5v13.0.5Morris Jobke2018-07-231-2/+2
|\ \ | | | | | | 13.0.5
| * | 13.0.5Morris Jobke2018-07-231-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Do not parse HTML in user id and display nameJoas Schilling2018-07-231-16/+20
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2018-07-2316-2/+74
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-2234-0/+86
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-21162-364/+318
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-2012-2/+74
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-1956-0/+158
|/
* [tx-robot] updated from transifexNextcloud bot2018-07-18232-748/+774
|
* [tx-robot] updated from transifexNextcloud bot2018-07-1720-4/+38
|
* Merge pull request #10236 from nextcloud/version/noid/13.0.5RC2v13.0.5RC2Morris Jobke2018-07-161-2/+2
|\ | | | | 13.0.5 RC 2
| * 13.0.5 RC 2Morris Jobke2018-07-131-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-07-1614-6/+74
| |