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

29487 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Thomas Müller
1fca96656d Merge pull request #21684 from owncloud/fix-missing-dispatcher 
Add missing dispatcher
 2016-01-13 12:26:57 +01:00
Thomas Müller
4cff03f56b Add missing dispatcher 2016-01-13 12:18:46 +01:00
Thomas Müller
bc96fab242 Merge pull request #21681 from owncloud/fix-unittest 
Fix unit test
 2016-01-13 12:01:02 +01:00
Lukas Reschke
0c65f4b2c6 Fix unit test 
No idea why they passed locally before as well on the branch on the PR. Scary...
 2016-01-13 11:22:44 +01:00
Thomas Müller
f0c869d22e Merge pull request #21662 from owncloud/external-list-non-admin 
Allow non admins to list their own mounts
 2016-01-13 11:01:27 +01:00
Thomas Müller
ca4f24aa97 Merge pull request #21509 from owncloud/users-scrolltop 
Keep scroll position in users page when sorting
 2016-01-13 11:00:48 +01:00
Thomas Müller
4ce45c245a Merge pull request #21606 from owncloud/special_characters_tests 
Added test with special chars in group
 2016-01-13 10:55:50 +01:00
Thomas Müller
3d4ec16a5f Merge pull request #21659 from ErikPel/cssfix 
Fixed #21542
 2016-01-13 10:53:56 +01:00
Thomas Müller
cddc1ae9cb Merge pull request #21655 from owncloud/remove-listener-plugin 
Remove the listener dav plugin
 2016-01-13 10:39:27 +01:00
Thomas Müller
7a569a0915 Merge pull request #21392 from owncloud/files_external-import 
Add import command for files external
 2016-01-13 10:35:10 +01:00
Thomas Müller
37e8a87d46 Merge pull request #21591 from owncloud/add-code-checking-for-apps 
Verify signature of apps with level "Official" coming from the appstore
 2016-01-13 10:35:00 +01:00
Thomas Müller
e0aa6e01ab Merge pull request #21612 from owncloud/fix_21598 
fix public link sharing if the master key is enabled
 2016-01-13 10:34:48 +01:00
Thomas Müller
a5e46226ef Merge pull request #21615 from owncloud/shared-islocal 
implement isLocal for shared storage
 2016-01-13 10:34:23 +01:00
Thomas Müller
1e0ea46e9e Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdoc 
fix wrong class name in phpdoc
 2016-01-13 10:34:07 +01:00
Thomas Müller
b1ee51f255 Merge pull request #21630 from owncloud/add-some-security-headers-as-hardening 
Add X-Download-Options and X-Permitted-Cross-Domain-Policies
 2016-01-13 10:33:58 +01:00
Thomas Müller
5565b19382 Merge pull request #21648 from owncloud/smb-statcache-cap 
cap the number of entries we cache in smb's statcache
 2016-01-13 10:33:43 +01:00
Joas Schilling
3bdcfef395 Remove the listener plugin 2016-01-13 10:33:08 +01:00
Thomas Müller
a11f6093b7 Merge pull request #21663 from owncloud/occ-external-mountpoint 
allow setting mountpoint with occ files_external:config
 2016-01-13 10:30:17 +01:00
Thomas Müller
3fd976995a Merge pull request #21668 from owncloud/add-super-evil-and-hidden-config-switch-to-disable-integrity-checks-really-just-do-not-use-this 
Add hidden config switch to disable code integrity checking
 2016-01-13 10:30:02 +01:00
Thomas Müller
4129480eb0 Merge pull request #21671 from owncloud/fix-setup-on-master 
Use legacy method when ownCloud is not yet installed
 2016-01-13 10:29:36 +01:00
Thomas Müller
e22186d234 Merge pull request #21673 from owncloud/chrsch-master 
-- Fixed error where $enabled is parsed but empty
 2016-01-13 10:29:21 +01:00
Erik Pellikka
af57fe59b9 Fixed #21542 
Changed to 5 pixel
 2016-01-13 11:18:59 +02:00
Christoph Wurst
ee35cba7f1 fix login/setup page input shadows 
fixes #21658
 2016-01-13 10:06:21 +01:00
Sergio Bertolín
acc67a6d48 Added test case about deleting a group with special characters 2016-01-13 09:49:25 +01:00
Sergio Bertolín
fb3dbe24db Added test with spcial chars in group 2016-01-13 09:49:19 +01:00
Thomas Müller
c5a200c419 Merge pull request #21653 from owncloud/update-license-headers-2016 
Update license headers 2016
 2016-01-13 08:29:42 +01:00
Thomas Müller
59e9b93be6 Merge pull request #20948 from owncloud/fed-sync-contacts 
Syncing system addressbooks across federated ownClouds
 2016-01-13 08:27:51 +01:00