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
Robin Appelman
decb51aee6
Fix deleting of external shares
2014-06-14 10:14:08 +02:00
Robin Appelman
c8c8106168
generate better storage ids
2014-06-14 10:14:08 +02:00
Robin Appelman
ce0aa7d4a8
Use the movable mount system for external shares
2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b
Fix check for shared files inside shares
2014-06-14 10:14:08 +02:00
Robin Appelman
2005c162bd
Fix prompting for password
2014-06-14 10:14:07 +02:00
Robin Appelman
64ced76beb
Save mountpoints relative to the user
2014-06-14 10:14:07 +02:00
Robin Appelman
43c56fcd07
Generate a unique name
2014-06-14 10:14:07 +02:00
Robin Appelman
e6f3850890
Update for changes in master
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
961317d911
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
2014-06-14 10:14:07 +02:00
Robin Appelman
87b0021e56
Scan the entire remote share at once by requesting the full file tree from the remote server
2014-06-14 10:14:07 +02:00
Robin Appelman
30f5b2bd7c
Improve detection of whether we're in the files app
2014-06-14 10:13:24 +02:00
Robin Appelman
a900c7aa94
Fix removing remote shares
2014-06-14 10:13:24 +02:00
Robin Appelman
1c149da52f
Support path lengths up to 4000 chars
2014-06-14 10:13:24 +02:00
Robin Appelman
c6a83b2f17
Fix exposing single files over webdav
2014-06-14 10:13:24 +02:00
Robin Appelman
cf5a72c103
Add interface for adding a public share to a different ownCloud instance
2014-06-14 10:13:24 +02:00
Robin Appelman
d7de35376d
Add interface for accpeting external shares
2014-06-14 10:13:23 +02:00
Robin Appelman
0156ef8166
Add coments to database and dont use sql keywords as table names
2014-06-14 10:10:38 +02:00
Robin Appelman
a44baaf8eb
add remote/add external shares to manager
2014-06-14 10:10:37 +02:00
Robin Appelman
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
Jenkins for ownCloud
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
Morris Jobke
fc9787ed64
fix layout of password protected shares
...
* add password icon
* fix upshifted arrow button - fixes #9024
2014-06-13 16:38:42 +02:00
Jörn Friedrich Dreyer
42bf466fa1
move mail template editor from core to standalone templateeditor repo
2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer
7e8784c075
access admin settings result message correctly
2014-06-13 11:59:14 +02:00
Jörn Friedrich Dreyer
72436b68bf
fix liskov substitution principle in admin mail template settings, fixes #8997
2014-06-12 12:38:34 +02:00
Vincent Petry
75a53b3c49
Merge pull request #8901 from owncloud/permissions-update-cache
...
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
Vincent Petry
491c96eaa9
Merge pull request #8966 from owncloud/fix_failing_tests_on_master
...
Fix failing tests on master
2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
Bjoern Schiessle
1d9b4aadbf
no need to prepare a statement twice
2014-06-10 14:46:47 +02:00
Jenkins for ownCloud
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
Robin Appelman
a978607011
Use &=
2014-06-09 12:47:00 +02:00
Thomas Müller
961e4e5c7c
adjust unit test assert values
2014-06-09 12:44:40 +02:00
Thomas Müller
aa38bd2b31
adding PHPDoc
2014-06-09 12:34:35 +02:00
Jenkins for ownCloud
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
Jenkins for ownCloud
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
Jenkins for ownCloud
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
Bjoern Schiessle
0b2ae314c7
check if permissions exists
2014-06-06 09:56:02 +02:00
Robin Appelman
60ea4388ed
Limit permissions to share permissions
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
09970e1816
update unit tests and make sure that we return the right permissions for files within a shared folder and for the shared folder itself
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
574de2d91b
the mount point always have delete permissions to allow unmount
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ca6631a710
add some tests
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ad5d8d7980
nake sure ti create new db entry when user renames a group share
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
a5752a8463
fix db query
2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249
Fix phpdoc and comments
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
501f98f084
update share API tests, file shares never have delete permissions
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
9a48e87253
make sure that we have a path relative to data/user/files to work with
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
0ce07bb6c4
update mount point if file_target changed
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
844b1e3fc6
add additional unit tests
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
24f3f6823e
get unique_name value directly from the share array
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
5132ae5e69
fix mount point move up if the parent no longer exists
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
884b9a0ecf
bring back updateFileTarget() got lost during last rebase
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
1b0b977678
remove share mount
2014-06-06 09:55:59 +02:00
Bjoern Schiessle
bf5e9357fc
don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it
2014-06-06 09:55:59 +02:00
Robin Appelman
14ce44acc8
Move shared mount moving from the storage to the mount
2014-06-06 09:55:59 +02:00
Jenkins for ownCloud
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
Robin Appelman
690e0b5070
Dont overwrite OCA.Sharing
2014-06-05 12:52:08 +02:00
Vincent Petry
e0c4e960d9
Merge pull request #8861 from owncloud/share-overview-linklist
...
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
icewind1991
09cc7c2d44
Merge pull request #8862 from owncloud/share-overview-fixmimetype
...
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Jenkins for ownCloud
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
Thomas Müller
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Morris Jobke
7a20d22daa
Merge pull request #8824 from owncloud/mail_template_editing_in_webui
...
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
Morris Jobke
ca43fba513
Merge pull request #8791 from owncloud/share-overview-sharewithstatus
...
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Thomas Müller
fc1d6f4c3c
fixes during test
2014-06-04 15:01:36 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Vincent Petry
816db7aef1
Fixed wording to "Shared by link"
2014-06-04 11:32:30 +02:00
Vincent Petry
c88509902e
Fix mime type returning for "shared with others" files
...
Use "path" instead of "file_target", as the latter is not always set /
reliable.
2014-06-04 11:26:03 +02:00
Vincent Petry
b3fdda1751
Added "Shared with link" sidebar section in files app
...
Added section to only show link shares.
Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Vincent Petry
af6a65cbf3
Do not update action icon recipients for file list
...
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.
For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
Vincent Petry
07f1b263c9
Use recipient display names when updating shares in the UI
...
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.
The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Jenkins for ownCloud
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
Thomas Müller
6764d5b122
Merge pull request #8698 from owncloud/sharing_improve_permissions
...
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Jörn Friedrich Dreyer
b5a145b297
convert mail template editor to app framework for a restful api
2014-06-03 16:53:03 +02:00
Jan-Christoph Borchardt
4ef94ddd2e
infield label removal: remove last occurences of infield labels
2014-06-03 15:30:09 +02:00
Vincent Petry
1297b2b883
Multiple fixes to sharing overview
...
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
2014-06-03 11:04:57 +02:00
Bjoern Schiessle
916f859377
check if it is a share storage
2014-06-02 20:39:20 +02:00
Thomas Müller
2a10e78c58
no need to empty array in a special way
2014-06-02 20:17:40 +02:00
Bjoern Schiessle
e0a5f3b570
get permissions directly from share storage to avoid additional db calls
2014-06-02 20:17:40 +02:00
Jörn Friedrich Dreyer
37afab87b5
minimal mail template editor for administrators, refs #7177
2014-06-02 19:22:58 +02:00
Vincent Petry
640fbc016d
Now using shareOwner for the share owner
...
Makes it consistent with the regular file list fileData
2014-06-02 18:52:31 +02:00
Morris Jobke
da090099f4
fix unit tests
2014-06-02 18:39:52 +02:00
Vincent Petry
0944565f60
More unit tests and fixes for share
2014-06-02 18:08:56 +02:00
Morris Jobke
57ef089aac
drop allowZIPdownload and maxZIPSize as options
2014-06-02 16:29:03 +02:00
Vincent Petry
d677e3860d
Added unit tests for share.js and share icon
2014-06-02 15:59:06 +02:00
Vincent Petry
7961d4a87e
Update share action text to display owner/recipients
...
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
2014-06-02 12:12:57 +02:00
Jenkins for ownCloud
d39216c5e7
[tx-robot] updated from transifex
2014-06-02 01:54:37 -04:00
Jenkins for ownCloud
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
Jenkins for ownCloud
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
Thomas Müller
5dd3e34f57
Merge pull request #8444 from owncloud/cleanup-list-code
...
Cleanup code of files_sharing/ajax/ a little bit
2014-05-30 22:40:28 +02:00
icewind1991
2ba5701b1a
Merge pull request #8778 from owncloud/storage-instanceof
...
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Vincent Petry
7fac2b62e9
Fixed warning when file_target is not set
...
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
2014-05-30 12:35:04 +02:00
Vincent Petry
5e4e773446
Removed "Share with" column
2014-05-30 10:06:30 +02:00
Vincent Petry
e084183d1e
Added owner display name in action
2014-05-30 10:06:29 +02:00
Vincent Petry
1d9129eac3
Sharing overview fixes and unit tests
...
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Vincent Petry
0879a63320
Mimetype for sharing overview
2014-05-30 10:06:29 +02:00
Vincent Petry
ef59c69dc8
Distinguish legacy file actions from regular file actions
...
Legacy file actions are registered by legacy apps through
window.FileActions.register(). These actions can only be used by the
main file list ("all files") because legacy apps can only deal with a
single list / container.
New file actions of compatible apps must be registered through
OCA.Files.fileActions. These will be used for other lists like the
sharing overview.
Fixed versions and sharing actions to use OCA.Files.fileActions, which
makes them available in the sharing overview list.
2014-05-30 10:06:29 +02:00
Vincent Petry
fa32243d84
Small fixes to sharing overview
...
- Removed file size from file summary in sharing overview
- Fixed document title
- Fixed empty content text for shared overview
2014-05-30 10:06:29 +02:00
Vincent Petry
d21b8108c8
Fixed navigation order
2014-05-30 10:06:29 +02:00
Vincent Petry
0f105ec747
Removed selection checkboxes
2014-05-30 10:06:29 +02:00
Vincent Petry
85648def56
Fixed sharing permissions
2014-05-30 10:06:29 +02:00