summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
* | | Merge pull request #6878 from nextcloud/allow-migrating-from-10.0.3.3Joas Schilling2017-10-311-0/+1
|\ \ \ | |/ / |/| |
| * | Allow to migrate from 10.0.3.3Joas Schilling2017-10-191-0/+1
* | | [tx-robot] updated from transifexNextcloud bot2017-10-3122-34/+348
* | | Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changedMorris Jobke2017-10-303-1/+7
|\ \ \
| * | | bugfix: set/change page title when switching to file tagsBernd Stellwag2017-10-271-0/+3
| * | | bugfix: set/change page title when switching to filelistBernd Stellwag2017-10-272-1/+4
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-306-8/+10
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-298-20/+38
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-2814-86/+122
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-10-2728-32/+128
* | | [tx-robot] updated from transifexNextcloud bot2017-10-26102-150/+226
* | | Merge pull request #6935 from nextcloud/12-5780Morris Jobke2017-10-253-11/+4
|\ \ \
| * | | Merge vendor/core.jsMorris Jobke2017-10-251-7/+0
| * | | Add space between ellipsis and wordMorris Jobke2017-10-252-3/+3
| * | | Update file-upload.jsrakekniven2017-10-241-2/+2
| * | | Replace ... with …Morris Jobke2017-10-242-4/+4
* | | | Merge pull request #6944 from nextcloud/12-6433Morris Jobke2017-10-251-2/+2
|\ \ \ \
| * | | | Fix uninitialized variable $this->paramsWilliam Pain2017-10-251-2/+2
| |/ / /
* | | | Merge pull request #6946 from nextcloud/12-6574Morris Jobke2017-10-251-1/+1
|\ \ \ \
| * | | | Fix undefined offset warning when using '/' as external storage rootRobin Appelman2017-10-251-1/+1
| |/ / /
* | | | Merge pull request #6942 from nextcloud/12-6826Joas Schilling2017-10-251-6/+12
|\ \ \ \