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

24608 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
132ce04f31 Merge pull request #15915 from owncloud/fix-sharing 
Fix routes
 2015-04-28 15:54:08 +02:00
Lukas Reschke
1b84a1cd48 Fix routes 
Fixes public sharing as reported on https://github.com/owncloud/core/issues/15913
 2015-04-28 14:41:14 +02:00
Thomas Müller
557b4a2cb0 Merge pull request #15892 from owncloud/fix-failed-require-in-l10n-createjs 
handle case where the given language is unknown - refs #15794
 2015-04-28 11:22:25 +02:00
Morris Jobke
de8c15e1a4 Merge pull request #14764 from owncloud/shared-etag-propagate 
Propagate etags across shared storages
 2015-04-28 10:58:50 +02:00
Thomas Müller
5fa5f46a88 Merge pull request #15773 from owncloud/fix-15766 
LDAP Wizard: increasing server numbers and avoid configID collisions, fixes #15766
 2015-04-28 10:46:23 +02:00
Thomas Müller
b55297a059 Merge pull request #15896 from owncloud/autotest-external-replacecommand 
Add check for "replace" command in autotest-external
 2015-04-28 10:44:32 +02:00
Morris Jobke
b4a15db046 Merge pull request #15901 from owncloud/fix-share-docs 
fix several issues with doc blocks on share.php
 2015-04-28 10:41:04 +02:00
Thomas Müller
9108c103b2 Merge pull request #15903 from owncloud/issue-15899-fix-getfoortfolder-doc 
Fix return type of the getRootFolder() method
 2015-04-28 10:04:15 +02:00
Joas Schilling
7c65448377 Fix return type of the getRootFolder() method 2015-04-28 09:36:29 +02:00
Joas Schilling
46083006e1 fix several issues with doc blocks on share.php 2015-04-28 08:40:47 +02:00
Jenkins for ownCloud
6679ef287a [tx-robot] updated from transifex 2015-04-28 01:54:44 -04:00
Morris Jobke
24bb4e3f6f Merge pull request #15893 from owncloud/files-fixnewfilevalidation 
Fix file name validation in New menu
 2015-04-27 22:59:14 +02:00
Lukas Reschke
28ecc1e9d4 Merge pull request #15891 from owncloud/LukasReschke-patch-1 
Rephrase "TL;DR"
 2015-04-27 19:50:11 +02:00
Vincent Petry
6d8884e8a1 Add check for "replace" command 2015-04-27 18:03:49 +02:00
Thomas Müller
aa2bd28a6a fix typo 2015-04-27 16:34:58 +02:00
Vincent Petry
69f88b38c9 Fix file name validation in New menu 2015-04-27 16:31:18 +02:00
Thomas Müller
66f9811151 handle case where the given language is unknown - refs #15794 2015-04-27 15:40:16 +02:00
Lukas Reschke
4006c1c3d9 Simplify even more 2015-04-27 15:39:37 +02:00
Thomas Müller
eb0e9e5646 Merge pull request #15890 from owncloud/fix-helper-docs 
Fix several type(hint) errors in private/helper.php
 2015-04-27 15:28:50 +02:00
Lukas Reschke
69c041cb63 Rephrase "TL;DR" 
"TL;DR" seems not to be understood or respected by everyone. Maybe we should do a try with "Important". Open for alternative suggestions.
 2015-04-27 15:19:29 +02:00
Robin Appelman
5304afbecb dont pass floats as timestamp to the changepropagator 2015-04-27 15:18:25 +02:00
Thomas Müller
3b54161164 Merge pull request #15887 from owncloud/issue-15885-empty-getenv-path 
Can't use function return value in write context
 2015-04-27 15:16:27 +02:00
Thomas Müller
7d0eba7a41 Merge pull request #15886 from owncloud/fix-15848-master 
Adjust isLocal() on encryption wrapper
 2015-04-27 15:06:26 +02:00
Joas Schilling
db6395ae20 Fix several type(hint) errors in private/helper.php 2015-04-27 14:45:05 +02:00
Thomas Müller
678b7d7e4d Merge pull request #15860 from owncloud/enc_fallback_old_encryption 
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
 2015-04-27 14:32:19 +02:00
Joas Schilling
1341d03455 Can't use function return value in write context 2015-04-27 14:28:31 +02:00
Thomas Müller
936d564058 fixes #15848 2015-04-27 14:26:05 +02:00
Morris Jobke
93c25a1f4a Merge pull request #15882 from owncloud/fix-type-annotation 
Fix type annotation
 2015-04-27 14:17:59 +02:00
Robin Appelman
0789a6433e safer teardown 2015-04-27 14:07:16 +02:00
Robin Appelman
32067f9e80 use microtime to prevent race conditions 2015-04-27 14:07:16 +02:00
Robin Appelman
83b8ac0d7b cleanup hooks 2015-04-27 14:07:16 +02:00
Robin Appelman
6bf0579622 fix test 2015-04-27 14:07:16 +02:00
Robin Appelman
2e897f05b1 triger propagation for webdav uploads 
use post hooks for share etag propagator
 2015-04-27 14:07:16 +02:00
Robin Appelman
dd9601ae8f fix merge 2015-04-27 14:07:16 +02:00
Robin Appelman
45784f213f fix propagation when renaming a directly reshared folder 2015-04-27 14:07:16 +02:00
Robin Appelman
f488624e5f minor fixes 2015-04-27 14:07:16 +02:00
Robin Appelman
526ea3fcba add rename hook for propagation 2015-04-27 14:07:16 +02:00
Robin Appelman
77fbb4125b propagate changes up reshares 2015-04-27 14:07:16 +02:00
Robin Appelman
8cb40f6043 Make sure the owner mountpoints are setup 2015-04-27 14:07:16 +02:00
Robin Appelman
d5434c9c4e more propagation tests 2015-04-27 14:07:16 +02:00
Robin Appelman
b5c62cdad6 remove duplicates from rebase 2015-04-27 14:07:15 +02:00
Robin Appelman
19486837b2 adjust test 2015-04-27 14:07:15 +02:00
Robin Appelman
be55a90323 dont use our now non existing hook 2015-04-27 14:07:15 +02:00
Robin Appelman
30ad56813a propagate etags for all user of a share 2015-04-27 14:07:15 +02:00
Robin Appelman
518d5aadf5 Allow getting *all* share entries owned by a user 2015-04-27 14:07:15 +02:00
Robin Appelman
849e5521de Make the change propagator an emitter 2015-04-27 14:07:15 +02:00
Robin Appelman
2dc11cf20e unit test for etag propagation across shared storage boundary 2015-04-27 14:07:15 +02:00
Thomas Müller
cc331609bf Merge pull request #15411 from mmattel/fix_for_15375_better_message_text 
Improve error messge text for app upgrade try (#15375)
 2015-04-27 13:38:16 +02:00
Lukas Reschke
d0363fe396 Fix type annotation 
Obviously should be an int
 2015-04-27 13:31:18 +02:00
Morris Jobke
6a7b7caa81 Merge pull request #15681 from owncloud/issue/15667-occ-encryption 
OCC commands to manage encryption
 2015-04-27 13:28:59 +02:00