| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #7261 from nextcloud/prepare-12.0.4-RC2v12.0.4RC2 | Roeland Jago Douma | 2017-11-27 | 1 | -2/+2 |
|\ |
|
| * | Prepare 12.0.4 RC2 | Morris Jobke | 2017-11-23 | 1 | -2/+2 |
* | | Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot | Roeland Jago Douma | 2017-11-27 | 3 | -92/+163 |
|\ \ |
|
| * | | CSSResourceLocator: handle SCSS in apps outside root | Kyle Fazzari | 2017-11-22 | 3 | -92/+163 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-27 | 2 | -2/+8 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-25 | 8 | -20/+42 |
* | | | Merge pull request #7277 from nextcloud/12-7268 | Lukas Reschke | 2017-11-24 | 1 | -10/+10 |
|\ \ \ |
|
| * | | | Update CRL due to files_frommail | Morris Jobke | 2017-11-24 | 1 | -10/+10 |
|/ / / |
|
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-24 | 4 | -6/+30 |
* | | | Merge pull request #7262 from nextcloud/backport/7168/files-access-list-with-... | Morris Jobke | 2017-11-23 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix accesslist when a user has an ID only containting 0-9 | Joas Schilling | 2017-11-23 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge pull request #7245 from nextcloud/feature/noid/allow-migration-from-com... | Morris Jobke | 2017-11-23 | 2 | -2/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | Allow migration from upcoming 10.0.4 ownCloud release | Joas Schilling | 2017-11-22 | 2 | -2/+6 |
* | | | Merge pull request #7259 from nextcloud/7211-stable12 | Morris Jobke | 2017-11-23 | 1 | -3/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | only replace permission popupmenu | Arthur Schiwon | 2017-11-23 | 1 | -3/+3 |
|/ / |
|
* / | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-23 | 14 | -16/+144 |
|/ |
|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-22 | 4 | -0/+6 |
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-21 | 4 | -0/+18 |
* | Merge pull request #7225 from nextcloud/12.0.4RC-versionv12.0.4RC1 | Roeland Jago Douma | 2017-11-20 | 1 | -2/+2 |
|\ |
|
| * | 12.0.4 RC | Morris Jobke | 2017-11-20 | 1 | -2/+2 |
* | | Merge pull request #7170 from kyrofa/backport/6028/app_path_realpath | Roeland Jago Douma | 2017-11-20 | 4 | -0/+304 |
|\ \
| |/
|/| |
|
| * | {J,CS}SResourceLocator: account for symlinks in app path | Kyle Fazzari | 2017-11-14 | 4 | -0/+304 |
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-20 | 22 | -42/+134 |
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-19 | 18 | -12/+52 |
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-18 | 10 | -0/+16 |
* | | Merge pull request #7207 from nextcloud/fix-object-storage-touch-12 | Björn Schießle | 2017-11-17 | 1 | -14/+13 |
|\ \ |
|
| * | | only create the file cache entry after the empty file was created successfull... | Bjoern Schiessle | 2017-11-17 | 1 | -14/+13 |
|/ / |
|
* | | Merge pull request #7186 from nextcloud/s3-download-stream-fix-12 | Björn Schießle | 2017-11-17 | 2 | -3/+9 |
|\ \ |
|
| * | | Use non empty files for object store touch | Robin Appelman | 2017-11-15 | 1 | -2/+2 |
| * | | Fix contructing headers for s3 download | Robin Appelman | 2017-11-15 | 1 | -1/+7 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-17 | 30 | -2/+104 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-16 | 28 | -4/+154 |
|/ / |
|
* / | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-15 | 120 | -228/+242 |
|/ |
|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-14 | 32 | -2/+398 |
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-13 | 8 | -0/+14 |
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-12 | 74 | -372/+544 |
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-11 | 390 | -580/+22656 |
* | Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12 | blizzz | 2017-11-10 | 11 | -17/+17 |
|\ |
|
| * | Fix welcome text for better grammar in themed instances | Morris Jobke | 2017-11-09 | 11 | -17/+17 |
| * | Improve text: 'you have now' -> 'you now have' | Leon Klingele | 2017-09-12 | 11 | -17/+17 |
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-10 | 286 | -26/+23014 |
* | | Merge pull request #7120 from nextcloud/12-6988 | Morris Jobke | 2017-11-09 | 1 | -1/+5 |
|\ \ |
|
| * | | Improve performance of UserMountCache with external storage folders | Dariusz Olszewski | 2017-11-09 | 1 | -1/+5 |
* | | | Merge pull request #7116 from nextcloud/12-fix-6033 | Roeland Jago Douma | 2017-11-09 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix icon for security settings | Morris Jobke | 2017-11-09 | 1 | -1/+1 |
* | | | | Merge pull request #7118 from nextcloud/12-7109 | Roeland Jago Douma | 2017-11-09 | 1 | -0/+4 |
|\ \ \ \ |
|
| * | | | | If for some reason the json can't be decoded it is not cached | Roeland Jago Douma | 2017-11-09 | 1 | -0/+4 |
| | |/ /
| |/| | |
|
* / | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-09 | 58 | -56/+2 |
|/ / / |
|
* | | | Merge pull request #6847 from nextcloud/filelist-confict-path-12 | Morris Jobke | 2017-11-09 | 1 | -14/+17 |
|\ \ \ |
|
| * | | | never show '/' as path for conflicting file names | Robin Appelman | 2017-11-07 | 1 | -1/+3 |