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
a369adb4cd
fix trash storage wrapper tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:43 +02:00
b94fbcebeb
fix preview controller tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:40 +02:00
f5a41e2e15
fix error message for folder preview request
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:37 +02:00
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
565d830c11
expose storagefactory in server container
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:30 +02:00
ea42474b31
use name in fileinfo if set
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:51 +02:00
d38163e895
fix trashbin previews for modular api
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:48 +02:00
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
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
7c8b3c1056
Merge pull request #11842 from nextcloud/fix/settings-strict-csp
...
Fix settings' strict CSP
2018-10-17 12:20:04 +02:00
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
b458ed9c82
Properly escape column name in "createFunction" call
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-16 15:24:02 +02:00
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
2849f24154
Merge pull request #11839 from nextcloud/csp/files_drop
...
Move files_drop to compiled handlebars
2018-10-16 12:16:31 +02:00
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
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
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
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
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
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
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
afaee648dd
Merge pull request #11358 from Zulan/fix-welcome-l10n
...
Fix welcome l10n
2018-10-16 09:01:59 +02:00
bee5bbbf0e
Move files_drop to compiled handlebars
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-16 08:27:06 +02:00
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
3797b8e7e3
Merge pull request #11834 from nextcloud/csp/federationmenu
...
Compile federationscope menu handlebars template
2018-10-15 21:23:19 +02:00
353fddfbb9
Merge pull request #11849 from nextcloud/csp/fileactionsmenu
...
Move fileactionsmenu to compiled handlebars
2018-10-15 21:22:07 +02:00
f5a495bc3e
Merge pull request #10222 from nextcloud/interface-dashboard
...
Public interfaces for dashboard app
2018-10-15 20:56:19 +02:00
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
11144aa614
Merge pull request #11848 from nextcloud/csp/workflowengine
...
Move workflowengine to compiled handlebars
2018-10-15 19:46:14 +02:00
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
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
a1b7449202
Move fileactionsmenu to compiled handlebars
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-15 15:51:40 +02:00
8c4c4b700f
Move workflowengine to compiled handlebars
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-15 14:55:25 +02:00
6f835aff31
Merge pull request #11838 from nextcloud/bugfix/noid/fix-default-types-of-members
...
Fix default types of activity event member variables
2018-10-15 14:09:44 +02:00
b9a87a69cf
Use IAccountManager constants
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-15 13:30:31 +02:00
90cdd0a12a
Update autoloader
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-15 13:30:31 +02:00
9381e681a9
Add tests for new account api classes
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-15 13:30:31 +02:00
d05080f56a
Add \OCP\Account public API
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-15 13:30:31 +02:00
2db26d87c4
filter null values for UserManager::getByEmail
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-15 13:27:58 +02:00
1ce8672276
Merge pull request #11714 from nextcloud/lookupserver-and-global-scale
...
always query the lookup server in a global scale setup
2018-10-15 12:14:04 +02:00
909745acfd
Fix default types of activity event member variables
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-15 11:45:17 +02:00
8177fdb0f6
Merge pull request #11765 from nextcloud/feature/mandatory-2fa-for-groups
...
Mandatory 2FA for groups
2018-10-15 10:58:05 +02:00
d65438f931
Compile federationscope menu handlebars template
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-15 10:44:24 +02:00
e36d4a990d
Merge pull request #10439 from eugulixes/improve-encrypt-all-and-decrypt-all-commands
...
Check if TTY is invalid in encryption:encrypt-all and encryption:decrypt-all
2018-10-15 09:15:58 +02:00
83e994c11f
Make it possible to enforce mandatory 2FA for groups
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-15 08:22:52 +02:00
82a5833217
Merge pull request #11028 from nextcloud/feature/no_eval_csp
...
Move to stricter CSP
2018-10-14 21:17:43 +02:00
056a74e323
Fix plural function to be hardcoded
...
No more weird eval to construct a plural function.
We just use the plural function from symfony.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-14 20:45:36 +02:00
365f68372f
Use jQuery.getScript to dynamically load script
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-14 20:45:36 +02:00
5b61ef9213
Disallow unsafe-eval by default
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-14 20:45:34 +02:00
Robin Appelman
blizzz
Morris Jobke
Roeland Jago Douma
Christoph Wurst
Roeland Jago Douma
Julius Härtl
Maxence Lange
zulan
Georg Ehrke
Björn Schießle
Joas Schilling