summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | [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
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #10145 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-07-092-119/+116
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2dependabot[bot]2018-07-082-119/+116
| |/ / / / /
* | | | | | Merge pull request #10147 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-07-092-993/+32
|\ \ \ \ \ \
| * | | | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibilitydependabot[bot]2018-07-082-993/+32
| |/ / / / /
* | | | | | Merge pull request #10146 from nextcloud/dependabot/npm_and_yarn/settings/css...Roeland Jago Douma2018-07-092-1002/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump css-loader from 0.28.11 to 1.0.0 in /settingsdependabot[bot]2018-07-082-1002/+35
|/ / / / /
* | | | | Merge pull request #10116 from nextcloud/lock-negativeMorris Jobke2018-07-062-2/+20
|\ \ \ \ \
| * | | | | prevent lock values from going negative with memcache backendRobin Appelman2018-07-052-2/+20
* | | | | | Merge pull request #10130 from nextcloud/3rdparty/noid/symfony-3.4.12Roeland Jago Douma2018-07-061-0/+0
|\ \ \ \ \ \
| * | | | | | [3rdparty] Bump symfony depts to 3.4.12Roeland Jago Douma2018-07-061-0/+0
|/ / / / / /
* | | | | | Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailerJoas Schilling2018-07-0610-66/+85
|\ \ \ \ \ \
| * | | | | | Add warning to setup checks if the default mailer is still phpRoeland Jago Douma2018-07-043-1/+44
| * | | | | | Fix settings testsRoeland Jago Douma2018-07-041-2/+2
| * | | | | | Swift to \Swift_Mailer as abstractionRoeland Jago Douma2018-07-042-33/+21
| * | | | | | Make swift 6 compatibleRoeland Jago Douma2018-07-041-26/+16
| * | | | | | Kill php mail from settingsRoeland Jago Douma2018-07-043-9/+7
| * | | | | | [3rdparty] Bump swiftmailer 6.0.2Roeland Jago Douma2018-07-041-0/+0
* | | | | | | Merge pull request #10128 from nextcloud/fix/noid/add_locale_to_templatesMorris Jobke2018-07-063-3/+3
|\ \ \ \ \ \ \