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

31212 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
640e6351f1 Merge pull request #23485 from owncloud/composer_allow_ocp 
Allow OCP classes to be PSR-4 as well
 2016-03-22 21:28:45 +01:00
Thomas Müller
d5be21fe81 Merge pull request #23398 from owncloud/block_group_sharing 
Allow blocking of group sharing
 2016-03-22 21:28:13 +01:00
Thomas Müller
e516612a25 Merge pull request #22679 from owncloud/fix_22668 
When the Share API is disabled do not return shares
 2016-03-22 21:26:31 +01:00
Thomas Müller
b1e5adf197 Merge pull request #23488 from owncloud/only-use-usersession-if-installed 
Only use the user session if ownCloud is already installed
 2016-03-22 21:25:36 +01:00
Roeland Jago Douma
00f48ec37b When the Share API is disabled do not return shares 
Fixes #22668

Block everything in the OCS Share API
 2016-03-22 19:43:23 +01:00
Lukas Reschke
1fffc30cf0 Only use the user session if ownCloud is already installed 
When installing ownCloud with autotest and MySQL some log entries may be created which will invoke the logging class. IUserSession has a dependency on the database which will make the installation fail => 💣
 2016-03-22 17:34:20 +01:00
Thomas Müller
460bafea8a Merge pull request #23484 from owncloud/if-class-is-already-loaded-dont-load-it-again 
Dont double load class
 2016-03-22 17:25:02 +01:00
Roeland Jago Douma
cf3e740ae8 Fix js strings if group sharing is disabled 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
6719f8ca60 Add intergration tests 
* Only for sharees right now
* Sharing intergration tests fail due to the test setup we have right
  now
 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
e69a09756b Respect disabled group sharing in sharee endpoint 
* Fix tests
 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
52826d0e24 Block group sharing in API and in share manager 
* Fix tests
 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
195efc12eb Add config to sharemanager 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
35024beb9c Add allow sharing with groups checkbox to admin page 2016-03-22 17:13:34 +01:00
Thomas Müller
6aa28037c7 Merge pull request #23437 from owncloud/save-query-when-the-list-is-empty 
Save the query when we get tags for no objects
 2016-03-22 17:12:24 +01:00
Roeland Jago Douma
5b78c604b5 Move IServerContainter to PSR-4 2016-03-22 16:39:19 +01:00
Roeland Jago Douma
f838d24c5d Allos OCP classes to be PSR-4 as well 
This adds the OCP namespace to the composer autoloader as well.
This means that now we can use proper PSR-4 filenames in OCP.
 2016-03-22 16:31:18 +01:00
Lukas Reschke
8e72e51b21 Dont double load class 
If the class already exists we should not load it twice. Since the composer autoloader is also used in core this could otherwise load a file twice.

This leads to problems otherwise with case insensitive operating systems like OS X. We can get rid of this once all file names in OC follow PSR-4, until then we probably need this check.
 2016-03-22 16:19:12 +01:00
Thomas Müller
ffe57a55d9 Merge pull request #23461 from owncloud/activity-491-autoloading-issue-without-sharing 
Fix "AutoloadNotAllowedException" when files_sharing is disabled
 2016-03-22 15:12:25 +01:00
Thomas Müller
0cd93a8e72 Merge pull request #23411 from owncloud/new_sharing_to_composer 
Move sharing 2.0 to composer autoloader
 2016-03-22 15:10:11 +01:00
Thomas Müller
48ec8ab3d3 Merge pull request #23404 from owncloud/fix-22988 
adjust PrincipalUri as returned from Sabre to effective username
 2016-03-22 14:49:54 +01:00
Joas Schilling
dcca20a48a Save the query when we get tags for no objects 2016-03-22 11:13:11 +01:00
Thomas Müller
9fc371e436 Merge pull request #23320 from owncloud/early-creation-of-birthday-calendar 
Create the contact birthday calendar right away as soon as the comman…
 2016-03-22 10:31:01 +01:00
Thomas Müller
7426be0937 Merge pull request #23448 from owncloud/issue-22993-soften-exception-on-enable-default-app 
Do not abort with an exception when a default app can not be enabled
 2016-03-22 10:19:59 +01:00
Thomas Müller
da8781e425 Merge pull request #23443 from owncloud/some-more-logging-information 
Log more information by default
 2016-03-22 10:06:32 +01:00
Thomas Müller
5e4f9b8627 Merge pull request #23440 from owncloud/fix_22286 
apply retry wrapper to make sure that we always read/write a complete block
 2016-03-22 09:50:05 +01:00
Thomas Müller
ac799a40e3 Merge pull request #23422 from owncloud/icon-and-you-translation-for-comments 
Add comment icon and "You commented" translations to activities
 2016-03-22 09:49:30 +01:00
Thomas Müller
c46596bef8 Merge pull request #23377 from owncloud/optimize-svgs 
Optimize SVGs
 2016-03-22 09:48:01 +01:00
Joas Schilling
24ce4b0f7d Fix "AutoloadNotAllowedException" when files_sharing is disabled 2016-03-22 08:42:25 +01:00
Jenkins for ownCloud
aa5bb56010 [tx-robot] updated from transifex 2016-03-22 01:55:40 -04:00
Arthur Schiwon
be572de7f0 fix unittest 2016-03-21 21:53:16 +01:00
Thomas Müller
2357bbf80a Merge pull request #23439 from owncloud/smb-permissions 
properly use smb permissions
 2016-03-21 18:05:45 +01:00
Thomas Müller
2db67c3308 Merge pull request #23386 from owncloud/share-keepoptioncheckboxinblocks 
Keep share checkboxes together
 2016-03-21 18:05:16 +01:00
Thomas Müller
36e1476270 Merge pull request #23388 from owncloud/issue-22887-infinite-background-job-loop-for-old-versions 
Do not create a new job when federation failed to connect but use existing job
 2016-03-21 18:04:02 +01:00
Thomas Müller
61629ad9ad Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issue 
Fix doc issue of cache wrapper
 2016-03-21 18:03:35 +01:00
Thomas Müller
736b80f0cb Merge pull request #23323 from owncloud/gdrive-chunkupload 
Chunk upload for GDrive
 2016-03-21 18:02:55 +01:00
Thomas Müller
beef371398 Merge pull request #23292 from owncloud/dav-chunking-onlyfirehooksonce 
Do not fire pre/post hooks twice on chunk upload
 2016-03-21 18:02:30 +01:00
Thomas Müller
492a1ded1c Merge pull request #23083 from owncloud/generate-birthdays-on-upgrade 
Birthday events are generated on upgrade
 2016-03-21 17:48:02 +01:00
Bjoern Schiessle
f761733f17 apply retry wrapper to make sure that we always read/write a complete block 2016-03-21 17:39:43 +01:00
Vincent Petry
2309ef9167 Merge pull request #23351 from owncloud/streams-0.4 
Update icewind/streams and icewind/smb
 2016-03-21 17:37:40 +01:00
Joas Schilling
444343dc2b Do not abort with an exception when a default app can not be enabled 2016-03-21 16:31:59 +01:00
Lukas Reschke
7adae4476f Log more information by default 
This modifies the logger to add the following logging information by default:

- Request Method
- Request URL
- Current user
 2016-03-21 15:48:01 +01:00
Vincent Petry
f28f538029 Do not fire pre/post hooks twice on chunk upload 2016-03-21 15:14:58 +01:00
Robin Appelman
8ab70b1231 properly use smb permissions 2016-03-21 14:35:41 +01:00
Robin Appelman
792752772d update icewind/smb to 1.0.8 2016-03-21 14:24:00 +01:00
Robin Appelman
dfbd85d723 update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_external 2016-03-21 14:24:00 +01:00
Robin Appelman
90fb744e89 update icewind/streams to 0.4.0 2016-03-21 14:23:57 +01:00
Thomas Müller
86581f6626 Merge pull request #22065 from owncloud/systemtags-create-same-prefix 
Allow creating tags where another one with same prefix exists
 2016-03-21 11:15:49 +01:00
Thomas Müller
8852fdaee3 Merge pull request #22789 from owncloud/dav-sharesproperty 
Add webdav property for share info in PROPFIND response
 2016-03-21 11:15:00 +01:00
Joas Schilling
e86fd945dd Fix doc issue of cache wrapper 2016-03-21 10:45:53 +01:00
Joas Schilling
b7f7fc7241 Do not create a new job when it failed to connect atm 2016-03-21 10:29:53 +01:00