aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7457 from nextcloud/stable12-7271Roeland Jago Douma2017-12-121-0/+2
|\
| * Fix loading icon position in the app menuJulius Härtl2017-12-111-0/+2
* | Merge pull request #7455 from nextcloud/12_7230Morris Jobke2017-12-111-0/+5
|\ \ | |/ |/|
| * Remove wrong entry in admin_settings that causes 500Morris Jobke2017-12-111-0/+5
|/
* Merge pull request #7451 from nextcloud/12-7433Morris Jobke2017-12-111-1/+1
|\
| * Fix constructor spy in unit test with Sinon 4.1.3Daniel Calviño Sánchez2017-12-111-1/+1
|/
* [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
* Merge pull request #7409 from nextcloud/swift-retry-12Roeland Jago Douma2017-12-082-2/+4
|\
| * add retry wrapper when reading files from swiftRobin Appelman2017-12-062-2/+4
* | Merge pull request #7407 from nextcloud/12_7348Morris Jobke2017-12-082-0/+7
|\ \
| * | Fix testsRoeland Jago Douma2017-12-062-1/+3
| * | A failed storage is a not available storageRoeland Jago Douma2017-12-061-0/+5
| |/
* | Merge pull request #7323 from nextcloud/shared-jailed-source-root-12Morris Jobke2017-12-084-15/+93
|\ \
| * | delay calculating the shared cache root until it's usedRobin Appelman2017-12-042-26/+41
| * | Use the correct root for shared jail when the source storage is also a jailRobin Appelman2017-11-283-1/+64
* | | [tx-robot] updated from transifexNextcloud bot2017-12-0814-16/+128
* | | [tx-robot] updated from transifexNextcloud bot2017-12-0712-2/+168
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-12-0620-6/+88
* | [tx-robot] updated from transifexNextcloud bot2017-12-058-42/+66
* | Merge pull request #7144 from nextcloud/rename-locks-stable12Morris Jobke2017-12-041-83/+86
|\ \
| * | Unlock files even if an exception occurskorelstar2017-11-111-83/+86
* | | Merge pull request #7322 from nextcloud/12-6303Morris Jobke2017-12-043-4/+4
|\ \ \
| * | | Set primary action button color to same as theming colorJan-Christoph Borchardt2017-11-283-4/+4
* | | | Merge pull request #7353 from nextcloud/12-7346Morris Jobke2017-12-041-6/+6
|\ \ \ \
| * | | | Fix translation of federation scope menuMorris Jobke2017-11-301-6/+6
* | | | | Merge pull request #7362 from nextcloud/12-7347Morris Jobke2017-12-042-1/+16
|\ \ \ \ \
| * | | | | Allow to skip data dir permission checks by configArthur Schiwon2017-12-012-1/+16
| |/ / / /
* | | | | Merge pull request #7355 from nextcloud/12.0.4-finalv12.0.4Morris Jobke2017-12-041-2/+2
|\ \ \ \ \
| * | | | | Release 12.0.4Morris Jobke2017-11-301-2/+2
| |/ / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-0410-0/+26
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-034-0/+16
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-0214-10/+100
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-01202-0/+1282
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-3030-38/+128
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-2924-0/+186
* | | | Merge pull request #7330 from nextcloud/1204-rc3v12.0.4RC3Morris Jobke2017-11-281-2/+2
|\ \ \ \
| * | | | 12.0.4 RC3Morris Jobke2017-11-281-2/+2
|/ / / /
* | | | Merge pull request #7328 from nextcloud/backport/7327/access-list-regression-...Morris Jobke2017-11-282-3/+120
|\ \ \ \ | |_|_|/ |/| | |
| * | | Only in case of $currentAccess the array uses the id as indexJoas Schilling2017-11-281-1/+7
| * | | Fix current access list test and add one for $currentAccess === falseJoas Schilling2017-11-281-2/+113
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-28314-1958/+1066
| |/ / |/| |
* | | Merge pull request #7261 from nextcloud/prepare-12.0.4-RC2v12.0.4RC2Roeland Jago Douma2017-11-271-2/+2
|\ \ \
| * | | Prepare 12.0.4 RC2Morris Jobke2017-11-231-2/+2
* | | | Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webrootRoeland Jago Douma2017-11-273-92/+163
|\ \ \ \ | |_|/ / |/| | |
| * | | CSSResourceLocator: handle SCSS in apps outside rootKyle Fazzari2017-11-223-92/+163
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-272-2/+8
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-258-20/+42
* | | | Merge pull request #7277 from nextcloud/12-7268Lukas Reschke2017-11-241-10/+10
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 18:54:32 +0000