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

11878 commits

Author SHA1 Message Date
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
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
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
8fbb63d316
Some tweaks for systemtagmanager 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
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
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
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
b495895017 Merge pull request #24728 from owncloud/no-more-test_-files 
Fix autoloader for Test* files
 2016-05-20 09:29:01 +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
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
Joas Schilling
20f229eed9
Move OCS Provider to PSR-4 namespace 2016-05-19 11:10:32 +02:00
Vincent Petry
6ace14b6ad Merge pull request #24718 from owncloud/route_psr4 
Move \OCP\Route to PSR-4
 2016-05-19 10:30:32 +02:00
Vincent Petry
78732aaf0c Merge pull request #24717 from owncloud/preview_psr4 
Move \OCP\Preview to PSR-4
 2016-05-19 10:30:21 +02:00
Vincent Petry
ae7e14b223 Merge pull request #24710 from owncloud/lock_psr4 
Move \OCP\Lock to PSR-4
 2016-05-19 10:28:49 +02:00
Roeland Jago Douma
893204ef4a
Fix broken exception naming 2016-05-19 10:05:53 +02:00
Roeland Jago Douma
d666725fa7
Move \OCP to PSR-4 2016-05-19 09:43:33 +02:00
Christoph Wurst
f824f3e5f3
don't allow token login for disabled users 2016-05-18 21:10:37 +02:00
Roeland Jago Douma
c05032ff20
Move \OCP\SystemTag to PSR-4 2016-05-18 18:30:49 +02:00
Roeland Jago Douma
f67f888d50
Move \OCP\Security to PSR-4 2016-05-18 18:28:31 +02:00
Christoph Wurst
0626578739
add method to query all user auth tokens 2016-05-18 18:25:37 +02:00
Roeland Jago Douma
2dc8c3a3f2
Move \OCP\Route to PSR-4 2016-05-18 18:23:44 +02:00
Vincent Petry
dc0e3617dc Merge pull request #24707 from owncloud/l10n_psr4 
Move \OCP\L10N to PSR-4
 2016-05-18 18:23:44 +02:00
Roeland Jago Douma
31f6d01606
Move \OCP\Preview to PSR-4 2016-05-18 18:22:34 +02:00
Roeland Jago Douma
bd27eadf9e
Move \OCP\Notification to PSR-4 2016-05-18 18:21:27 +02:00
Roeland Jago Douma
1c721771ff
Move \OCP\Migration to PSR-4 2016-05-18 18:19:24 +02:00
Vincent Petry
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
Roeland Jago Douma
babdf8477d
Move \OCP\Mail to PSR-4 2016-05-18 17:42:33 +02:00
Roeland Jago Douma
12fd87d0a3
Move \OCP\Lock to PSR-4 2016-05-18 17:10:04 +02:00
Vincent Petry
4a94203492 Merge pull request #24706 from owncloud/http_psr4 
Move \OCP\Http to PSR-4
 2016-05-18 16:50:17 +02:00
Roeland Jago Douma
40bf0a913f
Move \OCP\L10N to PSR-4 2016-05-18 16:38:44 +02:00
Vincent Petry
6231b72e25 Merge pull request #24677 from owncloud/single-token-provider 
a single token provider suffices
 2016-05-18 16:31:53 +02:00
Roeland Jago Douma
4a53542e45
Move \OCP\Files to PSR-4 2016-05-18 14:35:50 +02:00