Bjoern Schiessle
008498dcad
only show "share with others" and "share by link" navigation bar entries if user is allowed to share files
2014-08-08 12:12:24 +02:00
Thomas Müller
6da9c09467
Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master
...
we can only close the session if encryption is not used
2014-08-07 14:29:54 +02:00
Robin Appelman
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
Jan-Christoph Borchardt
9e6b65fabe
Merge pull request #10223 from dannosaur/patch-1
...
fix tiny thumbnails in public preview/share mode
2014-08-07 12:36:57 +02:00
Thomas Müller
8b2fe69bb2
Merge pull request #10218 from owncloud/pzy-master
...
Adding link tag to enable facebook timeline previews
2014-08-07 12:14:30 +02:00
Thomas Müller
d2365afad6
Merge pull request #8915 from owncloud/MorrisJobke-travis
...
Travis support for PRs and master, stable5 and stable6
2014-08-07 11:33:13 +02:00
Thomas Müller
2fb8fcf6cb
we can only close the session if encryption is not used
2014-08-07 11:07:11 +02:00
pzy
dc15633111
Update public.php
...
added tag to make facebook load a preview picture
Update public.php
add check ifMimeSupported and put the thumbsize in a variable
generate preview for all supported mimes
2014-08-07 10:44:07 +02:00
Jenkins for ownCloud
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
Dan Jones
4bbea118c2
fix tiny thumbnails in public preview/share mode
2014-08-06 19:32:21 +01:00
Robin Appelman
eb8683e6ee
trim leading slash
2014-08-06 14:57:54 +02:00
Robin Appelman
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
Morris Jobke
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
Bjoern Schiessle
f451173817
remove unused variable
2014-08-05 20:34:18 +02:00
Morris Jobke
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
Thomas Müller
b68275baba
close session right before the download starts - this enables parallel downloads
2014-08-05 11:21:42 +02:00
Jenkins for ownCloud
d1aaa7a12e
[tx-robot] updated from transifex
2014-08-02 01:54:33 -04:00
Morris Jobke
6cbfe8fd98
Merge pull request #10067 from owncloud/fix-#9119
...
Quick fix for #9119 . Increase preview to keep empty message more centered
2014-08-01 09:25:15 +02:00
Jenkins for ownCloud
86cdfa3db3
[tx-robot] updated from transifex
2014-08-01 01:54:28 -04:00
Jörn Friedrich Dreyer
dc6180427c
Merge pull request #10048 from owncloud/fix_search_in_shared_files
...
traverse folders in php to search in shared files
2014-07-31 18:27:47 +02:00
Jörn Friedrich Dreyer
1af436cb59
add test for search() in shared cache
2014-07-31 15:07:49 +02:00
Jörn Friedrich Dreyer
a7b4cd77b1
traverse folders in php to search in shared files
2014-07-31 12:05:29 +02:00
Remco Brenninkmeijer
a1b5bc8684
Quick fix for #9119 . Increase preview to keep empty message more centered and push footer down.
2014-07-30 22:41:17 +02:00
Jan-Christoph Borchardt
8389ff5875
Merge pull request #10054 from owncloud/dont_preload_videos
...
don't preload videos on public sharing, fixes #10042
2014-07-30 21:10:57 +02:00
Georg Ehrke
3d0bcb7c46
don't preload videos on public sharing, fixes #10042
2014-07-30 17:06:41 +02:00
Robin Appelman
c066320208
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 13:52:40 +02:00
Björn Schießle
03f7c5c561
Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview
...
update attributes for share-with-user view
2014-07-29 14:00:57 +02:00
Jenkins for ownCloud
29a3f1e2af
[tx-robot] updated from transifex
2014-07-29 09:16:02 +02:00
Bjoern Schiessle
aff948925a
update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view
2014-07-28 22:04:13 +02:00
Björn Schießle
c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
Jan-Christoph Borchardt
13ca1c6a99
Merge pull request #9585 from owncloud/design-fix-public-footer
...
move public page footer rules from sharing app to core so it is used by other apps too
2014-07-28 12:53:29 +02:00
Bjoern Schiessle
b7958f79c3
adjust error code
2014-07-28 12:39:22 +02:00
Jenkins for ownCloud
a169572223
[tx-robot] updated from transifex
2014-07-28 01:54:30 -04:00
Jenkins for ownCloud
9a4d2871eb
[tx-robot] updated from transifex
2014-07-27 01:54:31 -04:00
Jenkins for ownCloud
010732019a
[tx-robot] updated from transifex
2014-07-26 01:54:40 -04:00
Bjoern Schiessle
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
Björn Schießle
40f2a34be1
Merge pull request #9867 from owncloud/fix_sharing_update
...
fix sharing update, add proper escaping
2014-07-25 10:16:22 +02:00
Jenkins for ownCloud
3f58d949e0
[tx-robot] updated from transifex
2014-07-25 01:54:32 -04:00
Bjoern Schiessle
c22b5c7884
fix sharing update, add proper escaping
2014-07-24 20:16:40 +02:00
Morris Jobke
fa333c02a0
Merge pull request #9703 from owncloud/files-preview-animate
...
[OC 7] Fix preview animation on uploading
2014-07-24 14:19:00 +02:00
Jenkins for ownCloud
e2327f83ed
[tx-robot] updated from transifex
2014-07-24 01:54:37 -04:00
Robin Appelman
97de7bb23e
Fix remote share when remote server is installed at the root
2014-07-23 13:45:56 +02:00
Jenkins for ownCloud
5696a88fc3
[tx-robot] updated from transifex
2014-07-22 01:54:29 -04:00
Jenkins for ownCloud
ddd8eae932
[tx-robot] updated from transifex
2014-07-21 01:54:30 -04:00
Jenkins for ownCloud
ddc85a9871
[tx-robot] updated from transifex
2014-07-20 01:54:40 -04:00
Jenkins for ownCloud
d09ec36751
[tx-robot] updated from transifex
2014-07-19 01:54:42 -04:00
Vincent Petry
7a1048956f
Fix preview animation on uploading
...
When adding/uploading files, the preview is now animated.
When loading a list of files directly the preview is displayed directly.
2014-07-17 12:42:09 +02:00
Jenkins for ownCloud
b736864e78
[tx-robot] updated from transifex
2014-07-17 01:55:09 -04:00
Vincent Petry
658828867c
Correctly return the owner display name for children of shares
2014-07-16 12:07:02 +02:00
Jenkins for ownCloud
0155326227
[tx-robot] updated from transifex
2014-07-16 01:55:55 -04:00
Morris Jobke
4c0ca27909
Merge pull request #9596 from owncloud/fixing-9503-master
...
reduce share action text to the user name only
2014-07-15 09:15:32 +02:00
Jenkins for ownCloud
ff11ef3c5b
[tx-robot] updated from transifex
2014-07-15 01:55:20 -04:00
Thomas Müller
7159d6118e
reduce share action text to the user name only
2014-07-14 21:11:50 +02:00
Vincent Petry
dd7529da98
Added mountType attribute and adapted Delete action text
...
Added mountType attribute for files/folder to indicated whether they are
regular, external or shared.
The client side then adapts the "Delete" action hint text based on this
information.
Only the mount roots must have the delete icon hint adapted.
To make this detectable on the client side, the mountType can now
be null, "shared", "shared-root", "external" or "external-root".
This also gives room to icon customization on the client side.
2014-07-14 10:36:04 +02:00
Jenkins for ownCloud
5dd76b510f
[tx-robot] updated from transifex
2014-07-14 01:54:27 -04:00
Jenkins for ownCloud
d7b8e3209b
[tx-robot] updated from transifex
2014-07-13 01:54:35 -04:00
Jenkins for ownCloud
c1e95d62ec
[tx-robot] updated from transifex
2014-07-12 01:54:39 -04:00
Vincent Petry
e391108ebc
Merge pull request #9538 from owncloud/fileactions-cleanup
...
Propagate file action changes to the file lists
2014-07-10 16:15:23 +02:00
Jenkins for ownCloud
77792b5b7e
[tx-robot] updated from transifex
2014-07-10 04:59:40 -04:00
Vincent Petry
22653e21a2
Propagate file action changes to the file lists
...
Whenever an app needs to register an event late, it does that on the
original file actions object.
Since the file actions that the file list work on is a merged list, not
the original one, the registration event needs to be propagated there as
well.
2014-07-09 12:26:33 +02:00
Jenkins for ownCloud
6e2e0108ee
[tx-robot] updated from transifex
2014-07-09 01:55:51 -04:00
Vincent Petry
87adbf1c6e
Merge pull request #9515 from owncloud/update-sharecleanupfix
...
Fix update cleanup to only affect file and folders
2014-07-08 18:09:26 +02:00
Vincent Petry
f4f52cf242
Fix update cleanup to only affect file and folders
...
Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.
2014-07-08 14:53:31 +02:00
Thomas Müller
ea269f0067
Upload abortion is now detected within the OC_Connector_Sabre_File::put()
...
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless
Adding unit test testUploadAbort()
2014-07-08 11:09:59 +02:00
Jenkins for ownCloud
20fc4b8b53
[tx-robot] updated from transifex
2014-07-08 01:55:17 -04:00
Morris Jobke
45a4751f0e
Merge pull request #9499 from owncloud/shares-hidetokenrecipient
...
Do not show recipient for link shares in file list
2014-07-07 20:02:59 +02:00
Morris Jobke
29bdfc0ce2
Merge pull request #9502 from owncloud/add_ocsids
...
Add ocsids for shipped apps in core repo
2014-07-07 19:58:41 +02:00
Morris Jobke
54a8dce380
Merge pull request #9415 from owncloud/external-sharedialog
...
Improved external share dialog
2014-07-07 19:51:54 +02:00
Georg Ehrke
e5e8e28ae7
add ocsids to info.xml
2014-07-07 17:11:50 +02:00
Vincent Petry
4ba492f28d
Fixed shared list sorting
...
Use Array.sort instead of underscore's sortBy() as they don't use the
same method/function signature.
2014-07-07 16:49:32 +02:00
Vincent Petry
8ddff52c51
Do not show recipient for link shares in file list
...
In the "Shared with link" section, the share_with field can contain a
value when a password was set.
This fix prevents this value to be shown as it is not intended for the
end user.
2014-07-07 16:33:23 +02:00
Vincent Petry
130b8018a1
Improved external share dialog
...
Changed title, label and buttons.
Removed icon.
2014-07-07 15:57:26 +02:00
Jan-Christoph Borchardt
498adda0f4
move public page footer rules from sharing app to core so it is used by other apps too
2014-07-07 12:21:48 +02:00
Jenkins for ownCloud
6e9905d7cf
[tx-robot] updated from transifex
2014-07-07 01:54:28 -04:00
Jenkins for ownCloud
33492b4448
[tx-robot] updated from transifex
2014-07-06 01:54:33 -04:00
Jenkins for ownCloud
23e0ef6ed0
[tx-robot] updated from transifex
2014-07-05 01:56:33 -04:00
Björn Schießle
a544bd3a0f
Merge pull request #9357 from owncloud/sharing_unshare_on_delete
...
[sharing] unshare childrens on delete
2014-07-04 17:42:52 +02:00
Morris Jobke
574cb15c2d
Merge pull request #9434 from owncloud/files-reloadpromiseissue
...
Fix reload call for all subclasses
2014-07-04 16:13:33 +02:00
Morris Jobke
3d13e04170
Merge pull request #9426 from owncloud/design-remoteshare-confirm
...
use icon-confirm instead of text for accepting remote share, works better with translations
2014-07-04 14:13:44 +02:00
Vincent Petry
59ca30d462
Fix reload call for all subclasses
...
All subclasses must also properly return the ajax call object.
2014-07-04 11:45:36 +02:00
Vincent Petry
5e8959a5b3
Return and use isPreviewAvailable for share previews
...
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
2014-07-04 11:16:23 +02:00
Bjoern Schiessle
3b9fa81581
if a folder gets deleted we unshare all shared files/folders below
2014-07-04 10:34:54 +02:00
Morris Jobke
ac00e4b6e6
IE8 fixes
2014-07-04 08:13:05 +02:00
Jenkins for ownCloud
e4a3f8d3c4
[tx-robot] updated from transifex
2014-07-04 01:56:01 -04:00
Jan-Christoph Borchardt
8e617453e5
use icon-confirm instead of text for accepting remote share, works better with translations
2014-07-04 00:07:24 +02:00
Jan-Christoph Borchardt
e5f68bafb9
for shared links, use wide logo on desktop and icon on mobile
2014-07-03 12:20:44 +02:00
Jan-Christoph Borchardt
e9f616b0a0
Merge pull request #9391 from owncloud/design-mobile-share
...
Fix mobile share view glitches
2014-07-03 09:45:19 +02:00
Jenkins for ownCloud
1a1c5aa3c0
[tx-robot] updated from transifex
2014-07-03 01:56:24 -04:00
Volkan Gezer
bf08e3a85e
Merge pull request #9382 from owncloud/server2server-css
...
fix lineheight of server2server share
2014-07-03 00:39:37 +02:00
Jan-Christoph Borchardt
0df04975b0
use same logo for mobile as for when logged in, fix #9360
2014-07-02 23:33:20 +02:00
Jan-Christoph Borchardt
560c530875
hide text of download button, only show icon
2014-07-02 23:21:06 +02:00
Volkan Gezer
586c4236fd
fix lineheight of server2server share
2014-07-02 21:46:52 +02:00
Vincent Petry
ed29e7d160
Merge pull request #9329 from owncloud/sharing_check_target
...
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
Vincent Petry
615d037d3e
Merge pull request #9364 from owncloud/sharing_rename_mount_points
...
[sharing] rename mount point of children if parent was renamed
2014-07-02 18:48:07 +02:00
Vincent Petry
f4eb90e229
Merge pull request #9311 from owncloud/storage-not-available
...
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
Bjoern Schiessle
ea31ab7b5c
rename mount point of children if parent was renamed
2014-07-02 15:39:38 +02:00
Morris Jobke
d2f3ff5c34
Merge pull request #9245 from owncloud/server2server-sharing-design-fixes
...
drop unneeded code
2014-07-02 15:34:57 +02:00
Robin Appelman
edb67f9f4d
Remove invalid mounts from the active fs
2014-07-02 15:00:12 +02:00
Robin Appelman
0008db9995
Fix unit test
2014-07-02 14:39:45 +02:00
Morris Jobke
59629e688c
Merge pull request #9341 from owncloud/sharing-fileactions-fix
...
Fix fileActionsReady event after deferred file actions update
2014-07-02 14:36:59 +02:00
Jenkins for ownCloud
9933b33166
[tx-robot] updated from transifex
2014-07-02 01:55:17 -04:00
Vincent Petry
025b71d068
Use fileActionsReady to re-render sharing icons
...
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.
Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
2014-07-01 21:32:04 +02:00
Bjoern Schiessle
bb935978fa
don't move a share mount point into a different mount point
2014-07-01 19:38:55 +02:00
Vincent Petry
fd68034357
Fixed remote share password param detection
2014-07-01 17:34:01 +02:00
Robin Appelman
8061a4ccc0
Remove external shares if the share is invalid
2014-07-01 14:58:07 +02:00
Robin Appelman
1c43081d38
Detect removed public shares
2014-07-01 14:36:06 +02:00
Jörn Friedrich Dreyer
abc521dbf7
add missing backticks
2014-07-01 12:29:30 +02:00
Jenkins for ownCloud
a878b42b42
[tx-robot] updated from transifex
2014-07-01 01:54:43 -04:00
Jörn Friedrich Dreyer
f35f14aa37
Merge pull request #9303 from owncloud/issue/8841
...
Do not strict compare item source id so the dropdown is closed correctly
2014-06-30 14:46:46 +02:00
Joas Schilling
5e4ac548bb
Use attr() instead of data() so the item ids work as intended
...
Fix #8841
2014-06-30 14:21:27 +02:00
Bjoern Schiessle
372d58544f
no longer check if the external storage app is enabled, we use no the webdav implementation from core
2014-06-30 12:34:49 +02:00
Jenkins for ownCloud
589f68ebf6
[tx-robot] updated from transifex
2014-06-30 01:54:47 -04:00
Jenkins for ownCloud
ebf93448f2
[tx-robot] updated from transifex
2014-06-29 01:56:00 -04:00
Volkan Gezer
d918e5a68c
Merge pull request #9278 from owncloud/l10n-servershare-dialog
...
fix server share dialog title
2014-06-28 14:44:37 +02:00
Morris Jobke
d5462fdb50
Merge pull request #9265 from owncloud/fix-whitespace
...
fix trailing whitespace noted by Scrutinizer
2014-06-28 12:26:09 +02:00
Jenkins for ownCloud
26d0978993
[tx-robot] updated from transifex
2014-06-28 01:54:54 -04:00
Volkan Gezer
11788c9579
fix server share dialog title
2014-06-28 01:54:51 +02:00
icewind1991
1a3e698294
Merge pull request #9263 from owncloud/remote-share-update
...
Better detecting of remote changes for external shares
2014-06-27 19:31:18 +02:00
Jan-Christoph Borchardt
b7cb4f5a63
fix trailing whitespace noted by Scrutinizer
2014-06-27 18:25:56 +02:00
Robin Appelman
1bb1504d24
Improve comment
2014-06-27 17:31:51 +02:00
Robin Appelman
6f5d5b9a30
Also check for updated permissions for webdav storages
2014-06-27 17:27:47 +02:00
Vincent Petry
13b7937381
Allow late registration of file actions in public page
2014-06-27 16:10:20 +02:00
Vincent Petry
586b3a9683
Sync file list with file actions
...
Whenever file actions are registered later, now the file lists are
automatically notified.
Added FileActions.addUpdateListener() to be able to receive such
notifications.
This removes the need for apps to manually call FileActions.display()
after registering new actions.
This fixes issues with race conditions when file actions are
registered after the file list was already rendered.
2014-06-27 13:41:01 +02:00
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
Morris Jobke
d9aa8c9f0e
drop unneeded code
2014-06-27 00:30:14 +02: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