Commit graph

29573 commits

Author SHA1 Message Date
Joas Schilling
436ce1f4a6 Use insertIfNotExists() when creating a group 2016-01-14 13:13:27 +01:00
Robin Appelman
7530f66f52 remove unneeded public cache methods 2016-01-14 13:01:46 +01:00
Robin Appelman
bdf51d9ea4 only trigger locking on lockingstorages 2016-01-14 13:01:43 +01:00
Robin Appelman
0724ac1e5e split locking related methods to their own interface 2016-01-14 12:54:42 +01:00
Robin Appelman
3deb3bd163 Add IStorage interface for consistent naming
minor phpdoc fixed
2016-01-14 12:54:42 +01:00
Robin Appelman
e77e76fef4 fix object store storage 2016-01-14 12:54:42 +01:00
Robin Appelman
d2c579e167 fix quota wrapper 2016-01-14 12:54:42 +01:00
Robin Appelman
62d383e1ba fix tests 2016-01-14 12:54:42 +01:00
Robin Appelman
dcbeeced3b add since tags 2016-01-14 12:54:42 +01:00
Robin Appelman
989995a852 fix phpdoc 2016-01-14 12:54:42 +01:00
Robin Appelman
a3d50ef49a add watcher interface 2016-01-14 12:54:42 +01:00
Robin Appelman
c27894791e Add updater interface and expose cache interfaces from storage 2016-01-14 12:54:42 +01:00
Robin Appelman
5fae07f422 add scanner interface 2016-01-14 12:54:42 +01:00
Robin Appelman
6d321f5f6b Return a class from cache operations instead of an array 2016-01-14 12:54:42 +01:00
Robin Appelman
5d0451b848 Safe teardowns 2016-01-14 12:54:42 +01:00
Robin Appelman
3ab0ccd4a2 add cache entry interface 2016-01-14 12:54:42 +01:00
Robin Appelman
2dcdc81477 propagator interface 2016-01-14 12:54:42 +01:00
Robin Appelman
cdc8c40d60 Add public cache interface 2016-01-14 12:54:42 +01:00
Thomas Müller
8f89e3520d Merge pull request #21679 from owncloud/bump-sabre-3.0.7
[3rdparty] Bump sabre to 3.0.7 (PHP7 support)
2016-01-14 11:55:46 +01:00
Roeland Jago Douma
663e71e4b3 Only select elements from the database that we support 2016-01-14 10:54:40 +01:00
Roeland Jago Douma
0f454ff5aa Use namedparameter 2016-01-14 10:54:40 +01:00
Morris Jobke
86f08f59d6 use logException() to properly log the exception 2016-01-14 10:40:23 +01:00
Thomas Müller
4d037b76b4 Merge pull request #21704 from owncloud/fix-namespace-issue
Fix usage of PHP method within namespace
2016-01-14 10:25:34 +01:00
Thomas Müller
03c08bea9d Merge pull request #21703 from owncloud/fix_share_create_hooks
[Share 2.0] Fix pre_share and post_share hooks
2016-01-14 09:56:37 +01:00
Morris Jobke
64c8427d81 Improved error message for failing background job 2016-01-14 09:49:40 +01:00
Morris Jobke
73dd8c17de Fix usage of PHP method within namespace
* introduced wiht 045ea4eb
2016-01-14 09:24:21 +01:00
Jenkins for ownCloud
205fbcbfa3 [tx-robot] updated from transifex 2016-01-14 01:55:43 -05:00
Roeland Jago Douma
e081c86691 Fix integration tests 2016-01-13 22:15:19 +01:00
Roeland Jago Douma
4cc2230c58 [Share 2.0] Fix pre_share and post_share hooks 2016-01-13 21:56:04 +01:00
Martin
06ca5cbade Fix: emit 'scanFiles' will only fire on files and not on folders (II) 2016-01-13 21:40:48 +01:00
Thomas Müller
d0a690fde4 Merge pull request #21692 from owncloud/external-add-global
Fix adding global applicable when removing all other applicables
2016-01-13 17:36:52 +01:00
Thomas Müller
d1010696a1 Merge pull request #20497 from owncloud/bubble_up_hint_exception
Bubble up hint exceptions in hooks, so the user can see the hint
2016-01-13 17:36:42 +01:00
Thomas Müller
8b346ab7e7 Merge pull request #21552 from owncloud/share2.0_register_providers
[Share 2.0] register providers
2016-01-13 17:36:26 +01:00
Roeland Jago Douma
5f5951c8cf [Share 2.0] Let the factory do the factory stuff
* Updated unit tests (bit cleaner now)
2016-01-13 16:35:15 +01:00
Roeland Jago Douma
cbd3050f4c [Share 2.0] Use full share id (providerId:shareId)
Now that we support multiple managers we communicate shares to the
outside as 'providerId:shareId'. This makes sures that id's are unique
when references from the OCS API.

However, since we do not want to break the OCS API v1 we need to
somewhat hack around this.

When we switch to OCS API v2 (which we should when we support more
custom providers). We will change the id to always be the fullShareId.
2016-01-13 16:35:15 +01:00
Roeland Jago Douma
67b7ebccd1 [Share 2.0] Add share provider factory
* Add providers
* Add share manager to server container
* Use share manager from server container
* Properly get the share manager
2016-01-13 16:35:14 +01:00
Roeland Jago Douma
b4de427c1e [Share 2.0] Allow registering of share providers
* Properly register the default share provider
2016-01-13 16:35:07 +01:00
Thomas Müller
3ee3d02a76 Merge pull request #20018 from owncloud/cache_group_backend
The group database backend should cache groups
2016-01-13 15:58:21 +01:00
Thomas Müller
e7038a2736 Simply use logException() to log the exception - no need for custom code 2016-01-13 15:52:18 +01:00
Thomas Müller
fa75866879 Fix PHPDoc 2016-01-13 15:52:18 +01:00
Jörn Friedrich Dreyer
cbe995af31 Bubble up hint exceptions in hooks, so the user can see the hint 2016-01-13 15:52:18 +01:00
Thomas Müller
471c77305f Merge pull request #21599 from owncloud/ErikPel-master
[CI] Fixed issue #21452
2016-01-13 15:46:02 +01:00
Robin Appelman
b613db9e16 Fix adding global applicable when removing all other applicables 2016-01-13 15:31:26 +01:00
Roeland Jago Douma
172f6cd714 Fix carddav unit tests 2016-01-13 15:00:05 +01:00
Roeland Jago Douma
aedbce5e6e [3rdparty] Bump sabre to 3.0.7 (PHP7 support) 2016-01-13 15:00:01 +01:00
Erik Pellikka
ace66057f2 Fixed issue #21452
removed whitespace

removed whitespace

Changed it based on PVince81's suggestion
2016-01-13 14:47:00 +01:00
Robin Appelman
c67a09112b Add occ commands to manager trusted certificates 2016-01-13 14:35:37 +01:00
Thomas Müller
cc4e4ecf0f Merge pull request #21676 from owncloud/fix-setup-login-input-shadows
fix login/setup page input shadows
2016-01-13 14:19:57 +01:00
Thomas Müller
6e7aefe6da Merge pull request #21682 from owncloud/fix_synservicetest_mock
Fix mock call to download
2016-01-13 13:23:52 +01:00
Roeland Jago Douma
4a3b6da183 Fix mock call to download
We can only mock public and protected functions in phpunit.
2016-01-13 12:27:48 +01:00