Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove core.js | Christoph Wurst | 2019-01-09 | 5 | -97/+0 |
| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | Move vendored css ponyfill to npm | Christoph Wurst | 2019-01-09 | 8 | -70/+201 |
| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | Remove Bower | Christoph Wurst | 2019-01-09 | 5 | -93/+7 |
| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | Npmize (vendor) scripts | Christoph Wurst | 2019-01-09 | 94 | -32174/+71370 |
| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | Merge pull request #13420 from nextcloud/enh/13042/default-frame-anchestor-set | Roeland Jago Douma | 2019-01-09 | 6 | -63/+65 |
|\ | | | | | Set default frame-ancestors to 'self' | ||||
| * | Set default frame-ancestors to 'self' | Roeland Jago Douma | 2019-01-08 | 6 | -63/+65 |
| | | | | | | | | | | | | For #13042 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #12969 from nextcloud/db-migration-boolean-default | Joas Schilling | 2019-01-09 | 1 | -1/+5 |
|\ \ | | | | | | | add support for boolean default | ||||
| * | | add support for boolean default | Maxence Lange | 2019-01-09 | 1 | -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_css | Roeland Jago Douma | 2019-01-09 | 7 | -19/+522 |
|\ \ \ | |/ / |/| | | Use the scoped css on the personal page | ||||
| * | | Use the scoped css on the personal page | Roeland Jago Douma | 2019-01-09 | 7 | -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 Douma | 2019-01-09 | 6 | -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 activity | Joas Schilling | 2019-01-08 | 4 | -1/+128 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Correctly handle the classification of events in the activity stream | Joas Schilling | 2019-01-08 | 2 | -3/+20 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #13436 from nextcloud/enh/2fa-backup-to-nx-axios | Roeland Jago Douma | 2019-01-09 | 5 | -25/+20 |
|\ \ \ | | | | | | | | | Use nextcloud-axios in 2fa backupcodes js | ||||
| * | | | Use nextcloud-axios in 2fa backupcodes js | Roeland Jago Douma | 2019-01-09 | 5 | -25/+20 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #13432 from nextcloud/3rdparty/symfony/event-dispatcher-4.2.2 | Roeland Jago Douma | 2019-01-09 | 1 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | [3rdparty] Bump symfony/event-dispatcher to 4.2.2 | ||||
| * | | | [3rdparty] Bump symfony/event-dispatcher to 4.2.2 | Roeland Jago Douma | 2019-01-09 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2019-01-09 | 8 | -10/+12 |
|/ / / | |||||
* | | | Merge pull request #13429 from nextcloud/optimization-syntax | Morris Jobke | 2019-01-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Switch around syntax of scour command for SVG image optimization | ||||
| * | | | Switch around syntax of scour command for SVG image optimization | Jan-Christoph Borchardt | 2019-01-08 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | Merge pull request #13418 from nextcloud/fix/11999/headers_can_be_empty | Roeland Jago Douma | 2019-01-08 | 1 | -1/+7 |
|\ \ \ | |_|/ |/| | | HttpClient getHeader can return empty string | ||||
| * | | HttpClient getHeader can return empty string | Roeland Jago Douma | 2019-01-08 | 1 | -1/+7 |
|/ / | | | | | | | | | | | Fixes #11999 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #13421 from nextcloud/3rdparty/to-master | Roeland Jago Douma | 2019-01-08 | 1 | -0/+0 |
|\ \ | | | | | | | Actually point 3rdparty to master | ||||
| * | | Actually point 3rdparty to master | Roeland Jago Douma | 2019-01-08 | 1 | -0/+0 |
|/ / | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #12899 from nextcloud/feature/run-setupcheck-on-overwie | Morris Jobke | 2019-01-08 | 1 | -57/+63 |
|\ \ | | | | | | | Run setupchecks when #security-warnings is present | ||||
| * | | Run setupchecks when #security-warnings is present | Daniel Kesselberg | 2019-01-05 | 1 | -57/+63 |
| | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> | ||||
* | | | Merge pull request #13417 from nextcloud/3rdparty/symfony/translation-4.2.2 | blizzz | 2019-01-08 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | [3rdparty] Bump symfony/translation to 4.2.2 | ||||
| * | | | [3rdparty] Bump symfony/translation to 4.2.2 | Roeland Jago Douma | 2019-01-07 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2019-01-08 | 2 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #13409 from nextcloud/3rdparty/symfony/console/4.2.2 | Roeland Jago Douma | 2019-01-07 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | [3rdparty] Bump symfony/console to 4.2.2 | ||||
| * | | | [3rdparty] Bump symfony/console to 4.2.2 | Roeland Jago Douma | 2019-01-07 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #13406 from nextcloud/fix/12981/client_id_must_be_unique | Morris Jobke | 2019-01-07 | 4 | -1/+52 |
|\ \ \ \ | | | | | | | | | | | OAuth2 client identifier must be unique | ||||
| * | | | | OAuth2 client identifier must be unique | Roeland Jago Douma | 2019-01-07 | 4 | -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-settings | Christoph Wurst | 2019-01-07 | 14 | -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-03 | 235 | -1272/+5933 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | ie11-compatibility-settings | ||||
| * | | | | | | IE11 compatibility for users & apps management | John Molakvoæ (skjnldsv) | 2018-12-21 | 14 | -42/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | | | | Merge pull request #13403 from nextcloud/csp/allow_data_fonts | Roeland Jago Douma | 2019-01-07 | 6 | -63/+64 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | CSP: Allow fonts to be provided in data | ||||
| * | | | | | | CSP: Allow fonts to be provided in data | Roeland Jago Douma | 2019-01-07 | 6 | -63/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | | | Merge pull request #13365 from nextcloud/3rdparty/phpseclib/2.0.12 | Roeland Jago Douma | 2019-01-07 | 1 | -0/+0 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | [3rdparty] Bump phpseclib to 2.0.13 | ||||
| * | | | | | | [3rdparty] Bump phpseclib to 2.0.13 | Roeland Jago Douma | 2019-01-07 | 1 | -0/+0 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | | Merge pull request #13402 from nextcloud/fix/13285/inject_the_real_logger | Roeland Jago Douma | 2019-01-07 | 2 | -5/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use the real logger in the settings | ||||
| * | | | | | | Use the real logger in the settings | Roeland Jago Douma | 2019-01-07 | 2 | -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-fixes | Roeland Jago Douma | 2019-01-07 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix apps menu overlapping | ||||
| * | | | | | Fix apps menu overlapping | John Molakvoæ (skjnldsv) | 2019-01-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | | | Merge pull request #13383 from ↵ | Morris Jobke | 2019-01-07 | 1 | -0/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/3rdparty/broker-add-timezone-cancel-message [3rdparty] Broker: add timezone to CANCEL messages | ||||
| * | | | | | | [3rdparty] Broker: add timezone to CANCEL messages | Daniel Kesselberg | 2019-01-05 | 1 | -0/+0 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> | ||||
* | | | | | | Merge pull request #12227 from nextcloud/bugfix/cleanu_upload_folders | Morris Jobke | 2019-01-07 | 10 | -23/+293 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Background job to cleanup leftover chunked uploads | ||||
| * | | | | | | Add live repair step to cleanup old chunks | Roeland Jago Douma | 2019-01-04 | 4 | -1/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | | Background job to cleanup leftover chunked uploads | Roeland Jago Douma | 2019-01-04 | 8 | -22/+192 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | | | Merge pull request #13398 from nextcloud/improve-nav-bullet-collapse-hover | Roeland Jago Douma | 2019-01-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix/improve collapsible nav bullet hover |