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

13013 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
b7f7fc7241 Do not create a new job when it failed to connect atm 2016-03-21 10:29:53 +01:00
Thomas Müller
e983bd7db0 Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser 
In debugging mode we enable Sabre's browser plugin since it helps a l…
 2016-03-21 10:13:27 +01:00
Thomas Müller
c77412b1ac Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled 
disable the recovery key if the master key is enabled
 2016-03-21 09:49:15 +01:00
Thomas Müller
8442516e10 Merge pull request #23329 from owncloud/fix-21555 
Avatar must be saved after login is done and external storages set up…
 2016-03-21 09:47:50 +01:00
Joas Schilling
b2f4e4559f Add comment icons and "You commented" translations 2016-03-21 09:41:13 +01:00
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud
9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Arthur Schiwon
117c1bffa7 adjust PrincipilUri as returned from Sabre to effective username 2016-03-18 23:31:11 +01:00
Jenkins for ownCloud
a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Thomas Müller
0bc51b9118 Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory 
Fix dropbox storage to not store the whole file in memory
 2016-03-17 20:52:41 +01:00
Thomas Müller
31ee463690 Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap 
fix writing to cache when fallback server should be used immediately
 2016-03-17 20:52:22 +01:00
Thomas Müller
d6d59fe227 Merge pull request #23346 from owncloud/fix_23325 
Set proper public webdav permissions when public upload disabled
 2016-03-17 20:51:54 +01:00
Roeland Jago Douma
6e6e002280 Remove duplicated copyright 2016-03-17 19:24:25 +01:00
Thomas Müller
520724d757 Necessary code changes to make browser plugin properly work 2016-03-17 18:00:06 +01:00
Thomas Müller
7d638fdb34 In debugging mode we enable Sabre's browser plugin since it helps a lot when debugging 2016-03-17 16:51:19 +01:00
Vincent Petry
950530b162 Display share status info in favorite list 
Returns the shareTypes share status info to the favorites file list.
 2016-03-17 15:35:21 +01:00
Vincent Petry
f778e48ee5 Add webdav property for share info in PROPFIND response 2016-03-17 15:35:21 +01:00
Thomas Müller
8fb3e44610 Merge pull request #23287 from owncloud/issue-22786-absolute-paths 
Fix absolute path creation for remote shares with /oc webroot
 2016-03-17 14:29:57 +01:00
Vincent Petry
5db41dfbed Only use GDrive chunks when needed 2016-03-17 12:36:47 +01:00
Roeland Jago Douma
533fdb4075 Set proper public webdav permissions when public upload disabled 
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
 2016-03-17 11:35:31 +01:00
Thomas Müller
828cb08d49 Merge pull request #23334 from owncloud/ext-user-mounting-gui 
Display external storage GUI even if user mounting disabled
 2016-03-17 09:55:23 +01:00
Thomas Müller
b5c56a7322 Merge pull request #23336 from owncloud/occ-typos 
Some typo corrections in occ command output
 2016-03-17 09:31:11 +01:00
Jenkins for ownCloud
ace1812026 [tx-robot] updated from transifex 2016-03-17 01:56:06 -04:00
Carla Schroder
0c9eaede41 Some typo corrections in occ command output 2016-03-16 16:14:25 -07:00
Robin McCorkell
a51ece97e3 Display external storage GUI even if user mounting disabled 2016-03-16 22:06:49 +00:00
Thomas Müller
f3f08cf910 Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff 
Fallback for crappy ancient distributions
 2016-03-16 21:56:36 +01:00
Arthur Schiwon
d8621c78ed Avatar must be saved after login is done and external storages set up properly, fixes #21555 2016-03-16 20:51:03 +01:00
Vincent Petry
aa2674e7e2 Chunk upload for GDrive 
Instead of storing the WHOLE file in memory in a PHP variable, use the
library's chunk upload support.
 2016-03-16 17:57:54 +01:00
Thomas Müller
b4ea527fb2 Merge pull request #23253 from owncloud/give-swift-more-time 
Give swift 15 seconds after startup
 2016-03-16 17:32:55 +01:00
Thomas Müller
fdb7c59e6c Create the contact birthday calendar right away as soon as the command is executed once - fixes #23203 2016-03-16 17:23:02 +01:00