summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-11-1730-2/+104
* [tx-robot] updated from transifexNextcloud bot2017-11-1628-4/+154
* [tx-robot] updated from transifexNextcloud bot2017-11-15120-228/+242
* [tx-robot] updated from transifexNextcloud bot2017-11-1432-2/+398
* [tx-robot] updated from transifexNextcloud bot2017-11-138-0/+14
* [tx-robot] updated from transifexNextcloud bot2017-11-1274-372/+544
* [tx-robot] updated from transifexNextcloud bot2017-11-11390-580/+22656
* Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12blizzz2017-11-1011-17/+17
|\
| * Fix welcome text for better grammar in themed instancesMorris Jobke2017-11-0911-17/+17
| * Improve text: 'you have now' -> 'you now have'Leon Klingele2017-09-1211-17/+17
* | [tx-robot] updated from transifexNextcloud bot2017-11-10286-26/+23014
* | Merge pull request #7120 from nextcloud/12-6988Morris Jobke2017-11-091-1/+5
|\ \
| * | Improve performance of UserMountCache with external storage foldersDariusz Olszewski2017-11-091-1/+5
* | | Merge pull request #7116 from nextcloud/12-fix-6033Roeland Jago Douma2017-11-091-1/+1
|\ \ \
| * | | Fix icon for security settingsMorris Jobke2017-11-091-1/+1
* | | | Merge pull request #7118 from nextcloud/12-7109Roeland Jago Douma2017-11-091-0/+4
|\ \ \ \
| * | | | If for some reason the json can't be decoded it is not cachedRoeland Jago Douma2017-11-091-0/+4
| | |/ / | |/| |
* / | | [tx-robot] updated from transifexNextcloud bot2017-11-0958-56/+2
|/ / /
* | | Merge pull request #6847 from nextcloud/filelist-confict-path-12Morris Jobke2017-11-091-14/+17
|\ \ \
| * | | never show '/' as path for conflicting file namesRobin Appelman2017-11-071-1/+3
| * | | still trigger conflict resolution for existing entries when the current entry...Robin Appelman2017-11-071-15/+16
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-09314-1398/+2834
* | | | Merge pull request #7114 from nextcloud/12-7110Morris Jobke2017-11-083-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Theming: theme flow redirection pageJulius Härtl2017-11-083-3/+3
|/ / /
* | | Merge pull request #7102 from nextcloud/revert-6774-backport-6645-only-colons...Morris Jobke2017-11-081-16/+0
|\ \ \
| * | | Revert "[stable12] Only allow colons in db host for IPv6 addresses"Morris Jobke2017-11-081-16/+0
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-0842-86/+2086
|/ / /
* | | Merge pull request #7096 from nextcloud/backport-stable12-7042Lukas Reschke2017-11-073-8/+115
|\ \ \ | |/ / |/| |
| * | ensure uid for calendar objects is uniqueGeorg Ehrke2017-11-073-8/+115
* | | Merge pull request #6699 from nextcloud/backport-6522-stable12Morris Jobke2017-11-0718-82/+121
|\ \ \
| * | | Backport of #6522Arthur Schiwon2017-09-2918-82/+121
* | | | Merge pull request #7095 from nextcloud/12-7059Morris Jobke2017-11-071-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | core: hide spinner for initial installKyle Fazzari2017-11-071-0/+2
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-11-0770-2/+6284
* | | Merge pull request #7082 from nextcloud/12-6974Morris Jobke2017-11-061-2/+22
|\ \ \
| * | | Fix seeking on object storageMorris Jobke2017-11-061-2/+22
* | | | Merge pull request #7081 from nextcloud/12-6958Morris Jobke2017-11-063-1/+15
|\ \ \ \
| * | | | Improve mimetype detection for object storagesMorris Jobke2017-11-063-1/+15
| |/ / /
* | | | Merge pull request #7079 from nextcloud/s3-read-object-fopen-stable12Morris Jobke2017-11-061-5/+8
|\ \ \ \ | |/ / / |/| | |
| * | | use fopen directly when reading objects from s3Robin Appelman2017-11-061-5/+8
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-11-0616-110/+148
* | | [tx-robot] updated from transifexNextcloud bot2017-11-054-0/+8
* | | [tx-robot] updated from transifexNextcloud bot2017-11-0414-0/+30
* | | [tx-robot] updated from transifexNextcloud bot2017-11-03230-214/+7350
* | | [tx-robot] updated from transifexNextcloud bot2017-11-024-2/+12
* | | Merge pull request #7040 from nextcloud/7039_12Joas Schilling2017-11-011-2/+2
|\ \ \
| * | | Translate Grant AccessRoeland Jago Douma2017-11-011-2/+2
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-11-0184-110/+310
* | | Merge pull request #7028 from nextcloud/stable12-login-readabilityJan-Christoph Borchardt2017-10-311-0/+2
|\ \ \
| * | | Better readability for text on log in page which is directly on backgroundsJan-Christoph Borchardt2017-10-311-0/+2