Commit Graph

3279 Commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv) 0a400c4259
Fixed sharing js
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:26:59 +01:00
John Molakvoæ (skjnldsv) 6a617fa721
Fixed public share header buttons
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:25:02 +01:00
John Molakvoæ (skjnldsv) ba8a9a9cd2
Login and authenticate inputs fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 16:38:07 +01:00
Nextcloud bot 012e521239
[tx-robot] updated from transifex 2017-01-22 01:07:52 +00:00
John Molakvoæ (skjnldsv) f40e5b73f7
Fix #3174
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:06:57 +01:00
Nextcloud bot 4bbd52b3f9
[tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Nextcloud bot b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Roeland Jago Douma a5bf14ada3 Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Nextcloud bot d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Bjoern Schiessle 0c11209d33
allow to access mail shares even if public links are disabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 21:23:26 +01:00
Roeland Jago Douma fdf10e242d Merge pull request #2850 from nextcloud/downstream-26603
Fixed size issues on main detail view and disappearing of share recipients (#26603)
2017-01-02 21:19:43 +01:00
Nextcloud bot 0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot 52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Nextcloud bot 3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Michael Jobst 969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603)
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 16:56:55 +01:00
Arthur Schiwon b4d779977a
fix tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 19:33:09 +01:00
Vincent Petry 14256d631c
Use group display name in sharing API + UI 2016-12-22 18:35:32 +01:00
Morris Jobke 6789685c4e Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-link
Remove config change hook that deletes link shares (#26612)
2016-12-22 14:45:20 +01:00
Vincent Petry 000ba6484f
When grouping shares, sort by stime then id (#26777)
If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:38:33 +01:00
Vincent Petry 9473ab5c19
Remove config change hook that deletes link shares (#26612)
Seems broken. But also if link shares are not allowed, the link shares
will continue to exist but will be denied.

A future cleanup could be done through a background job.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:18:51 +01:00
Lukas Reschke 6fd421cc3c Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity
Remove leading slash from sharing activity
2016-12-16 13:20:27 +01:00
Lukas Reschke 5b474e72d5 Merge pull request #2673 from nextcloud/shared-scanner-unmasked
use unmasked permissions in shared scanner
2016-12-15 15:54:32 +01:00
Joas Schilling 6de0eb0b74
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Robin Appelman 5d0897b8d7
use unmasked permissions in shared scanner
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 14:37:51 +01:00
Roeland Jago Douma cd1929382f Merge pull request #2654 from nextcloud/increase-master-version
Update app versions and requirements
2016-12-14 11:20:58 +01:00
Roeland Jago Douma 9e353f6289
Fix overwriting parameter
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 22:28:09 +01:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Lukas Reschke edd01e3ce4 Merge pull request #2637 from nextcloud/mount-cache-storageid
also compare storage ids when checking for changed mounts
2016-12-13 14:02:49 +01:00
Robin Appelman bbe24d29ca
reuse cacheentry
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
Maxence Lange 43374292b1 update phpdoc
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
Maxence Lange 9ef8d25e46 Download a file in a subfolder in a sharedlink is not working
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
2016-12-11 18:32:28 -01:00
Nextcloud bot 74d1b0bada
[tx-robot] updated from transifex 2016-12-08 01:07:26 +00:00
Nextcloud bot ea801d7d7c
[tx-robot] updated from transifex 2016-12-07 01:07:46 +00:00
Nextcloud bot 3bea7ac6ac
[tx-robot] updated from transifex 2016-12-04 01:07:30 +00:00
Lukas Reschke 1131338562 Merge pull request #2486 from nextcloud/shared-storage-mask
apply permissions mask for shared storage
2016-12-02 23:39:48 +01:00
John Molakvoæ (skjnldsv) 14219c1082
Fix loader position and visibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:11 +01:00
John Molakvoæ (skjnldsv) ef04bea5fb
Fix popover arrow
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:08 +01:00
Robin Appelman 02ee4f958c
apply permissions mask for shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 17:59:02 +01:00
John Molakvoæ (skjnldsv) 8a12f0bc8f
Fix unshare delete icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 17:52:24 +01:00
Morris Jobke 0853f0e7a8
Remove white background from loading icon
* allows to use the loading icon on non-white background (disabled input fields for example)
* fixes #2466

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 12:39:12 +01:00
Morris Jobke ac1bf3c2b7 Merge pull request #2432 from nextcloud/activity-mail-language
Make sure the activity emails can be sent in the users language
2016-12-01 23:01:00 +01:00
Lukas Reschke a87638c6ab Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares
Add share indicator for mail shares
2016-12-01 12:17:56 +01:00
Joas Schilling b2f46bfa04
Adjust all implementations in the server repo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
Nextcloud bot 4ca7f9c896
[tx-robot] updated from transifex 2016-12-01 01:07:17 +00:00
Roeland Jago Douma 05b86faccc
Display link share icon when toggling share
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-30 09:35:38 +01:00
Joas Schilling 09e5e38591
Add an icon when the file is shared by mail
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
Morris Jobke db84c1c872
Fix missing text for downloads on mobile
* fixes #2362

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-29 17:06:09 +01:00
John Molakvoæ (skjnldsv) a984f4b430
Fix #2384
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-29 07:06:41 +01:00
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Lukas Reschke 9def8225c0
Fix image_src link
The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-28 16:20:57 +01:00
Nextcloud bot 4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Nextcloud bot 9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Jan-Christoph Borchardt e75dede590 fix some outdated naming
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-24 16:05:05 +01:00
Joas Schilling 1c564fd554 Fix placeholder typo in public link activity
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
2016-11-23 21:43:14 +01:00
Morris Jobke 59db9fada2 Merge pull request #2281 from nextcloud/fix-translation
Fix language typo
2016-11-23 17:53:21 +01:00
Joas Schilling 14f01dbe33
Fix language typo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
Lukas Reschke 2eca9cc384 Merge pull request #2262 from nextcloud/specify-parameters-on-public-download
Specify the parameters on public download
2016-11-23 14:02:38 +01:00
Joas Schilling a36d26950e
Only do stuff when its a remote-share activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 22:46:18 +01:00
Joas Schilling e9336dddd5
Specify the parameters on public download
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
Roeland Jago Douma 08ef7356f6 Merge pull request #2165 from nextcloud/sharing-activities-update
Move file sharing activities to the new API
2016-11-22 10:19:15 +01:00
Nextcloud bot b0cf78aa1e
[tx-robot] updated from transifex 2016-11-22 01:06:54 +00:00
Lukas Reschke 7b3855a375
Add config switch
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Roeland Jago Douma 15c075eba8
Fix lookup url
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma f7f70028d1
Search on lookup server
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
Nextcloud bot ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Lukas Reschke 6c11c54434 Merge pull request #2196 from nextcloud/cache-owner-displayname
cache the displayname of the share owner
2016-11-18 13:51:24 +01:00
Morris Jobke ccdf387041 Merge pull request #2184 from nextcloud/share-join-cache
Get the share root info directly when querying for shares
2016-11-18 11:33:33 +01:00
Robin Appelman dbd7f6dea6
cache the displayname of the share owner
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-18 11:26:00 +01:00
Nextcloud bot 00fffae47f
[tx-robot] updated from transifex 2016-11-18 01:07:04 +00:00
Jan-Christoph Borchardt 6fa5c18a79 Merge pull request #2136 from nextcloud/sharing-layout
Sharing layout fixes
2016-11-18 00:40:46 +01:00
Jan-Christoph Borchardt a32c781326 use copy icon for local link rather than link icon to prevent confusion with sharing
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 21:46:07 +01:00
Jan-Christoph Borchardt 88865e9728 properly align input box items in share tab view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:11:49 +01:00
Jan-Christoph Borchardt 5eab1cdece fix layout of sharing list
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:02:33 +01:00
Robin Appelman b85459964c
fix getting root entry when not provided by the share provider
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:39 +01:00
Robin Appelman 2f03fcab4a
let the share backend get the node cacheentry to save queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:38 +01:00
Robin Appelman 065753f0ae
dont use the source cache/storage until needed
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:38 +01:00
Robin Appelman 30e7c27d86
reuse the known rootinfo in the shared cache when possible
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 14:59:31 +01:00
Nextcloud bot ab18d2f55e
[tx-robot] updated from transifex 2016-11-17 01:07:02 +00:00
Morris Jobke b373f52fa8
only use one kind of hack for the storage wrappers of the sharing code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 19:04:47 +01:00
Joas Schilling bdaf334c53
Move file sharing activities to the new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 16:45:08 +01:00
Lukas Reschke bc1008ac38
Use 11.0 instead 9.2
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
Nextcloud bot 571c5aac5e
[tx-robot] updated from transifex 2016-11-15 01:07:05 +00:00
Morris Jobke 42d754becd Merge pull request #2084 from nextcloud/files_drop_avatars_disabled
Fixes files_drop when avatars are disabled
2016-11-14 17:14:09 +01:00
Roeland Jago Douma ff96fffe39 Merge pull request #2100 from nextcloud/do_not_increse_link_share_perms
Fixes not allowed increasing of link share permissions
2016-11-14 15:21:08 +01:00
Morris Jobke 16a110e803 Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages
only query substorages to calculate the final mtime/size/etag when we need it
2016-11-14 11:39:02 +01:00
Nextcloud bot 8c1cd07de3
[tx-robot] updated from transifex 2016-11-14 01:07:06 +00:00
Roeland Jago Douma 965981486f
Fixes not allowed increasing of link share permissions
Fixes the following:

1. user0 shares folder with user1 (RO but with sharing permissions)
2. user1 shares by link
3. user1 send 'publicUpload=true' OCS request to the link share

before this increased the permissions of the link share. Which should
not happen.

now: API reponds with an error that the permissions can't be increased.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 20:29:34 +01:00
Roeland Jago Douma 1056692fff
Fixes files_drop when avatars are disabled
Fixes: #2080

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 14:39:38 +01:00
Nextcloud bot 150b86a7db
[tx-robot] updated from transifex 2016-11-13 01:07:09 +00:00
Nextcloud bot d969fc4ac6
[tx-robot] updated from transifex 2016-11-11 01:07:18 +00:00
Joas Schilling cbc6118f51
Only check the sharing backends for file/folder items
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-10 16:46:01 +01:00
Robin Appelman cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-10 13:59:22 +01:00
Nextcloud bot cfda17d8f3
[tx-robot] updated from transifex 2016-11-10 01:07:14 +00:00
Björn Schießle 1ad3043e4f Merge pull request #1998 from nextcloud/share-by-mail-notification
add share by mail activity
2016-11-08 17:37:46 +01:00
Morris Jobke 5f15020b9b Merge pull request #1618 from nextcloud/show-folder-shared-status
make it possible to share the current folder
2016-11-08 16:23:47 +01:00
Bjoern Schiessle 25bcd71d02
add activity if a file was shared by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:58:52 +01:00
Bjoern Schiessle 087dab85b4
add activity for share by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00