summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Update CRL due to files_frommailMorris Jobke2017-11-241-10/+10
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-11-244-6/+30
* | | Merge pull request #7262 from nextcloud/backport/7168/files-access-list-with-...Morris Jobke2017-11-231-1/+1
|\ \ \
| * | | Fix accesslist when a user has an ID only containting 0-9Joas Schilling2017-11-231-1/+1
| | |/ | |/|
* | | Merge pull request #7245 from nextcloud/feature/noid/allow-migration-from-com...Morris Jobke2017-11-232-2/+6
|\ \ \ | |/ / |/| |
| * | Allow migration from upcoming 10.0.4 ownCloud releaseJoas Schilling2017-11-222-2/+6
* | | Merge pull request #7259 from nextcloud/7211-stable12Morris Jobke2017-11-231-3/+3
|\ \ \ | |_|/ |/| |
| * | only replace permission popupmenuArthur Schiwon2017-11-231-3/+3
|/ /
* / [tx-robot] updated from transifexNextcloud bot2017-11-2314-16/+144
|/
* [tx-robot] updated from transifexNextcloud bot2017-11-224-0/+6
* [tx-robot] updated from transifexNextcloud bot2017-11-214-0/+18
* Merge pull request #7225 from nextcloud/12.0.4RC-versionv12.0.4RC1Roeland Jago Douma2017-11-201-2/+2
|\
| * 12.0.4 RCMorris Jobke2017-11-201-2/+2
* | Merge pull request #7170 from kyrofa/backport/6028/app_path_realpathRoeland Jago Douma2017-11-204-0/+304
|\ \ | |/ |/|
| * {J,CS}SResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-144-0/+304
* | [tx-robot] updated from transifexNextcloud bot2017-11-2022-42/+134
* | [tx-robot] updated from transifexNextcloud bot2017-11-1918-12/+52
* | [tx-robot] updated from transifexNextcloud bot2017-11-1810-0/+16
* | Merge pull request #7207 from nextcloud/fix-object-storage-touch-12Björn Schießle2017-11-171-14/+13
|\ \
| * | only create the file cache entry after the empty file was created successfull...Bjoern Schiessle2017-11-171-14/+13
|/ /
* | Merge pull request #7186 from nextcloud/s3-download-stream-fix-12Björn Schießle2017-11-172-3/+9
|\ \
| * | Use non empty files for object store touchRobin Appelman2017-11-151-2/+2
| * | Fix contructing headers for s3 downloadRobin Appelman2017-11-151-1/+7
* | | [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