summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added button for new folder to interfaceFlorian Schunk2019-01-092-1/+27
* Merge pull request #13430 from nextcloud/bugfix/13331/respect-classification-...Roeland Jago Douma2019-01-096-3/+147
|\
| * Add a repair step to remove sensitive event activityJoas Schilling2019-01-084-1/+128
| * Correctly handle the classification of events in the activity streamJoas Schilling2019-01-082-3/+20
* | Merge pull request #13436 from nextcloud/enh/2fa-backup-to-nx-axiosRoeland Jago Douma2019-01-095-25/+20
|\ \
| * | Use nextcloud-axios in 2fa backupcodes jsRoeland Jago Douma2019-01-095-25/+20
* | | Merge pull request #13432 from nextcloud/3rdparty/symfony/event-dispatcher-4.2.2Roeland Jago Douma2019-01-091-0/+0
|\ \ \ | |/ / |/| |
| * | [3rdparty] Bump symfony/event-dispatcher to 4.2.2Roeland Jago Douma2019-01-091-0/+0
* | | [tx-robot] updated from transifexNextcloud bot2019-01-098-10/+12
|/ /
* | Merge pull request #13429 from nextcloud/optimization-syntaxMorris Jobke2019-01-081-1/+1
|\ \
| * | Switch around syntax of scour command for SVG image optimizationJan-Christoph Borchardt2019-01-081-1/+1
|/ /
* | Merge pull request #13418 from nextcloud/fix/11999/headers_can_be_emptyRoeland Jago Douma2019-01-081-1/+7
|\ \
| * | HttpClient getHeader can return empty stringRoeland Jago Douma2019-01-081-1/+7
|/ /
* | Merge pull request #13421 from nextcloud/3rdparty/to-masterRoeland Jago Douma2019-01-081-0/+0
|\ \
| * | Actually point 3rdparty to masterRoeland Jago Douma2019-01-081-0/+0
|/ /
* | Merge pull request #12899 from nextcloud/feature/run-setupcheck-on-overwieMorris Jobke2019-01-081-57/+63
|\ \
| * | Run setupchecks when #security-warnings is presentDaniel Kesselberg2019-01-051-57/+63
* | | Merge pull request #13417 from nextcloud/3rdparty/symfony/translation-4.2.2blizzz2019-01-081-0/+0
|\ \ \
| * | | [3rdparty] Bump symfony/translation to 4.2.2Roeland Jago Douma2019-01-071-0/+0
* | | | [tx-robot] updated from transifexNextcloud bot2019-01-082-0/+4
|/ / /
* | | Merge pull request #13409 from nextcloud/3rdparty/symfony/console/4.2.2Roeland Jago Douma2019-01-071-0/+0
|\ \ \
| * | | [3rdparty] Bump symfony/console to 4.2.2Roeland Jago Douma2019-01-071-0/+0
* | | | Merge pull request #13406 from nextcloud/fix/12981/client_id_must_be_uniqueMorris Jobke2019-01-074-1/+52
|\ \ \ \
| * | | | OAuth2 client identifier must be uniqueRoeland Jago Douma2019-01-074-1/+52
* | | | | Merge pull request #13200 from nextcloud/ie11-compatibility-settingsChristoph Wurst2019-01-0714-42/+40
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/nextcloud/server into ie11-compat...John Molakvoæ (skjnldsv)2019-01-03235-1272/+5933
| |\ \ \ \ \
| * | | | | | IE11 compatibility for users & apps managementJohn Molakvoæ (skjnldsv)2018-12-2114-42/+40
* | | | | | | Merge pull request #13403 from nextcloud/csp/allow_data_fontsRoeland Jago Douma2019-01-076-63/+64
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | CSP: Allow fonts to be provided in dataRoeland Jago Douma2019-01-076-63/+64
* | | | | | | Merge pull request #13365 from nextcloud/3rdparty/phpseclib/2.0.12Roeland Jago Douma2019-01-071-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [3rdparty] Bump phpseclib to 2.0.13Roeland Jago Douma2019-01-071-0/+0
| |/ / / / /
* | | | | | Merge pull request #13402 from nextcloud/fix/13285/inject_the_real_loggerRoeland Jago Douma2019-01-072-5/+5
|\ \ \ \ \ \
| * | | | | | Use the real logger in the settingsRoeland Jago Douma2019-01-072-5/+5
| |/ / / / /
* | | | | | Merge pull request #13381 from nextcloud/menu-apps-fixesRoeland Jago Douma2019-01-071-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix apps menu overlappingJohn Molakvoæ (skjnldsv)2019-01-051-0/+1
* | | | | | Merge pull request #13383 from nextcloud/3rdparty/broker-add-timezone-cancel-...Morris Jobke2019-01-071-0/+0
|\ \ \ \ \ \
| * | | | | | [3rdparty] Broker: add timezone to CANCEL messagesDaniel Kesselberg2019-01-051-0/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #12227 from nextcloud/bugfix/cleanu_upload_foldersMorris Jobke2019-01-0710-23/+293
|\ \ \ \ \ \
| * | | | | | Add live repair step to cleanup old chunksRoeland Jago Douma2019-01-044-1/+101
| * | | | | | Background job to cleanup leftover chunked uploadsRoeland Jago Douma2019-01-048-22/+192
* | | | | | | Merge pull request #13398 from nextcloud/improve-nav-bullet-collapse-hoverRoeland Jago Douma2019-01-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make the nav bullet transparent selector more specificMichael Weimann2019-01-061-1/+1
* | | | | | | | Merge pull request #12621 from nextcloud/td/12224/cleanup_middleware_registeringRoeland Jago Douma2019-01-072-111/+87
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Cleanup middleware registeringRoeland Jago Douma2019-01-032-111/+87
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-01-072-2/+2
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #13391 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2019-01-062-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/oauth2dependabot[bot]2019-01-062-4/+4
* | | | | | | | Merge pull request #13392 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-01-062-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/updatenotificationdependabot[bot]2019-01-062-4/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #13393 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2019-01-062-4/+4
|\ \ \ \ \ \ \ \