summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10179 from nextcloud/mount-filterMorris Jobke2018-07-112-1/+30
|\
| * Add the option to filter mounts for a userRobin Appelman2018-07-102-1/+30
* | Merge pull request #10025 from nextcloud/smb-rename-invalidargument-retryMorris Jobke2018-07-111-3/+17
|\ \
| * | also retry rename operation on InvalidArgumentExceptionRobin Appelman2018-06-271-3/+17
* | | Merge pull request #10193 from nextcloud/bugfix/10175/sanitize-parameterMorris Jobke2018-07-111-0/+1
|\ \ \
| * | | Sanitize parameters in createSessionToken() while loggingMorris Jobke2018-07-111-0/+1
|/ / /
* | | Merge pull request #10122 from nextcloud/feature/noid/appdata-fopen-streamMorris Jobke2018-07-113-0/+57
|\ \ \
| * | | Separate fopen into read and write methodsJulius Härtl2018-07-113-8/+37
| * | | Add fopen method to ISimpleFileJulius Härtl2018-07-113-0/+28
* | | | Merge pull request #10098 from nextcloud/feature/noid/ldap-image-attributeMorris Jobke2018-07-119-50/+221
|\ \ \ \ | |/ / / |/| | |
| * | | adjust and add more unit testsArthur Schiwon2018-07-054-18/+96
| * | | allow admin to disable fetching of avatars as well as a specific attributeArthur Schiwon2018-07-057-33/+126
* | | | Merge pull request #10125 from nextcloud/feature/9496/comic_mimetypesMorris Jobke2018-07-113-7/+24
|\ \ \ \
| * | | | Add repair stepRoeland Jago Douma2018-07-102-1/+18
| * | | | Give the various comic book file formats distinct mime types so that they can...John Oyler2018-07-101-6/+6
| | |_|/ | |/| |
* | | | Merge pull request #10177 from nextcloud/bugfix/noid/theming-load-with-custom...Morris Jobke2018-07-111-33/+27
|\ \ \ \
| * | | | Load theming app css as well if legacy theme is enabledJulius Härtl2018-07-101-33/+27
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2018-07-1144-162/+364
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-07-10520-2474/+3152
* | | Merge pull request #10010 from nextcloud/bugfix/9992/fix-blocking-cron-jobMorris Jobke2018-07-097-3/+98
|\ \ \
| * | | Suppress potential SQL injection warning as they are false positivesMorris Jobke2018-07-092-0/+4
| * | | Add repair job for pending cron jobsMorris Jobke2018-07-094-0/+78
| * | | Only wait for cron if fix for endless wait is includedMorris Jobke2018-07-092-3/+7
| * | | Unlock failed cron jobs and set a high "last_checked" value to avoid continou...Morris Jobke2018-07-091-0/+9
* | | | Merge pull request #10162 from nextcloud/sabre-put-log-exceptionMorris Jobke2018-07-091-0/+1
|\ \ \ \
| * | | | always log exceptions on dav writeRobin Appelman2018-07-091-0/+1
| |/ / /
* | | | Merge pull request #10161 from nextcloud/bugfix/10158/correctly-handle-users-...Morris Jobke2018-07-091-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Correctly handle users with numeric user idsJoas Schilling2018-07-091-1/+2
|/ / /
* | | Merge pull request #10139 from chiyi4488/patch-1Morris Jobke2018-07-091-1/+1
|\ \ \
| * | | Small text errorchiyi44882018-07-071-1/+1
* | | | Merge pull request #10153 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Morris Jobke2018-07-092-127/+122
|\ \ \ \
| * | | | Bump webpack from 4.14.0 to 4.15.1 in /apps/updatenotificationdependabot[bot]2018-07-092-127/+122
* | | | | Merge pull request #10120 from nextcloud/allow-to-disable-encryptionMorris Jobke2018-07-091-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | allow to disable encryptionBjoern Schiessle2018-07-051-2/+6
* | | | | Merge pull request #10152 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-07-092-119/+116
|\ \ \ \ \
| * | | | | Bump webpack from 4.14.0 to 4.15.1 in /apps/accessibilitydependabot[bot]2018-07-092-119/+116
* | | | | | Merge pull request #10151 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-07-092-2481/+40
|\ \ \ \ \ \
| * | | | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/updatenotificationdependabot[bot]2018-07-092-2481/+40
* | | | | | | Merge pull request #10150 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-07-092-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Bump babel-loader from 7.1.4 to 7.1.5 in /apps/accessibilitydependabot[bot]2018-07-092-4/+4
| |/ / / / / /
* | | | | | | Merge pull request #10156 from nextcloud/bugfix/noid/fix-behat-versionRoeland Jago Douma2018-07-091-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix the behat version to 3.3.*Joas Schilling2018-07-091-1/+1
| |/ / / / /
* | | | | | Merge pull request #10148 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2018-07-092-119/+116
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump webpack from 4.14.0 to 4.15.1 in /settingsdependabot[bot]2018-07-092-119/+116
* | | | | | Merge pull request #10149 from nextcloud/dependabot/npm_and_yarn/settings/bab...Roeland Jago Douma2018-07-092-4/+4
|\ \ \ \ \ \
| * | | | | | Bump babel-loader from 7.1.4 to 7.1.5 in /settingsdependabot[bot]2018-07-092-4/+4
* | | | | | | Merge pull request #10135 from nextcloud/feature/noid/add-visio-mimetypesMorris Jobke2018-07-094-1/+30
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add visio mimetypesJoas Schilling2018-07-064-1/+30
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #10144 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-07-092-959/+23
|\ \ \ \ \ \
| * | | | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/oauth2dependabot[bot]2018-07-092-959/+23
| | |/ / / / | |/| | | |