summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove core.jsChristoph Wurst2019-01-095-97/+0
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Move vendored css ponyfill to npmChristoph Wurst2019-01-098-70/+201
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Remove BowerChristoph Wurst2019-01-095-93/+7
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Npmize (vendor) scriptsChristoph Wurst2019-01-0994-32174/+71370
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #13420 from nextcloud/enh/13042/default-frame-anchestor-setRoeland Jago Douma2019-01-096-63/+65
|\ | | | | Set default frame-ancestors to 'self'
| * Set default frame-ancestors to 'self'Roeland Jago Douma2019-01-086-63/+65
| | | | | | | | | | | | For #13042 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12969 from nextcloud/db-migration-boolean-defaultJoas Schilling2019-01-091-1/+5
|\ \ | | | | | | add support for boolean default
| * | add support for boolean defaultMaxence Lange2019-01-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> code cleaning Signed-off-by: Maxence Lange <maxence@artificial-owl.com> code cleaning Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | Merge pull request #13438 from nextcloud/enh/2fa_backup_use_scoped_cssRoeland Jago Douma2019-01-097-19/+522
|\ \ \ | |/ / |/| | Use the scoped css on the personal page
| * | Use the scoped css on the personal pageRoeland Jago Douma2019-01-097-19/+522
|/ / | | | | | | | | | | Saves loading the style file when we visit the security page. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #13430 from ↵Roeland Jago Douma2019-01-096-3/+147
|\ \ | | | | | | | | | | | | nextcloud/bugfix/13331/respect-classification-of-calendar-events-in-activity-stream Respect classification of calendar events in activity stream
| * | Add a repair step to remove sensitive event activityJoas Schilling2019-01-084-1/+128
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Correctly handle the classification of events in the activity streamJoas Schilling2019-01-082-3/+20
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #13436 from nextcloud/enh/2fa-backup-to-nx-axiosRoeland Jago Douma2019-01-095-25/+20
|\ \ \ | | | | | | | | Use nextcloud-axios in 2fa backupcodes js
| * | | Use nextcloud-axios in 2fa backupcodes jsRoeland Jago Douma2019-01-095-25/+20
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | 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.2
| * | | [3rdparty] Bump symfony/event-dispatcher to 4.2.2Roeland Jago Douma2019-01-091-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [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 optimization
| * | | Switch around syntax of scour command for SVG image optimizationJan-Christoph Borchardt2019-01-081-1/+1
|/ / / | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #13418 from nextcloud/fix/11999/headers_can_be_emptyRoeland Jago Douma2019-01-081-1/+7
|\ \ \ | |_|/ |/| | HttpClient getHeader can return empty string
| * | HttpClient getHeader can return empty stringRoeland Jago Douma2019-01-081-1/+7
|/ / | | | | | | | | | | Fixes #11999 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #13421 from nextcloud/3rdparty/to-masterRoeland Jago Douma2019-01-081-0/+0
|\ \ | | | | | | Actually point 3rdparty to master
| * | Actually point 3rdparty to masterRoeland Jago Douma2019-01-081-0/+0
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #12899 from nextcloud/feature/run-setupcheck-on-overwieMorris Jobke2019-01-081-57/+63
|\ \ | | | | | | Run setupchecks when #security-warnings is present
| * | Run setupchecks when #security-warnings is presentDaniel Kesselberg2019-01-051-57/+63
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #13417 from nextcloud/3rdparty/symfony/translation-4.2.2blizzz2019-01-081-0/+0
|\ \ \ | | | | | | | | [3rdparty] Bump symfony/translation to 4.2.2
| * | | [3rdparty] Bump symfony/translation to 4.2.2Roeland Jago Douma2019-01-071-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [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.2
| * | | [3rdparty] Bump symfony/console to 4.2.2Roeland Jago Douma2019-01-071-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #13406 from nextcloud/fix/12981/client_id_must_be_uniqueMorris Jobke2019-01-074-1/+52
|\ \ \ \ | | | | | | | | | | OAuth2 client identifier must be unique
| * | | | OAuth2 client identifier must be uniqueRoeland Jago Douma2019-01-074-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12981 This is highly unlikely to happen. But better to enforce it on the DB level as well! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #13200 from nextcloud/ie11-compatibility-settingsChristoph Wurst2019-01-0714-42/+40
|\ \ \ \ \ | | | | | | | | | | | | Cleanup of IE11 compatibility for users & apps management
| * \ \ \ \ Merge branch 'master' of https://github.com/nextcloud/server into ↵John Molakvoæ (skjnldsv)2019-01-03235-1272/+5933
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ie11-compatibility-settings
| * | | | | | IE11 compatibility for users & apps managementJohn Molakvoæ (skjnldsv)2018-12-2114-42/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #13403 from nextcloud/csp/allow_data_fontsRoeland Jago Douma2019-01-076-63/+64
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | CSP: Allow fonts to be provided in data
| * | | | | | CSP: Allow fonts to be provided in dataRoeland Jago Douma2019-01-076-63/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #13365 from nextcloud/3rdparty/phpseclib/2.0.12Roeland Jago Douma2019-01-071-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [3rdparty] Bump phpseclib to 2.0.13
| * | | | | | [3rdparty] Bump phpseclib to 2.0.13Roeland Jago Douma2019-01-071-0/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #13402 from nextcloud/fix/13285/inject_the_real_loggerRoeland Jago Douma2019-01-072-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use the real logger in the settings
| * | | | | | Use the real logger in the settingsRoeland Jago Douma2019-01-072-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13285 The wrapper logger should not be used here. But we need the real logger. Since this in internal we can just pass that on directly. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #13381 from nextcloud/menu-apps-fixesRoeland Jago Douma2019-01-071-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix apps menu overlapping
| * | | | | Fix apps menu overlappingJohn Molakvoæ (skjnldsv)2019-01-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #13383 from ↵Morris Jobke2019-01-071-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/3rdparty/broker-add-timezone-cancel-message [3rdparty] Broker: add timezone to CANCEL messages
| * | | | | | [3rdparty] Broker: add timezone to CANCEL messagesDaniel Kesselberg2019-01-051-0/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #12227 from nextcloud/bugfix/cleanu_upload_foldersMorris Jobke2019-01-0710-23/+293
|\ \ \ \ \ \ | | | | | | | | | | | | | | Background job to cleanup leftover chunked uploads
| * | | | | | Add live repair step to cleanup old chunksRoeland Jago Douma2019-01-044-1/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Background job to cleanup leftover chunked uploadsRoeland Jago Douma2019-01-048-22/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #13398 from nextcloud/improve-nav-bullet-collapse-hoverRoeland Jago Douma2019-01-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix/improve collapsible nav bullet hover