Commit Graph

46405 Commits

Author SHA1 Message Date
Morris Jobke 302a5d8171
Merge pull request #11785 from nextcloud/3rdparty/azure/1.2.0
[3rdparty] Bump azure-storage-blog 1.2.0
2018-10-18 11:49:08 +02:00
Morris Jobke 729b853a30
Merge pull request #11853 from nextcloud/csp/comments
Move more comments to compiled handlebars
2018-10-18 11:40:00 +02:00
Morris Jobke 4e53ea6dbd
Merge pull request #11822 from nextcloud/bugfix/noid/forbid_freebusy_but_allow_local_delivery
allow local delivery of schedule message while prohibiting FreeBusy requests
2018-10-18 11:35:51 +02:00
Morris Jobke b25307d949
Merge pull request #11896 from nextcloud/fix/personal-2fa-settings-unreliable-state
Remove unreliable 2FA state message on personal 2FA settings page
2018-10-18 11:22:49 +02:00
blizzz 0c05ed1d3d
Merge pull request #11878 from nextcloud/no-require-same-site-cookie-on-assets
Don't require Same Site Cookies on assets
2018-10-18 10:24:56 +02:00
Christoph Wurst 4f75173f11
Remove unreliable 2FA state message on personal 2FA settings page
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-18 09:51:08 +02:00
Roeland Jago Douma 0e0db13bb9
[3rdparty] Bump azure-storage-blog 1.2.0
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-18 08:20:05 +02:00
Roeland Jago Douma 053ddbaa6f
Bump npm deps in /settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-17 22:20:15 +02:00
Stefan Weil 3953e4aea1 Migrate Scrutinizer to new PHP Analysis
See this article for details:
https://scrutinizer-ci.com/docs/tools/php/php-analyzer/guides/migrate_to_new_php_analysis

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-10-17 19:46:38 +02:00
Daniel Peukert 7a5d6ac15c Fix failing tests and add some more
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
2018-10-17 18:51:01 +02:00
Daniel Peukert 2da4f96bd6 Remove arrow function
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
2018-10-17 18:10:37 +02:00
Robin Appelman 9e0ebf1830
store user for trashitem in the trashitem
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 15:21:09 +02:00
Robin Appelman 136113a22b
remove user parameter from `ITrashItem::getOriginalLocation`
since the target user is known at the time of creating the trashitem
the original location can already be adjusted on a per user level

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:58:02 +02:00
Robin Appelman a369adb4cd
fix trash storage wrapper tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:43 +02:00
Robin Appelman b94fbcebeb
fix preview controller tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:40 +02:00
Robin Appelman f5a41e2e15
fix error message for folder preview request
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:37 +02:00
Robin Appelman 6c5ea0ceca
pass `Cache::getMoveInfo` along cache wrappers
fixes cross storage move in some cases

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:33 +02:00
Robin Appelman 565d830c11
expose storagefactory in server container
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:30 +02:00
Robin Appelman ea42474b31
use name in fileinfo if set
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:51 +02:00
Robin Appelman d38163e895
fix trashbin previews for modular api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:48 +02:00
Robin Appelman 4adac445dc
fix select statement
fix select statement
Make trashbin api modules

Apps can register trashbin backends for specific storages,
allowing them to modify trashbin behavior for storages

The old trashbin implementation has been wrapped in a "legacy" backend,
for future work this can be replaced with a new backend that better handles
shares while still keeping the legacy backend around to keep existing trash
from being accessible

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:45 +02:00
Daniel Peukert b2dfcb5a18 Check if the X-XSS-Protection header contains the required fields
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
2018-10-17 14:28:51 +02:00
blizzz 2634ceb35b
Merge pull request #11862 from nextcloud/bugfix/ensure_cache_it_init
Double check for failed cache with a shared storage
2018-10-17 13:12:57 +02:00
Morris Jobke 7c8b3c1056
Merge pull request #11842 from nextcloud/fix/settings-strict-csp
Fix settings' strict CSP
2018-10-17 12:20:04 +02:00
Thomas Citharel d63de5471b Don't require Same Site Cookies on assets
Which can be used for public iframe embeeding

See https://github.com/nextcloud/calendar/issues/169

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-10-17 09:24:21 +02:00
Georg Ehrke f5dc7b7f07
move disableFreeBusy check from User principal backend to Scheduling Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-16 20:27:33 +02:00
Alexey Pyltsyn 5911367a18 Fix illegible text color in columns Size and Modified on dark theme
Signed-off-by: Alexey Pyltsyn <lex61rus@gmail.com>
2018-10-16 21:06:01 +03:00
Morris Jobke b88ab75c3a
Merge pull request #11870 from nextcloud/fix/noid/proper-column-name-escaping
Properly quote column name in "createFunction" call
2018-10-16 17:02:26 +02:00
Morris Jobke b458ed9c82
Properly escape column name in "createFunction" call
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-16 15:24:02 +02:00
Morris Jobke 262ff13136
Merge pull request #11835 from nextcloud/csp/jquery_contactsmenu
Move jquery.contactsmenu.js to compiled handlebars
2018-10-16 12:20:57 +02:00
Roeland Jago Douma 2849f24154
Merge pull request #11839 from nextcloud/csp/files_drop
Move files_drop to compiled handlebars
2018-10-16 12:16:31 +02:00
Christoph Wurst 8222e9dd12
Remove Vue compiler because templates have to be precompiled anyway
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-16 11:49:42 +02:00
Christoph Wurst f8579a87f5
Fix unsafe-eval used in 2FA admin settings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-16 11:49:07 +02:00
Roeland Jago Douma 1bc388e507
Double check for failed cache with a shared storage
When obtaining the SourceRootInfo we can call init. If this fails the
cache is set to a failed cache and the storage to a failed storage.
However we did not check for this. Which means that if the storage was
invalid it would fail later on.

Now we will properly error out.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-16 10:57:37 +02:00
Julius Härtl 0b4ea70995
Tests: Remove spacing from html before comparing the template
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-16 10:49:34 +02:00
Roeland Jago Douma 0a4a23f015
Move jquery.contactsmenu.js to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-16 09:51:36 +02:00
Morris Jobke ad66b0f9ab
Merge pull request #11830 from nextcloud/bugfix/9326/make_sure_usermanager_getByEmail_only_returns_IUser
filter null values for UserManager::getByEmail
2018-10-16 09:14:25 +02:00
Roeland Jago Douma 6c532576ee
fixup! Move files_drop to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-16 09:02:48 +02:00
Morris Jobke afaee648dd
Merge pull request #11358 from Zulan/fix-welcome-l10n
Fix welcome l10n
2018-10-16 09:01:59 +02:00
Roeland Jago Douma bee5bbbf0e
Move files_drop to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-16 08:27:06 +02:00
Roeland Jago Douma 5aaa8a8b58
Merge pull request #11740 from nextcloud/feature/noid/account-api
Public API to get user acocunt data
2018-10-15 21:46:09 +02:00
Roeland Jago Douma 3797b8e7e3
Merge pull request #11834 from nextcloud/csp/federationmenu
Compile federationscope menu handlebars template
2018-10-15 21:23:19 +02:00
Roeland Jago Douma 353fddfbb9
Merge pull request #11849 from nextcloud/csp/fileactionsmenu
Move fileactionsmenu to compiled handlebars
2018-10-15 21:22:07 +02:00
Maxence Lange f5a495bc3e
Merge pull request #10222 from nextcloud/interface-dashboard
Public interfaces for dashboard app
2018-10-15 20:56:19 +02:00
Maxence Lange dfd4782dfc
include dashboard into core
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Merge remote-tracking branch 'origin/interface-dashboard' into interface-dashboard

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
moving data object to OCP

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
update autoload files

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
+@since

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-10-15 19:59:27 +02:00
Roeland Jago Douma e7443ee892
Move more comments to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-15 19:52:22 +02:00
Julius Härtl 11144aa614
Merge pull request #11848 from nextcloud/csp/workflowengine
Move workflowengine to compiled handlebars
2018-10-15 19:46:14 +02:00
Julius Härtl c316eb6b97
Tests: Properly compare the file action label
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-15 19:18:20 +02:00
zulan cf266ee004 Get l10n within NewUserMailHelper to ensure it always uses the new user's language.
Some related tests had to be changed because they relied on internals, see also from the PHPUnit documentation:
"Exercise caution when using [the at] matcher as it can lead to brittle tests which are too closely tied to specific implementation details."

Signed-off-by: Zulan <git@zulan.net>
2018-10-15 19:01:46 +02:00
Roeland Jago Douma a1b7449202
Move fileactionsmenu to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-15 15:51:40 +02:00