wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27454 commits 157 branches 562 tags 714 MiB
Commit graph

306 commits

Author SHA1 Message Date
Vincent Petry
66afd1aa39 Fix fileList fallback in OC.Share for outside files app 
OC.Share can be used in non-files apps, so the fileList callback needs
to support that as well.
 2014-05-30 10:06:30 +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
60bcdc550e Fixed file actions for sharing views 
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.

Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
 2014-05-30 10:06:29 +02:00
Volkan Gezer
9c5fdc5005 add title property to share dialog 2014-05-27 22:09:55 +02:00
libasys
9e1d47bd90 Add generic 'share by link' URL generator in share.js 
Some more global definition to autogenerate a "Shared by Link" with token! Why we not add these lines for more global use of the public service feature? At the moment there is a pr for sharing a calendar by Link. With this little mod the calendar can work with the core share api and needs no own js share definition!
 2014-05-19 13:12:59 +02:00
Morris Jobke
f633fb537f fix wrong conflict resolution 2014-05-19 01:53:20 +02:00
Joas Schilling
d273b55e98 Correctly set expiration dates when adding additional shares 2014-05-19 01:40:32 +02:00
Bjoern Schiessle
b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Björn Schießle
dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements 
Sharing ux improvements
 2014-05-14 12:54:27 -04:00
Bjoern Schiessle
737be1a10f move expire message to the bottom 2014-05-13 15:27:56 +02:00
Bjoern Schiessle
b985021082 hide default expire message if user sets expire date 2014-05-13 11:56:04 +02:00
Bjoern Schiessle
d56d03e230 add information about default expire date to the share dialog 2014-05-13 11:28:25 +02:00
Thomas Müller
1c731aacaf fix style 2014-05-12 11:30:47 +02:00
Thomas Müller
78c0cc6089 escape display name and email 2014-05-09 23:12:26 +02:00
Stefan
1d8eb44677 Fix javascript error in calendar app 
Fix owncloud/calendar#409
If you haven't allowed to share items per email the element "email" will never appear and you will get a null exception.

License: WTFPL
 2014-04-16 22:41:57 +02:00
Jan-Christoph Borchardt
e68006c0ce Merge pull request #8157 from owncloud/share-expiration-smooth-hide 
Expiration date is hidden smoothly
 2014-04-16 17:10:14 +02:00
Julian Müller
463df08088 Revert "close-button for share_dropdown" 
This reverts commit 3bc3d4c9f3.
 2014-04-14 18:40:24 +02:00
Julian Müller
3bc3d4c9f3 close-button for share_dropdown 2014-04-14 18:26:45 +02:00
Thomas Müller
dcca5f7bdd Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master 
introduce auto completion on share email - integrated with the contactsm...
 2014-04-11 00:04:58 +02:00
Volkan Gezer
9e9c109390 Expiration date is hidden smoothly 
From now on, it is hidden smoothly as the other fields do.
 2014-04-10 21:54:25 +02:00
Vincent Petry
be0660f84f Merge pull request #7943 from hjort/master 
Correction: failure on sharing when user ID was prefixed by zero
 2014-04-01 12:57:16 +02:00
Rodrigo Hjort
51b727cfca Correction: failure on sharing when user ID was prefixed by zero 2014-03-28 15:08:59 -03:00
Thomas Müller
e3b951f412 Merge pull request #7724 from owncloud/mobile 
[WIP] Mobile optimization for base layout and Files app
 2014-03-28 10:27:15 +01:00
Vincent Petry
6252c248c2 Merge pull request #7557 from owncloud/issue/7297 
Do not allow setting an expiration date in the past
 2014-03-19 15:53:08 +01:00
Joas Schilling
7ab2632085 Use tipsy to display error when selecting a date in the past 2014-03-19 12:11:14 +01:00
Jan-Christoph Borchardt
ac48563efd add spans around replaced 'Shared' indicators to make text hide on mobile 2014-03-14 10:48:28 +01:00
Jan-Christoph Borchardt
7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
Joas Schilling
80393d9c0f Do not allow setting an expiration date in the past 
Fix #7297
 2014-03-05 13:12:58 +01:00
Bjoern Schiessle
77de47858b add expire date to link share if possible 2014-01-24 10:46:08 +01:00
Vincent Petry
1042733634 Fixed various file name escaping issues in core apps 
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
 2014-01-10 15:02:26 +01:00
ganomi
33e77d34f4 Show stars as placeholder 2013-11-26 20:17:13 +01:00
Bjoern Schiessle
7f3d717037 Check which permissions are possible to re-share a file 2013-11-18 11:58:42 +01:00
Thomas Müller
d4c0ac7790 introduce auto completion on share email - integrated with the contactsmanager api 2013-11-14 09:38:55 +01:00
Bjoern Schiessle
4c7082bf1d allow to share a file/folder as public link also if one of it parents was already shared as link 2013-10-30 17:03:53 +01:00
Morris Jobke
7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code 
Fix sharing error message - id -> file name
 2013-10-29 07:33:23 -07:00
Morris Jobke
b56c936212 also add new parameter to function calls 2013-10-29 14:22:24 +01:00
Thomas Müller
291cdbdd98 Merge pull request #5497 from owncloud/ie8-placeholdershim 
Ie8 placeholdershim
 2013-10-23 13:18:37 -07:00
Thomas Müller
e95ad29d90 Merge pull request #5435 from owncloud/share-improvements 
Share improvements
 2013-10-23 09:56:24 -07:00
Vincent Petry
086b82bd69 Fixed sharing dropdown placeholders in IE8/9 
Added jquery.placeholder shim to handle input field placeholders in IE8/9
 2013-10-23 18:51:25 +02:00
Thomas Müller
1317b7c03d pass the name of the item source from the browser to the server - no need to get the data via complicated db queries 2013-10-23 18:39:37 +02:00
Vincent Petry
88c2646f7e Fixed share dropdown checkbox wrapping 
The "show cruds" button is now embedded into the last label/checkbox
group and wraps with it.

Added ellipsis to prevent long names to exceed the dropdown's width.
 2013-10-23 17:58:27 +02:00
Jan-Christoph Borchardt
a2e9c0f81a better wording for share input field and share link 2013-10-23 17:57:06 +03:00
Frank Karlitschek
6915367622 Merge pull request #5446 from frisco82/fixNotifyUser 
Fix notify user checkbox
 2013-10-21 14:07:33 -07:00
Vincent Petry
fa1864971e Merge pull request #5120 from frisco82/sendEmailJS 
Fix disabled status after sending a share link email
 2013-10-21 13:02:52 -07:00
Vincent Petry
635a46b373 Merge pull request #5444 from frisco82/fixDisplayGroup 
Fix display name for user after sharing
 2013-10-21 12:05:14 -07:00
Ramiro Aparicio
b27595888a fix notify user, and made js more resiliant to changes 2013-10-21 16:14:23 +02:00
Ramiro Aparicio
85edbb08c1 fix user displayName not being shown after add, added class for improved styling, fix strong for groups when english is not being used 2013-10-21 15:31:31 +02:00
Vincent Petry
f8717bc260 Fixed share with link checkbox missing as regular user 
Instead of loading the app config setting "shareapi_allow_links" using a
synchronous ajax call that fails when the user is not an admin, this fix
puts the flag directly in the template so it doesn't need to be loaded
afterwards.

Fixes #5440
 2013-10-21 11:29:40 +02:00
Jan-Christoph Borchardt
84d4d797d1 shorten string to 'notify by email', cut 'user' 2013-10-20 23:04:24 +03:00
Jan-Christoph Borchardt
fc7269e728 remove hover hide/show stuff for share dropdown to make things more obvious 2013-10-20 23:03:48 +03:00
Morris Jobke
b201e87af6 Merge pull request #5338 from frisco82/fixGroupDisplay 
Show (group) after groups in share dropdown
 2013-10-18 05:46:05 -07:00
Morris Jobke
0febccee49 readability: single line -> multiple lines 2013-10-18 10:39:02 +02:00
Michael Gapczynski
7f9ff51308 Fix accidental deletion of if 2013-10-18 10:34:31 +02:00
Michael Gapczynski
a2c80bbc68 Don't show links option in dropdown if disabled 2013-10-18 10:34:30 +02:00
Vincent Petry
8a5c761239 Added missing var in share.js 2013-10-17 14:39:20 +02:00
Vincent Petry
467f864db4 Fixed sharing status update for new/uploaded files 
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.

For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.

Performance should improve as the sharing list is now only loaded once
per navigation session.

In OC.Share, split loadIcons into loadIcons + updateIcons.

Fixes #4977
 2013-10-17 12:55:10 +02:00
Ramiro Aparicio
8ac518bb3e Show (group) after groups in share dropdown 2013-10-14 20:17:45 +02:00
Vincent Petry
e97aaee1aa Prevent share dropdown to close too early with autocomplete 
When clicking on an autocomplete result in the sharing dropdown,
it will mistakenly be detected as being clicked outside and would
trigger the sharing dropdown closing.

This fix adds a check to detect clicks inside the autocomplete and
prevent closing the dropdown in that case.

This fixes #4142
 2013-10-07 13:26:46 +02:00
Vincent Petry
68fbd7b922 Fixed label for sharing notification to be clickable 
Fixed the sharing notification checkbox label in the file sharing
dropdown, which makes it possible to click on the label directly.
 2013-10-07 13:15:25 +02:00
Vincent Petry
27579f36f6 Prevent scroll up when click on links in sharing dropdown 
When clicking on a link that points to "#" in the sharing dropdown, and
the current view is scrolled down, the browser will scroll the page up
to the top (anchor behavior).

This fix cancels the click event when clicking on "unshare" link or
"show crud" link.
 2013-10-07 13:11:34 +02:00
Ramiro Aparicio
8b62b2684a Fix disabled status after sending the email 2013-10-04 13:10:51 +02:00
Bjoern Schiessle
8b08b1b455 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/private/util.php
 2013-10-02 10:11:18 +02:00
Björn Schießle
6b1d70f148 Merge pull request #4887 from owncloud/sharing_disable_public_upload 
check only permission from link-share to decide if public upload is enabled or disabled
 2013-09-26 03:16:15 -07:00
Bjoern Schiessle
6d0987bdb4 some small js fixes 2013-09-24 18:32:57 +02:00
Bjoern Schiessle
fc76a13c52 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/public/share.php
 2013-09-23 11:18:00 +02:00
Björn Schießle
9851f0f4f2 Merge pull request #4896 from owncloud/sharing_allow_disable_password 
sharing, allow user to disable password protection
 2013-09-23 01:20:09 -07:00
Bjoern Schiessle
71e129f295 initialize variable 2013-09-20 15:47:33 +02:00
Bjoern Schiessle
12b4e79201 calculate correct permissions while toggle the password protection 2013-09-20 13:11:05 +02:00
Jörn Friedrich Dreyer
cda58ae3df css selectors never have a : before [] 2013-09-19 10:14:07 +02:00
Bjoern Schiessle
642b064c5b we can leave the loop if the permission of the link share was checked 2013-09-17 18:18:23 +02:00
Bjoern Schiessle
d6771502f2 check only permission from link-share to decide if public upload is enabled or disabled 2013-09-17 18:11:43 +02:00
Bjoern Schiessle
534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +02:00
Pete McFarlane
15be3d85b6 no autoFocus if no users returned 2013-09-11 15:59:28 +01:00
Pete McFarlane
92b57c13c1 Added autoFocus to #shareWith autocomplete options 2013-09-11 11:45:32 +01:00
Bjoern Schiessle
fd7469db9e coding-style fixes 2013-09-03 13:37:06 +02:00
Bjoern Schiessle
65ddefc89d set sendMail status back to false 2013-08-30 16:29:22 +02:00
Bjoern Schiessle
10cf1b3a4e return mailSend status in getItems() 2013-08-30 15:39:43 +02:00
Bjoern Schiessle
77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
kondou
edd92e4c09 Merge branch 'master' into fix_jslint_kondou 
Conflicts:
	apps/files/js/file-upload.js
 2013-08-18 00:38:52 +02:00
Thomas Müller
bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox 
fix #2711 using a custom event, also use css selectors over filterAttr
 2013-08-15 14:08:01 -07:00
Jörn Friedrich Dreyer
11a404b90b comment clarification 2013-08-14 00:25:07 +02:00
Jörn Friedrich Dreyer
ca95a475d5 use edit & reshare permission as default 2013-08-13 22:58:47 +02:00
Jörn Friedrich Dreyer
ff67f115d4 fix #2711 using a custom event, also use css selectors over filterAttr 2013-08-08 13:50:04 +02:00
kondou
aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Thomas Müller
17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Victor Dubiniuk
ab997bdc68 Create an array entry before filling it 2013-07-23 14:57:58 +03:00
Victor Dubiniuk
5160ea6063 Show generic error when there is no error 2013-07-22 21:02:18 +03:00
Thomas Müller
fc2d538311 new admin setting added which allows to turn off anonymous uploads 2013-07-12 17:03:51 +02:00
Thomas Müller
18b11f76b1 fixing === and ident 2013-07-05 15:27:14 +02:00
Thomas Müller
59b700a550 Merge branch 'master' into fixing-3934-master 
Conflicts:
	core/js/share.js
 2013-07-05 13:52:33 +02:00
Thomas Müller
27c0cc7fda no anonymous upload on read-only folders 2013-07-05 11:23:08 +02:00
Thomas Müller
13991be5ce no anonymous upload on files only folders 2013-07-05 10:53:59 +02:00
Lukas Reschke
0217315a24 Escape dropdown 
Fixes #3241
 2013-06-29 13:24:05 +02:00
Roman Geber
ddb0ff346d Public upload feature 2013-06-25 12:24:14 +02:00
kondou
5f89812a9b Fix #2730 
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
 2013-04-09 13:22:34 +02:00
Bernhard Posselt
86ac30c596 Merge pull request #2516 from kabum/master 
share autocomplete - improve group appearance - issue #173
 2013-03-29 07:28:09 -07:00
Arthur Schiwon
c51396551d Whitespaces 2013-03-27 22:55:17 +01:00
Arthur Schiwon
3af61a0a7c Share Dialog: show Displayname instead of internal name 2013-03-27 22:55:05 +01:00
Morris Jobke
79d99b9c96 use simple markup to highlight groups in share autocomplete 2013-03-22 10:00:43 +01:00
Morris Jobke
8871629db5 replace hardcoded css style with css class - ref owncloud/core#173 2013-03-21 23:19:59 +01:00
Morris Jobke
a1a6ef9409 share autocomplete - improve group appearance 
highlight groups with markup (bold font) instead of "(group)" postfix

ref owncloud/core#173
 2013-03-21 22:45:36 +01:00
Bernhard Posselt
9ad03b61a3 Update share.js 
Added HTML escaping
 2013-03-08 17:29:05 +01:00
Michael Gapczynski
6e5e8c6b46 Fix #2080 and fix #2141 2013-03-07 22:30:12 -05:00
Lukas Reschke
577945bd33 Sanitize shareWith 2013-03-04 00:54:21 +01:00
Jan-Christoph Borchardt
e01ab04d2b reduce minimum length for username suggestions in share dialog, fix #1666 2013-02-27 17:57:53 +01:00
Thomas Müller
58b06c5c9a Merge pull request #1905 from owncloud/fix-share-icons 
Fix adding share icons to share action
 2013-02-27 02:31:52 -08:00
Michael Gapczynski
5b732ac1ea Move space 2013-02-25 20:52:01 -05:00
Michael Gapczynski
aa2ea9e3de Fix adding share icons to share action 2013-02-25 20:20:29 -05:00
raghunayyar
6ecc3d7ee1 Reduced email input width by 10% to increase space. 2013-02-20 23:08:21 +05:30
raghunayyar
d8e8dab006 Fixes the Email Button and the email input Width. 2013-02-20 21:37:23 +05:30
Björn Schießle
45ed0c6010 if you add/remove more than one user from the share dialog replacing 'Share' with 'Shared' will lead to a string with more and more trailing 'd's 2013-02-11 15:37:01 +01:00
Jörn Friedrich Dreyer
43ffb5945c attach handlers to document instead of filelist, minor whitespace cleanups 2013-02-08 11:05:56 +01:00
Jörn Friedrich Dreyer
d7823adb07 attach to filelist which is present on .ready() 2013-01-30 17:46:33 +01:00
Jörn Friedrich Dreyer
22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Lukas Reschke
250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00
Michael Gapczynski
ed2ee8c411 Change file action text for files inside shared folders as well 2013-01-28 23:16:29 -05:00
Michael Gapczynski
ede7fccb00 Change file action text to 'Shared' 2013-01-28 23:13:38 -05:00
Michael Gapczynski
31ebea0f6a Permanently display shared status icons 2013-01-26 13:25:15 -05:00
Björn Schießle
a606e8d944 use display name to show share_width and owner information 2013-01-25 17:40:23 +01:00
Björn Schießle
3adfb91ad8 call the password input field by name 2012-12-18 13:40:19 +01:00
Björn Schießle
d873f0da35 autofocus to password input after clicking the checkbox; code restructured; debug output added 2012-12-18 13:39:52 +01:00
Björn Schießle
c457e15b20 some more usability improvements: 
merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121
 2012-12-18 13:39:37 +01:00
Björn Schießle
1dd79cc8e1 set password for shared links when the user press enter and when he leaves the password field 2012-12-18 13:39:09 +01:00
Thomas Mueller
c938a4f791 feedback to the user while request is being processed 2012-12-12 12:34:28 +01:00
Thomas Mueller
162a2c0fba moving sharing email code to core 2012-12-10 23:22:42 +01:00
Thomas Mueller
45074d5023 restoring feature to send sharing link via email 2012-12-10 18:41:08 +01:00
Thomas Tanghus
5c9faf396a Sharing: Fix false positived v. 2 2012-11-27 23:01:26 +01:00
Jörn Friedrich Dreyer
995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Jörn Friedrich Dreyer
d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
libasys
493ae19bca If you using the sharing by link the array monthNames don't exist and causes errors in all browsers! so we check if the type of the variable isn't undefined! 2012-11-14 16:47:52 +01:00
Michael Gapczynski
e5a74903e4 Try to fix shared status icons again 2012-10-28 16:36:17 -04:00
Michael Gapczynski
60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Björn Schießle
f2f2b8ba3b added some visual feedback is password was set 2012-10-28 14:57:36 +01:00
Björn Schießle
a4a1dad831 set password if user leaves password field (issue #57) 2012-10-28 14:31:34 +01:00
Lukas Reschke
b1150f6a7f Urlencode the share URL 
Fixes #63
 2012-10-23 17:55:49 +02:00
scambra
a24d8db4b2 translate datepicker 2012-10-19 13:56:19 +02:00
scambra
c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
Victor Dubiniuk
71ff6382b5 Prevent closing sharing dialog on picking the date 2012-10-08 22:38:14 +03:00
Victor Dubiniuk
06d00af9f8 Prevent closing sharing dialog on month adjustment. Fixes oc-1884 2012-10-08 22:03:16 +03:00
Björn Schießle
16eade5a3b share.expiration is null if no expiration date is set. 2012-10-04 11:18:37 +02:00
Michael Gapczynski
7bee735877 Show correct public link url for folders 2012-10-03 16:17:36 -04:00
Georg Ehrke
43c85248d4 Share - Dropdown dialog - cut off username if it's longer than 14 chars - bugfix for oc-1871 2012-10-01 16:04:20 +02:00
scambra
8f27881770 undo interpolation in js for 4.5 2012-09-28 19:53:18 +02:00
Michael Gapczynski
b4e40b1c21 Fix unsetting share expiration date 2012-09-26 00:09:35 -04:00
Michael Gapczynski
00103d730f Show share expiration date set for shared item 2012-09-26 00:04:27 -04:00
Michael Gapczynski
2bdf89f4d4 Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773 2012-09-25 23:18:36 -04:00
scambra
d5211f9615 some characters in comments avoid finding some strings to translate 2012-09-21 12:05:01 +02:00
scambra
22c6b48d2f translate files_sharing app 2012-09-21 11:48:20 +02:00
Björn Schießle
b1c60841e8 float right element needs to be the first element, otherwise firefox will move it to a new line 2012-09-20 10:31:23 +02:00
Michael Gapczynski
518ca0ac58 Fix changing of share status icons, bug fix for oc-1631 2012-09-19 01:44:15 -04:00