Commit Graph

32737 Commits

Author SHA1 Message Date
Christoph Wurst 847bbc51b6
add OCC command to enable/disable 2FA for a user 2016-05-23 11:21:13 +02:00
Christoph Wurst dfb4d426c2
Add two factor auth to core 2016-05-23 11:21:10 +02:00
Christoph Wurst c20cdc2213
invalidate user session if the user is disabled 2016-05-23 10:32:16 +02:00
mmccarn 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
Joas Schilling 828dec9edb
Make sure we evaluate installed like we do it everywhere 2016-05-23 10:09:36 +02:00
Joas Schilling 7f1b8f22d4
Make sure that installed is a boolean 2016-05-23 10:09:22 +02:00
Vincent Petry dec3f9ebcb Merge pull request #24726 from owncloud/tests-psr-4
Tests outside of tests/lib/ to PSR-4
2016-05-23 09:54:29 +02:00
Vincent Petry 9264674b36 Merge pull request #24514 from owncloud/federation-psr4
Move federation app to PSR-4
2016-05-23 09:52:38 +02:00
Vincent Petry 5ba1add03c Merge pull request #24603 from owncloud/federated_reshare
flat federated re-share
2016-05-23 09:52:13 +02:00
Vincent Petry 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
Vincent Petry 410d18f00d Merge pull request #22620 from owncloud/comments-api
Comments API is missing hook/event to allow other apps to register valid entities
2016-05-23 09:51:05 +02:00
Christoph Wurst 74277c25be
add button to invalidate browser sessions/device tokens 2016-05-23 09:11:12 +02:00
Christoph Wurst 6495534bcd
add button to add new device tokens 2016-05-23 09:11:12 +02:00
Christoph Wurst 12431aa399
list user's auth tokens on the personal settings page 2016-05-23 09:11:12 +02:00
Joas Schilling 0b831a2bed
Move EntityEvent to PSR-4 2016-05-23 09:06:02 +02:00
Joas Schilling 54f8822670
Fix unit tests 2016-05-23 09:03:48 +02:00
Joas Schilling c9fda84841
Make the root collection neutral so it does not only work for files 2016-05-23 09:03:48 +02:00
Joas Schilling 3a8e537946
Remove unused UserFolder 2016-05-23 09:03:47 +02:00
Jenkins for ownCloud 357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Jenkins for ownCloud 88328000b1 [tx-robot] updated from transifex 2016-05-22 01:56:56 -04:00
Vincent Petry 7a6966cdfe Merge pull request #24732 from owncloud/autoloader_fix
Autoloader fix
2016-05-21 19:09:22 +02:00
Vincent Petry 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
Vincent Petry 6934840083 Merge pull request #24307 from owncloud/systemtags-perminterface
Add interface methods for permission check for system tags
2016-05-21 19:06:54 +02:00
Jenkins for ownCloud bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Pellaeon Lin 56241afad7 Fix breadcrumb background right arrow due to incorrect background-image syntax 2016-05-21 12:54:29 +08:00
Pellaeon Lin 72ac5dd8a1 Make entire file tr droppable,
so that .canDrop will highlight the entire row when drag hover
2016-05-21 12:54:29 +08:00
Pellaeon Lin d3ff3c589b Add visual cue when moving draggable item over droppable item,
ie. breadcrumb and filenameTd
2016-05-21 12:54:29 +08:00
Joas Schilling 92c21fd6f4
Do not lock the cron anymore so we can have multiple workers 2016-05-21 01:59:25 +02:00
Joas Schilling d0a2fa0506
Lock jobs while executing them, to allow multiple executors to run in parallel 2016-05-21 01:59:25 +02:00
Joas Schilling 7e3ce83526
Add a method to lock a table 2016-05-21 01:59:03 +02:00
Björn Schießle 20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self 2016-05-20 21:15:16 +02:00
Björn Schießle bc8f659d06
add missung return value 2016-05-20 21:15:16 +02:00
Björn Schießle 06b6e2bff5
improved error messages 2016-05-20 21:15:16 +02:00
Björn Schießle e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app 2016-05-20 21:15:16 +02:00
Björn Schießle 92fa0c7dfd
fall back to old re-sharing behaviour in case the remote server doesn't support flat-reshares 2016-05-20 21:15:16 +02:00
Björn Schießle 2dc26aada7
update share permissions 2016-05-20 21:15:15 +02:00
Björn Schießle 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
Björn Schießle 81e3787f9c
close cursor after select to avoid db lock 2016-05-20 21:15:11 +02:00
Björn Schießle d23df4cba7
create re-share by owner and propagate unshare and unshare-from self request
correctly accross share owner and share initiator
2016-05-20 21:15:11 +02:00
Björn Schießle 8f87e1104d
use query builder for getShare and add tests 2016-05-20 21:15:11 +02:00
Björn Schießle 5a1641bed2
move request handler for federated shares to the federated sharing app 2016-05-20 21:15:08 +02:00
Piotr Filiciak 9999e05660
Http Range requests support in downloads
Http range requests support is required for video preview
2016-05-20 18:16:44 +02:00
Vincent Petry b40c0bad96
Increase version for DB addition 2016-05-20 17:56:02 +02:00
Vincent Petry 79f6b7b7ff
Make it possible to exclude admin groups from groups select2 2016-05-20 17:56:02 +02:00
Vincent Petry 8fbb63d316
Some tweaks for systemtagmanager 2016-05-20 17:56:02 +02:00
Vincent Petry 66e93561da
Rename "not-assignble" to "restricted" 2016-05-20 17:56:02 +02:00
Vincent Petry c7373798ba
Add app to shipped.json 2016-05-20 17:56:02 +02:00
Vincent Petry d288eb062e
Update integration tests for system tags with groups 2016-05-20 17:56:02 +02:00
Vincent Petry 5963128342
Adjust DAV SystemTagPlugin unit tests for groups 2016-05-20 17:56:02 +02:00
Vincent Petry 91d4249ed8
Fix system tags DAV plugin tests 2016-05-20 17:56:02 +02:00