summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-09-2822-8/+110
* Merge pull request #17258 from nextcloud/smb-timeout-configRoeland Jago Douma2019-09-272-1/+11
|\
| * Update apps/files_external/lib/Lib/Backend/SMB.phpRobin Appelman2019-09-251-1/+1
| * add (hidden) option to configure smb timeoutRobin Appelman2019-09-252-1/+11
* | Merge pull request #17286 from nextcloud/bugfix/noid/correctly-detect-mimetyp...Joas Schilling2019-09-271-1/+1
|\ \
| * | Correctly detect the mimetype from uploadsJoas Schilling2019-09-261-1/+1
* | | Merge pull request #17245 from nextcloud/bugfix/noid/fix-migrationRoeland Jago Douma2019-09-263-3/+12
|\ \ \ | |/ / |/| |
| * | Fix "Cannot add a NOT NULL column with default value NULL"Joas Schilling2019-09-263-3/+12
|/ /
* | Merge pull request #17264 from nextcloud/move-from-storage-wrappersRoeland Jago Douma2019-09-263-21/+134
|\ \
| * | handle moveFromStorage within the same storage even when storage wrappers are...Robin Appelman2019-09-253-21/+134
| |/
* | Merge pull request #14913 from nextcloud/bugfix/6954/scan-external-s3Roeland Jago Douma2019-09-261-4/+51
|\ \
| * | Use local variable for directory nameDaniel Kesselberg2019-09-231-2/+3
| * | Don't strip path from directory prefixDaniel Kesselberg2019-09-231-1/+6
| * | Fill directory cache from opendirDaniel Kesselberg2019-09-231-1/+3
| * | Change visibility to private (from protected)Daniel Kesselberg2019-09-231-1/+1
| * | Rename $location to $pathDaniel Kesselberg2019-09-231-7/+7
| * | Add method to check if directory existsDaniel Kesselberg2019-09-231-2/+41
* | | Merge pull request #17252 from nextcloud/bugfix/noid/user-0-can-not-commentRoeland Jago Douma2019-09-262-5/+5
|\ \ \
| * | | Fix user with id 0 to be able to commentJoas Schilling2019-09-252-5/+5
* | | | Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-deleteRoeland Jago Douma2019-09-263-3/+90
|\ \ \ \
| * | | | dont delete cache entries if deleting an object from object store failedRobin Appelman2019-09-253-3/+90
| | |_|/ | |/| |
* | | | Merge pull request #17181 from nextcloud/feature/noid/talk-attachmentJoas Schilling2019-09-261-0/+37
|\ \ \ \
| * | | | Add talk-attachment as a rich object typeJoas Schilling2019-09-171-0/+37
* | | | | [tx-robot] updated from transifexNextcloud bot2019-09-262-0/+12
* | | | | Merge pull request #17254 from nextcloud/fix/double_escapeRoeland Jago Douma2019-09-257-49/+50
|\ \ \ \ \
| * | | | | Properly import DOMPurify in l10n.jsRoeland Jago Douma2019-09-257-49/+50
* | | | | | Fix spaces being collapsed in move dialog (#17240)John Molakvoæ2019-09-251-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix spaces being collapsed in move dialogGary Kim2019-09-241-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #17253 from nextcloud/fix/apptoken_creationRoeland Jago Douma2019-09-255-6/+10
|\ \ \ \ \
| * | | | | Fix apptoken creationRoeland Jago Douma2019-09-255-6/+10
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2019-09-2528-208/+488
* | | | | Merge pull request #16641 from nextcloud/enh/files_additionalscriptsRoeland Jago Douma2019-09-2411-19/+168
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Move over comments to the new eventRoeland Jago Douma2019-09-234-9/+51
| * | | | Add new LoadAdditionalScriptsEventRoeland Jago Douma2019-09-237-10/+117
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2019-09-2434-180/+200
|/ / /
* | | Merge pull request #17163 from nextcloud/bugfix/noid/print-error-on-data-dir-...Roeland Jago Douma2019-09-232-21/+26
|\ \ \
| * | | Print the error pages as error so we load less scripts and might be able to v...Joas Schilling2019-09-161-1/+1
| * | | Print plain error when the error page errors tooJoas Schilling2019-09-161-20/+25
* | | | Merge pull request #17232 from nextcloud/dependabot/npm_and_yarn/build/handle...Roeland Jago Douma2019-09-232-4/+4
|\ \ \ \
| * | | | Bump handlebars from 4.2.0 to 4.2.1 in /builddependabot-preview[bot]2019-09-222-4/+4
* | | | | Merge pull request #17234 from nextcloud/dependabot/npm_and_yarn/dompurify-2.0.1Roeland Jago Douma2019-09-238-12/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump dompurify from 2.0.0 to 2.0.1dependabot-preview[bot]2019-09-238-12/+12
|/ / / /
* | | | Merge pull request #17233 from nextcloud/dependabot/npm_and_yarn/handlebars-4...Roeland Jago Douma2019-09-2210-148/+67
|\ \ \ \
| * | | | Bump handlebars from 4.2.0 to 4.2.1dependabot-preview[bot]2019-09-2210-155/+74
* | | | | Merge pull request #17235 from nextcloud/dependabot/npm_and_yarn/webpack-cli-...Roeland Jago Douma2019-09-222-11/+11
|\ \ \ \ \
| * | | | | Bump webpack-cli from 3.3.8 to 3.3.9dependabot-preview[bot]2019-09-222-11/+11
| |/ / / /
* / / / / [tx-robot] updated from transifexNextcloud bot2019-09-222-0/+4
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2019-09-216-2/+126
* | | | [tx-robot] updated from transifexNextcloud bot2019-09-204-0/+32
* | | | Merge pull request #17017 from ritsute/fix/css-actions.creatableRoeland Jago Douma2019-09-191-2/+2
|\ \ \ \