Commit graph

1377 commits

Author SHA1 Message Date
Thomas Müller
ef4057d382 remove pointless require - we should kill all require_once like that in our tests 2014-06-27 09:30:42 +02:00
Jenkins for ownCloud
36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04:00
Vincent Petry
c6b89cc55a Fix wording for remote shares in settings page 2014-06-26 19:35:57 +02:00
Björn Schießle
1822bba5e9 Merge pull request #9193 from owncloud/sharing_etag_propagation
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
Jenkins for ownCloud
a5154450cf [tx-robot] updated from transifex 2014-06-26 01:54:40 -04:00
Vincent Petry
93a6792da7 Merge pull request #9205 from owncloud/remoteshare-fixurlpath
Fix parsing of remote URL when mounting remote shares
2014-06-25 19:59:39 +02:00
Morris Jobke
a9d0e9a5d5 Merge pull request #9202 from owncloud/urlhashfix
Do not clear URL hash when no external mount params given
2014-06-25 16:28:52 +02:00
Bjoern Schiessle
38ff8173ab make sure that hooks are registered for the tests 2014-06-25 15:20:52 +02:00
Vincent Petry
d22559200c Fix parsing of remote URL when mounting remote shares
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud".
Such URLs are now parsed correctly.

Added unit test for URL parsing.
2014-06-25 15:11:43 +02:00
icewind1991
c94c69aea1 Merge pull request #9189 from owncloud/sharing_fix_permissions
Sharing fix permissions
2014-06-25 15:01:34 +02:00
Jenkins for ownCloud
b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
Vincent Petry
363f8f3205 Do not clear URL hash when no external mount params given
Whenever external share parameters were passed through the URL hash, the
URL hash will now be cleared.

In other cases, the hash needs to be left alone because it is used as
workaround for the lack of history API in IE8 / IE9

Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that
does the same, including replacing the "+" with spaces.
2014-06-25 12:24:46 +02:00
Bjoern Schiessle
a0b85fc5e4 make sure that during share and unshare the etags get propagated correctly 2014-06-25 12:11:56 +02:00
Bjoern Schiessle
3fc7357ade add/update unit tests 2014-06-24 14:00:15 +02:00
Bjoern Schiessle
84d36df70b make sure that we always return the correct permissions 2014-06-24 13:39:37 +02:00
Jenkins for ownCloud
6a4a474aa9 [tx-robot] updated from transifex 2014-06-24 01:54:39 -04:00
Vincent Petry
9b001ed903 Setup the external share manager in a hook
To make sure the external shares are initialized in the right order and
make sure the session is correctly initialized before, the external
share manager is now set up in a filesystem setup hook.
2014-06-23 11:57:43 +02:00
Jenkins for ownCloud
2b4c2a7b14 [tx-robot] updated from transifex 2014-06-22 01:54:36 -04:00
Jenkins for ownCloud
da0e4b0af0 [tx-robot] updated from transifex 2014-06-21 01:54:37 -04:00
Morris Jobke
d5819a5ecd Merge pull request #9108 from owncloud/uploadintofolderfix
Fix many issues with drag and drop upload
2014-06-20 19:01:05 +02:00
Jenkins for ownCloud
ca96b9d3d5 [tx-robot] updated from transifex 2014-06-20 01:54:32 -04:00
Vincent Petry
9ef7410abe Fixed uploading by drag and drop into folder 2014-06-19 16:14:10 +02:00
Jenkins for ownCloud
e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
icewind1991
8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Robin Appelman
07fdeba50b Fix moving movablemount over webdav 2014-06-17 14:10:11 +02:00
Robin Appelman
2219087df6 organize js a bit better 2014-06-17 13:47:36 +02:00
Robin Appelman
f2ebac5c76 Better error handeling in testremote 2014-06-17 13:15:34 +02:00
Robin Appelman
361607c72d testremote is for public access 2014-06-17 13:08:24 +02:00
Morris Jobke
e7365c9507 fix broken buttons for IE8-11 2014-06-17 11:45:55 +02:00
Morris Jobke
17685adb87 fixing layout issue - mostly alignment 2014-06-17 11:24:39 +02:00
Jenkins for ownCloud
ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Robin Appelman
3ed4e5b26b Prevent warning 2014-06-16 16:12:32 +02:00
Robin Appelman
9c2918a626 Fix setupFromToken when a password is set 2014-06-16 16:09:56 +02:00
Robin Appelman
0616eb4007 Fix multiple users having the same external share mountpoint 2014-06-16 15:57:01 +02:00
Robin Appelman
5b1b6572f7 Make testremote more robust 2014-06-16 13:21:00 +02:00
Robin Appelman
6e06e1da0e Add route which went missing during rebase 2014-06-16 13:20:39 +02:00
Morris Jobke
4fbab3c12d Merge pull request #9040 from owncloud/fix-xss
Sanitize name of sharee
2014-06-16 13:13:28 +02:00
Robin Appelman
a469efb1f1 Add some safety checks 2014-06-16 12:42:28 +02:00
Vincent Petry
d21845557e Merge pull request #9027 from owncloud/fix-password-saved-share-layout
fix layout of password protected shares
2014-06-16 11:11:03 +02:00
Jenkins for ownCloud
ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
Lukas Reschke
1066f4ec9a Sanitize name of sharee
Fixes a XSS introduced with 271684dcfe
2014-06-14 20:45:10 +02:00
Morris Jobke
06ec82fd68 Fix path 2014-06-14 15:26:27 +02:00
Robin Appelman
9670d3e98b Always send a POST body 2014-06-14 10:22:38 +02:00
Robin Appelman
4bc8a2550d Fix public share webdav permissions 2014-06-14 10:22:38 +02:00
Robin Appelman
49f9b7ea8e fix modified date for external shares 2014-06-14 10:22:38 +02:00
Robin Appelman
455fbafb48 Fix undefined index error 2014-06-14 10:22:38 +02:00
Bjoern Schiessle
3bf7b54cd5 block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core 2014-06-14 10:22:38 +02:00
Bjoern Schiessle
84a651e46d add settings to disable server to server sharing 2014-06-14 10:22:38 +02:00
Robin Appelman
e7b58ed2bd Properly expose read only public shares as read only 2014-06-14 10:14:08 +02:00
Robin Appelman
87e311b996 Fix storage being passed to cache/watcher and scanner when using storage wrappers 2014-06-14 10:14:08 +02:00