Commit Graph

47600 Commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv) dbee410a6e
Override select2 lib styling
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-01-09 15:02:01 +01:00
Christoph Wurst 83068c39e5
Update select2, include css
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:02:01 +01:00
Roeland Jago Douma a34027348b
Mergejs is gone
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-09 15:02:01 +01:00
Christoph Wurst 15400fcf7b
Use `jquery-ui-dist` instead of `jquery-ui` to resolve an issue with effects
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:02:01 +01:00
Christoph Wurst 69410a4f1c
Adjust release file list
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:02:01 +01:00
Christoph Wurst 01a6181d9f
Don't load old vendor files during jsunit tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:02:00 +01:00
Christoph Wurst b3b41413f8
Move dev deps to devDependencies
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:02:00 +01:00
Christoph Wurst 1e80259051
Remove core.js
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:02:00 +01:00
Christoph Wurst 5bf06a19a8
Move vendored css ponyfill to npm
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:02:00 +01:00
Christoph Wurst 6da13f82ff
Remove Bower
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:01:59 +01:00
Christoph Wurst 208788173d
Npmize (vendor) scripts
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-01-09 15:01:59 +01:00
Roeland Jago Douma 1fd6741182
Merge pull request #13420 from nextcloud/enh/13042/default-frame-anchestor-set
Set default frame-ancestors to 'self'
2019-01-09 14:27:47 +01:00
Joas Schilling b8bb1d491f
Merge pull request #12969 from nextcloud/db-migration-boolean-default
add support for boolean default
2019-01-09 14:00:07 +01:00
Roeland Jago Douma 6e3b9ee75c
Merge pull request #13438 from nextcloud/enh/2fa_backup_use_scoped_css
Use the scoped css on the personal page
2019-01-09 12:53:01 +01:00
Roeland Jago Douma a2de273943
Use the scoped css on the personal page
Saves loading the style file when we visit the security page.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-09 11:45:03 +01:00
Maxence Lange 8002779200
add support for boolean default
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>
2019-01-09 11:21:14 +01:00
Roeland Jago Douma 8593edd66d
Merge pull request #13430 from nextcloud/bugfix/13331/respect-classification-of-calendar-events-in-activity-stream
Respect classification of calendar events in activity stream
2019-01-09 10:03:23 +01:00
Roeland Jago Douma 1c5e43ff8e
Merge pull request #13436 from nextcloud/enh/2fa-backup-to-nx-axios
Use nextcloud-axios in 2fa backupcodes js
2019-01-09 09:55:42 +01:00
Roeland Jago Douma 422675510a
Merge pull request #13432 from nextcloud/3rdparty/symfony/event-dispatcher-4.2.2
[3rdparty] Bump symfony/event-dispatcher to 4.2.2
2019-01-09 09:40:11 +01:00
Roeland Jago Douma 9ccdc0a75c
Use nextcloud-axios in 2fa backupcodes js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-09 09:30:10 +01:00
Roeland Jago Douma 336cd77dbd
[3rdparty] Bump symfony/event-dispatcher to 4.2.2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-09 09:14:26 +01:00
Nextcloud bot 057fab2e50
[tx-robot] updated from transifex 2019-01-09 01:12:39 +00:00
Morris Jobke c3e2a68b58
Merge pull request #13429 from nextcloud/optimization-syntax
Switch around syntax of scour command for SVG image optimization
2019-01-08 18:48:59 +01:00
Joas Schilling 9f2d14447f
Add a repair step to remove sensitive event activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-08 18:39:40 +01:00
Joas Schilling 32d76c7c92
Correctly handle the classification of events in the activity stream
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-08 17:46:07 +01:00
Jan-Christoph Borchardt 1799d0fd11
Switch around syntax of scour command for SVG image optimization
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-01-08 17:03:33 +01:00
Roeland Jago Douma ad676c0102
Set default frame-ancestors to 'self'
For #13042

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-08 15:36:40 +01:00
Roeland Jago Douma b35db6c784
Merge pull request #13418 from nextcloud/fix/11999/headers_can_be_empty
HttpClient getHeader can return empty string
2019-01-08 15:35:29 +01:00
Roeland Jago Douma 08970aaee2
HttpClient getHeader can return empty string
Fixes #11999

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-08 14:14:59 +01:00
Roeland Jago Douma 68b478ea86
Merge pull request #13421 from nextcloud/3rdparty/to-master
Actually point 3rdparty to master
2019-01-08 14:13:27 +01:00
Roeland Jago Douma 4603d0224f
Actually point 3rdparty to master
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-08 14:10:39 +01:00
Morris Jobke 8f7839ef3e
Merge pull request #12899 from nextcloud/feature/run-setupcheck-on-overwie
Run setupchecks when #security-warnings is present
2019-01-08 12:32:53 +01:00
blizzz 3690e086e7
Merge pull request #13417 from nextcloud/3rdparty/symfony/translation-4.2.2
[3rdparty] Bump symfony/translation to 4.2.2
2019-01-08 11:36:30 +01:00
Nextcloud bot e8040d896a
[tx-robot] updated from transifex 2019-01-08 01:12:02 +00:00
Roeland Jago Douma e6c585f0e6
[3rdparty] Bump symfony/translation to 4.2.2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-07 21:41:08 +01:00
Roeland Jago Douma ad989f1c34
Merge pull request #13409 from nextcloud/3rdparty/symfony/console/4.2.2
[3rdparty] Bump symfony/console to 4.2.2
2019-01-07 20:01:16 +01:00
Roeland Jago Douma ada8d27175
[3rdparty] Bump symfony/console to 4.2.2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-07 19:19:49 +01:00
Morris Jobke dd06b6f54c
Merge pull request #13406 from nextcloud/fix/12981/client_id_must_be_unique
OAuth2 client identifier must be unique
2019-01-07 17:12:15 +01:00
Christoph Wurst fec8743270
Merge pull request #13200 from nextcloud/ie11-compatibility-settings
Cleanup of IE11 compatibility for users & apps management
2019-01-07 15:58:25 +01:00
Roeland Jago Douma 6e4c5a6248
Merge pull request #13403 from nextcloud/csp/allow_data_fonts
CSP: Allow fonts to be provided in data
2019-01-07 15:39:45 +01:00
Roeland Jago Douma 64244e1a4f
CSP: Allow fonts to be provided in data
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-07 15:07:06 +01:00
Roeland Jago Douma 8508e296e3
Merge pull request #13365 from nextcloud/3rdparty/phpseclib/2.0.12
[3rdparty] Bump phpseclib to 2.0.13
2019-01-07 14:13:53 +01:00
Roeland Jago Douma eb407565b0
OAuth2 client identifier must be unique
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>
2019-01-07 13:51:59 +01:00
Roeland Jago Douma bd697f63bd
Merge pull request #13402 from nextcloud/fix/13285/inject_the_real_logger
Use the real logger in the settings
2019-01-07 13:40:01 +01:00
Roeland Jago Douma e11048932f
Merge pull request #13381 from nextcloud/menu-apps-fixes
Fix apps menu overlapping
2019-01-07 13:33:20 +01:00
Roeland Jago Douma e0f41dfcdc
[3rdparty] Bump phpseclib to 2.0.13
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-07 13:04:57 +01:00
Roeland Jago Douma 8e914c01c5
Use the real logger in the settings
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>
2019-01-07 12:32:07 +01:00
Morris Jobke b820803cf1
Merge pull request #13383 from nextcloud/3rdparty/broker-add-timezone-cancel-message
[3rdparty] Broker: add timezone to CANCEL messages
2019-01-07 11:45:21 +01:00
Morris Jobke 2bd98daaa2
Merge pull request #12227 from nextcloud/bugfix/cleanu_upload_folders
Background job to cleanup leftover chunked uploads
2019-01-07 11:19:43 +01:00
Roeland Jago Douma 8f4e6fcea1
Merge pull request #13398 from nextcloud/improve-nav-bullet-collapse-hover
Fix/improve collapsible nav bullet hover
2019-01-07 11:10:41 +01:00