wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
32233 commits 157 branches 562 tags 714 MiB
Commit graph

32233 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Vincent Petry
10fae3994a
Fix system tag update code 2016-05-20 17:56:02 +02:00
Vincent Petry
d7727cdc74
Add admin-only system tag groups property 
For setting/getting system tag groups
 2016-05-20 17:56:02 +02:00
Vincent Petry
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
Vincent Petry
03d32bc39b
Fix system tags DAV unit tests 2016-05-20 17:56:02 +02:00
Vincent Petry
bede872dbc
Bring back admin permissions to change system tag permissions 2016-05-20 17:56:02 +02:00
Vincent Petry
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
Vincent Petry
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
Vincent Petry
09b3883d9c
Updated canUser* functions in SystemTagManager to accept objects 2016-05-20 17:56:02 +02:00
Vincent Petry
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
Roeland Jago Douma
edb512bf4d
Move Template to PSR-4 2016-05-20 16:35:07 +02:00
Roeland Jago Douma
54b637e83c
Fix unit tests 2016-05-20 16:35:07 +02:00
Roeland Jago Douma
c9ad60defc
Only allow loading of legacy (lib/private/legacy) by default 2016-05-20 16:35:07 +02:00
Roeland Jago Douma
802be173da
\OCP is handled by composer autoloader 2016-05-20 16:35:07 +02:00
Vincent Petry
59a85a4c76 Merge pull request #22576 from owncloud/folder_scroll_fix 
Add scrolling when dragging files. Fixes #12329
 2016-05-20 16:19:01 +02:00
Joas Schilling
94ad54ec9b Move tests/ to PSR-4 (#24731) 
* Move a-b to PSR-4

* Move c-d to PSR-4

* Move e+g to PSR-4

* Move h-l to PSR-4

* Move m-r to PSR-4

* Move s-u to PSR-4

* Move files/ to PSR-4

* Move remaining tests to PSR-4

* Remove Test\ from old autoloader
 2016-05-20 15:38:20 +02:00
Vincent Petry
2ef751b1ec Merge pull request #24702 from owncloud/background-scan-occ 
add --unscanned option to files:scan to triger a background scan
 2016-05-20 09:29:37 +02:00
Vincent Petry
b495895017 Merge pull request #24728 from owncloud/no-more-test_-files 
Fix autoloader for Test* files
 2016-05-20 09:29:01 +02:00
Jenkins for ownCloud
67162e636e [tx-robot] updated from transifex 2016-05-20 01:54:52 -04:00
Vincent Petry
4728308a9e Merge pull request #24585 from owncloud/files_external_lazy 
Load external storage backends/auth mechanisms lazily
 2016-05-19 18:08:17 +02:00
Vincent Petry
65eae43ab1 Merge pull request #24721 from owncloud/public_psr4 
Move \OCP to PSR-4
 2016-05-19 15:53:03 +02:00
Joas Schilling
54250ed065
Add PSR-4 loading for Test\ and Tests\ 2016-05-19 15:49:27 +02:00
Joas Schilling
f8180391fd
Create a Fallback in the old autoloader for PSR-4 Test\TestCase 2016-05-19 15:45:34 +02:00
Joas Schilling
ffa4633822
No more Test_* files exist, remove autoloading 2016-05-19 15:38:16 +02:00
Vincent Petry
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
Vincent Petry
0bbf825f6e Merge pull request #24722 from owncloud/notification_psr4 
Move \OCP\Notification to PSR-4
 2016-05-19 15:35:45 +02:00
Vincent Petry
7d2bc47f81 Merge pull request #24724 from owncloud/mail_psr4 
Move \OCP\Mail to PSR-4
 2016-05-19 15:35:09 +02:00
Vincent Petry
5ba0554974 Merge pull request #24723 from owncloud/migration_psr4 
Move \OCP\Migration to PSR-4
 2016-05-19 15:34:22 +02:00
Vincent Petry
a4ce528bca Merge pull request #24720 from owncloud/systemtag_psr4 
Move \OCP\SystemTag to PSR-4
 2016-05-19 15:33:59 +02:00
Vincent Petry
8425133c7d Merge pull request #24719 from owncloud/security_psr4 
Move \OCP\Security to PSR-4
 2016-05-19 15:33:05 +02:00
Vincent Petry
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
Vincent Petry
61b3260ebd Merge pull request #24716 from owncloud/fix-test-namespaces-2 
Fix test namespaces [files-]
 2016-05-19 15:31:43 +02:00
Robin Appelman
f313105dbd add "unscanned" option to files:scan to triger a background scan 2016-05-19 14:19:09 +02:00
Joas Schilling
20f229eed9
Move OCS Provider to PSR-4 namespace 2016-05-19 11:10:32 +02:00
Joas Schilling
bae4118b4f
Fix renamed class 2016-05-19 10:33:12 +02:00