adcf942901
Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support
...
Http Range requests support in downloads
2016-05-23 21:01:26 +02:00
5a8af2f0be
Merge pull request #24729 from owncloud/try-token-login-first
...
try token login first
2016-05-23 20:50:57 +02:00
4f6670d759
Merge pull request #24658 from owncloud/invalidate-disabled-user-session
...
invalidate user session if the user was disabled
2016-05-23 20:50:25 +02:00
87fa86a69a
Merge pull request #24559 from owncloud/2fa
...
two factor auth
2016-05-23 20:50:03 +02:00
aa56d42fa8
Merge pull request #24777 from owncloud/scanner-dont-propagate
...
dont needlessly triger the propgator in the scanner
2016-05-23 19:05:20 +02:00
524479fa09
Merge pull request #24699 from owncloud/background-scan-recursion
...
Only recurse into incomplete folders during background scans
2016-05-23 17:44:02 +02:00
6577bbe887
Code style and doc fix
2016-05-23 15:17:00 +02:00
eca57be336
Only recurse into incomplete folders during background scans
2016-05-23 14:40:35 +02:00
21df2eb5a1
Merge pull request #24695 from owncloud/background-scan-propagate
...
Trigger propagation from the background scanner
2016-05-23 14:32:28 +02:00
68c5df798c
Merge pull request #24765 from owncloud/boolean-installed-config
...
Make sure we evaluate installed everywhere as a boolean
2016-05-23 14:32:10 +02:00
57525a02f8
Merge pull request #24703 from owncloud/personal-settings-auth-tokens
...
Personal settings auth tokens
2016-05-23 14:17:01 +02:00
f3979e5459
dont needlessly triger the propgator in the scanner
2016-05-23 13:53:05 +02:00
bd87f67473
Merge pull request #24349 from owncloud/nfd-storagewrapper
...
Add wrapper for NFD encoding workaround
2016-05-23 13:45:33 +02:00
862d8f43e5
Merge pull request #24766 from owncloud/mmccarn-patch-2
...
Update imagePath to prefer theme, then app, then core images
2016-05-23 11:46:03 +02:00
847bbc51b6
add OCC command to enable/disable 2FA for a user
2016-05-23 11:21:13 +02:00
dfb4d426c2
Add two factor auth to core
2016-05-23 11:21:10 +02:00
c20cdc2213
invalidate user session if the user is disabled
2016-05-23 10:32:16 +02:00
1bc5eb111b
Update imagePath to prefer theme, then app, then core images
...
imagePath updated so that image searches follow this priority:
1) /themes/$theme/apps/$app/img
2) /themes/$theme/$app/img
3) /themes/$theme/core/img
4) $appPath/img
5) /$app/img
6) /core/img
For each folder:
- if the specified file exists, use it.
- otherwise, if $basename.svg does NOT exist, try $basename.png
(This might better be "if filename was an svg, try the png"...)
2016-05-23 10:24:04 +02:00
7f1b8f22d4
Make sure that installed is a boolean
2016-05-23 10:09:22 +02:00
5ba1add03c
Merge pull request #24603 from owncloud/federated_reshare
...
flat federated re-share
2016-05-23 09:52:13 +02:00
c78bb2ab34
Merge pull request #24356 from owncloud/scanner-recursion-memory
...
Free up folder content from memory before recursing in the file scanner
2016-05-23 09:51:52 +02:00
74277c25be
add button to invalidate browser sessions/device tokens
2016-05-23 09:11:12 +02:00
6495534bcd
add button to add new device tokens
2016-05-23 09:11:12 +02:00
12431aa399
list user's auth tokens on the personal settings page
2016-05-23 09:11:12 +02:00
8646802850
Merge pull request #24696 from owncloud/lock-jobs-while-executing
...
Lock jobs while executing them, to allow multiple executors to run in…
2016-05-21 19:08:15 +02:00
d0a2fa0506
Lock jobs while executing them, to allow multiple executors to run in parallel
2016-05-21 01:59:25 +02:00
7e3ce83526
Add a method to lock a table
2016-05-21 01:59:03 +02:00
7b25839bd5
use share initiator as fall back to access the file
...
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
2016-05-20 21:15:15 +02:00
9999e05660
Http Range requests support in downloads
...
Http range requests support is required for video preview
2016-05-20 18:16:44 +02:00
8fbb63d316
Some tweaks for systemtagmanager
2016-05-20 17:56:02 +02:00
88740f035d
Act on effective system tag canAssign permission
...
Whenever the server returns true for the can-assign Webdav property of
a system tag, it means the current user is allowed to assign,
regardless of the value of user-assignable.
This commit brings the proper logic to the web UI to make it possible
for users to assign when they have the permission.
2016-05-20 17:56:02 +02:00
b5eb3d9e5a
Add system tag assignability check with groups
...
Whenever a user is not an admin, a tag is visible but not
user-assignable, check whether the user is a member of the allowed
groups.
2016-05-20 17:56:02 +02:00
3cd65fe25d
Add systemtag_group table and get/set methods
...
Added systemtag to group mapping table.
Added methods in ISystemTagManager to get/set the group mappings.
2016-05-20 17:56:02 +02:00
09b3883d9c
Updated canUser* functions in SystemTagManager to accept objects
2016-05-20 17:56:02 +02:00
8343cfb64b
Add interface methods for permission check
...
Instead of checking for admin perm, use interface method
canUserAssignTag and canUserSeeTag to check for permissions.
Allows for more flexible implementation.
2016-05-20 17:56:02 +02:00
11dc97da43
try token login first
2016-05-20 10:52:39 +02:00
bac8e13324
Remove unneeded unsets in encoding wrapper
2016-05-20 09:33:59 +02:00
e8d082208d
Fixes for encoding wrapper
...
Improved label
Fixed rename/copy/moveFromStorage/copyFromStorage and added tests
Improved findPathToUse algo
2016-05-20 09:33:59 +02:00
f8b2b95408
Scanner must normalize new children names for cache diff
...
Since new children from the storage might contain NFD entries, these
must be normalized to NFC to be properly diff'ed with the cache
contents which is always NFC.
This fixes an issue where NFD entries would disappear from the cache
after rescannng for children.
2016-05-20 09:33:59 +02:00
db4c7fe743
Add encoding wrapper as opt-in mount option
...
The encoding wrapper is now only applied when the mount option is set,
disabled by default.
2016-05-20 09:33:59 +02:00
63bbbf29f4
Add wrapper for NFD encoding workaround
2016-05-20 09:33:59 +02:00
65eae43ab1
Merge pull request #24721 from owncloud/public_psr4
...
Move \OCP to PSR-4
2016-05-19 15:53:03 +02:00
f42cdec4c4
Merge pull request #24725 from owncloud/ocs-provider-psr4
...
Move OCS Provider to PSR-4 namespace
2016-05-19 15:36:19 +02:00
3b3940df6b
Merge pull request #24660 from owncloud/no-token-login-for-disabled-users
...
don't allow token login for disabled users
2016-05-19 15:32:09 +02:00
20f229eed9
Move OCS Provider to PSR-4 namespace
2016-05-19 11:10:32 +02:00
893204ef4a
Fix broken exception naming
2016-05-19 10:05:53 +02:00
f824f3e5f3
don't allow token login for disabled users
2016-05-18 21:10:37 +02:00
0626578739
add method to query all user auth tokens
2016-05-18 18:25:37 +02:00
01f44d83b2
Merge pull request #24691 from owncloud/fixchunkttl
...
Allow chunk GC mtime tolerance for unfinished part chunks
2016-05-18 18:19:08 +02:00
e6386652df
Trigger propagation from the background scanner
2016-05-18 14:31:43 +02:00
Vincent Petry
Piotr Filiciak
Robin Appelman
Christoph Wurst
mmccarn
Joas Schilling
Björn Schießle
Roeland Jago Douma