Commit Graph

418 Commits

Author SHA1 Message Date
Morris Jobke 8761856a71
Merge pull request #10838 from nextcloud/header-fixes-and-public-note
Header fixes and public note
2018-08-24 22:21:55 +02:00
John Molakvoæ (skjnldsv) 719f9288b9
Tests fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-24 20:31:29 +02:00
John Molakvoæ (skjnldsv) ac2c925231
Fix mobile view and add public share note view
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-24 16:45:40 +02:00
Arthur Schiwon 78f61b2ade
returning of $tr is expected, otherwise ending up in a JS error
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-23 00:28:03 +02:00
Morris Jobke 6d749bf021
Merge pull request #10700 from nextcloud/fix/10516/sharepermissions
Fix share dialog sidebar in share views
2018-08-20 17:14:12 +02:00
Arthur Schiwon 7f58f36b18
remove unexecutable code
OCA.Sharing.SharedFileInfo was never defined and that stopped execution.
Interestingly, FF never showed me an error.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-15 15:20:41 +02:00
John Molakvoæ (skjnldsv) b082278f04
Do not show action menu if no actions are available
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-15 09:39:12 +02:00
Björn Schießle 6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares
Add support for room shares
2018-08-09 10:44:11 +02:00
Daniel Calviño Sánchez 523fdb612c Add room shares to DAV and recent files "share-types" property
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
MartB 5109743383 Fix multiSelectMenu for public shares #10536
Signed-off-by: Martin Böh (MartB) <mart.b@outlook.de>
2018-08-06 12:42:13 +02:00
Julius Härtl 093799f4b0
Use OC.generateUrl to properly prefix preview images
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-26 22:41:41 +02:00
John Molakvoæ (skjnldsv) 440b5c944f
Fixed scrolling container
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 11:01:11 +02:00
John Molakvoæ (skjnldsv) 842583038b
Cleanup structure
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-20 23:35:21 +02:00
John Molakvoæ (skjnldsv) cdb42432c3
Jsuinit fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-17 12:26:57 +02:00
Morris Jobke 98cf2bab48
Rename "Shares overview" to "Shares"
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-16 16:28:26 +02:00
John Molakvoæ (skjnldsv) 18790858ca
Fix share by/with check
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-14 12:14:21 +02:00
John Molakvoæ (skjnldsv) 34368cc031
Fixed sharing coding style and display - Added all shares overview
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Fixed if condition

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-13 12:24:12 +02:00
Roeland Jago Douma 1f9e50086c
Tiny start of the share overview
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-13 07:31:02 +02:00
John Molakvoæ (skjnldsv) f39dfc7ab8
Fixed jsunit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv) d86c1e9503
Disable sidebar on deleted share
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv) 3b835d8076
Js magic for deleted shares
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
Roeland Jago Douma a596b062f5
Fix index.php links
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 17:54:11 +02:00
Roeland Jago Douma 31392c2443
Move public auth page over
Now this is in core so the basics (that 99% of the app will want to
use) looks always the same.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
Roeland Jago Douma 366981fba6
Move public preview endpoint over
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
Morris Jobke 8c043dd00d
Remove ellipsis below public text file shares
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-22 15:14:23 +02:00
Roeland Jago Douma 0771dad57f
Do not add sharePermission logic in JS
We have a dedicated dav property. We should do all the magic in 1 place.
Not several.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 12:14:37 +02:00
Julius Härtl 2e60f91ab1
Move external share saving to template
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 13:11:55 +02:00
Julius Härtl bbeb3402b6
Move styling and menu handling to publicpage.js
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 12:21:39 +02:00
John Molakvoæ (skjnldsv) 446a3a9d5a
Fixed ext share style and use varable for popover height
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 15:12:06 +01:00
John Molakvoæ (skjnldsv) 8d986160b8
Improved inline confirm icon with opacity and fixed ext share loading state
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 13:17:37 +01:00
Julius Härtl cae311460a
Show share owner avatars on all file lists
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-09 11:42:47 +01:00
Daniel Calviño Sánchez 372e7acfaf Fix closing menu on second click in sharing page
When a "mouseup" event was triggered on any element except on the share
menu or its descendants the share menu was closed. The share menu toggle
is not a descendant of the share menu, so clicking on it when the share
menu was shown closed it by removing its "open" CSS class. However, once
that happened the click event was then handled by the share menu toggle,
which toggled the "open" CSS class in the share menu and thus added it
again. So, from the user point of view, nothing happened when clicking
on the share menu toggle if the share menu was open.

Now a "mouseup" event on the share menu toggle no longer closes the
share menu, and thus toggling the "open" CSS class when handling the
"click" event works as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-21 12:37:35 +01:00
Arthur Schiwon 5a9c99e6ac
recycle SharedFileInfo values in fileInfo
fileInfo is composed of data from sharing, however additional data is
pulled when sidebar opens, e.g. the size. Then, existing data is
overwritten by data from the other source (files). The data points that
would be lost are not dirty however and still used, so we keep them.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 17:51:56 +01:00
Arthur Schiwon 077381c7b3
rip out obsolete recipientsDisplayName
also needs tests adjustements, and this also brings in natural sorting

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:14 +01:00
Arthur Schiwon 9d95391ff1
adjust tests and apply sorting
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon 4247936dd6
Fix avatars in file rows of incoming shares
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon dcfd7bf7ff
fix avatars in file rows of outgoing shares
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:09 +01:00
Jan-Christoph Borchardt eebf19e2e6 Fix Scrutinizer issue
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-02 15:26:37 +01:00
Jan-Christoph Borchardt 84b8cb12be Clicking publicly shared image opens direct preview url
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 14:49:52 +01:00
Jan-Christoph Borchardt bc47668206 Use standard way of showing and hiding popover menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 12:06:04 +01:00
Jan-Christoph Borchardt 116cb58c3c Show and hide menu via Javascript, thanks @skjnldsv
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Daniel Calviño Sánchez 4d003c812d Do not iterate over the files
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-18 15:18:20 +02:00
Daniel Calviño Sánchez 313b824dd7 Replace fileName variable with data.files[0].name
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.

This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-18 15:14:32 +02:00
Daniel Calviño Sánchez c70688e5d0 Update the whole file item instead of only its contents
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template,  so the resulting
HTML contained a "<li>" element nested in another "<li>" element.

However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".

Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-18 14:26:15 +02:00
Daniel Calviño Sánchez 2860ce027a Remove "errorThrown" parameter
When the "fail" callback is called, "errorThrown" is a property of the
data object instead of a parameter.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-18 14:08:51 +02:00
Bjoern Schiessle 2b3549610b
fix 'add to your nextcloud' input field, this is not an email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:46 +02:00
Artur Neumann f2f2e7b6fb some small refactoring and reformating
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:55 +05:45
Artur Neumann 79c760a10c use jqXHR.fail() to check for failures
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:36 +05:45
Vincent Petry 17a31a51c6
Fix share indicator handling
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
2017-04-26 13:38:12 +02:00
Joas Schilling b469882595 Merge pull request #4212 from individual-it/master
validate file name before uploading in upload only folder
2017-04-20 10:50:56 +02:00