Commit graph

275 commits

Author SHA1 Message Date
Vincent Petry
d15471abd4 Merge pull request #15738 from rullzer/fix_15611
Fix to make sure expiration date is properly set
2015-05-18 11:26:12 +02:00
Roeland Jago Douma
b090a32d23 Reset share dialog values so we start out clean
* Unit test
2015-05-18 10:08:09 +02:00
Roeland Jago Douma
efd6fec57d Fix to make sure expiration date is properly set
This did not happen correctly when the password was enforced since a
different code path was taken.

* moved generation of the default date string to separate function
* added unit test
2015-05-18 09:35:47 +02:00
Joas Schilling
4d53706d4c Do not restrict permissions for the original owner 2015-04-29 10:34:36 +02:00
Roeland Jago Douma
595adfd193 moved from html to $('html') to fix unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma
c456f5dee1 Reset sharedialog values 2015-04-17 09:38:09 +02:00
Jan-Christoph Borchardt
04ca5b8160 remove slow fade animation for remaining tipsy tooltips 2015-04-15 12:25:10 +02:00
Morris Jobke
473d3e14c8 more robust share dialog 2015-04-10 09:12:37 +02:00
Morris Jobke
b9eaa386c4 Merge pull request #15235 from owncloud/remote-share-hint
Hint for remote sharing syntax
2015-04-09 14:54:57 +02:00
Joas Schilling
6f51beac23 Correctly generate the doc link via go.php 2015-04-09 12:30:18 +02:00
Jan-Christoph Borchardt
7f237223e5 fix remote share info icon for IE8 2015-04-09 12:11:42 +02:00
Jan-Christoph Borchardt
000b09ee7a add more present info about remote shares, fix layout of inputs 2015-04-09 10:16:29 +02:00
Jan-Christoph Borchardt
0d3bea37c3 correct remote share hint 2015-03-26 20:30:51 +01:00
Morris Jobke
0a589d938c fix enforced password for share in IE8 2015-03-26 20:05:41 +01:00
Jan-Christoph Borchardt
d32e3870d2 add hint in Share placeholder on remote share syntax 2015-03-26 18:30:55 +01:00
Jan-Christoph Borchardt
f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Morris Jobke
10eeb35167 Merge pull request #15121 from owncloud/email-sent-unbold
unbold share email sent notification
2015-03-23 18:57:20 +01:00
Jan-Christoph Borchardt
fd8a134dd2 unbold share email sent notification 2015-03-23 16:53:20 +01:00
Jan-Christoph Borchardt
5130eca3e3 combine labels with inputs in sharing dialog, fix #14796 2015-03-23 14:40:56 +01:00
Roeland Jago Douma
c9272be0b9 Avatars in share dialog fixes
* Avatar for "xxxx share with you..." to the left
* Avatars for groups and remote shares (use default placeholder)
* Modified and added unit tests
* Use the same css for all the avatars in the dropdown
2015-03-03 20:57:50 +01:00
Lukas Reschke
92b5517229 Use custom attribute instead of the div identifier
Otherwise problems arrive when a username contains characters such as an `@`

Fixes https://github.com/owncloud/user_shibboleth/issues/38
2015-02-27 17:38:59 +01:00
Roeland Jago Douma
90218dcd4c Added config check 2015-02-13 12:17:22 +01:00
Roeland Jago Douma
e952687dcd Added unit test 2015-02-12 16:50:14 +01:00
Roeland Jago Douma
639a634cfd Display user avatar in share dialog 2015-02-12 16:50:14 +01:00
Joas Schilling
3f8e850dc6 Indicate that the share owner is remote in the filelist 2015-01-27 12:32:32 +01:00
Vincent Petry
c897a14d56 Fix reshare permission issue
The actual share permissions sent to the server on reshare are now based
on possiblePermissions + permissions inherited from parent share
2015-01-09 15:19:53 +01:00
Morris Jobke
bfdf0db7c0 Autoescape of placeholders in t() and p() - for JS
* add disableEscape parameter to disable this functionality
* drop usage of escapeHTML() that is now done inside t()
* add unit test for escaped and not escaped placeholder
* proper JSDoc
2015-01-07 12:56:32 +01:00
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
Jörn Friedrich Dreyer
587bdd9a74 Merge pull request #12948 from owncloud/wording
Wording fixes for sharing dialog
2014-12-19 09:48:19 +01:00
Jan-Christoph Borchardt
4f616a481c change 'Allow Public Upload' to more understandable 'Allow editing', fix #10438 2014-12-18 22:39:32 +01:00
Jan-Christoph Borchardt
5aae796d3d change 'update' to more understandable 'change', fix #10408 2014-12-18 22:35:34 +01:00
Jan-Christoph Borchardt
96ae18db59 get rid of unnecessary alt and title attributes 2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt
7e5fbde4cd add missing input labels for Share dialog 2014-12-18 15:37:46 +01:00
Vincent Petry
81e9d43e23 Move file thumbnail into the label element 2014-12-11 18:21:25 +01:00
Joas Schilling
539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users
Fix #10836
2014-12-09 11:32:39 +01:00
Arthur Schiwon
ee168a121d Forward port of #12493
add ldap-search command to occ

Conflicts:
	apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on
2014-12-04 19:02:09 +01:00
Craig Morrissey
446cebf492 adjust autocomplete behavior for sharing menu 2014-10-17 11:55:32 -04:00
Bjoern Schiessle
d18da08a1a set password field placeholder back if passward was disabled 2014-10-15 12:30:31 +02:00
Vincent Petry
ca6f296ae0 Prevent monkey clicking on labels
Clicking on labels while the spinner is there will not trigger the
hidden checkbox any more.
2014-09-26 17:07:14 +02:00
Lukas Reschke
08287e2880 Add ID to markup to have the checkboxes in the right position 2014-09-26 13:46:22 +02:00
Vincent Petry
16cad5862a Added spinners in share dropdown
Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password
2014-09-26 13:46:22 +02:00
kondou
2a4c51389c Use a route instead of s.php and convert tokens asap 2014-09-04 15:23:55 +02:00
kondou
0f2ad9862e Initial work on shorter links 2014-09-04 15:23:53 +02:00
Vincent Petry
98d06094e7 Fix share dropdown when links are not allowed
When links are not allowed, the email field does not exist and
autocomplete returns null. This causes Javascript errors.

The fix prevents entering the bogus block when links aren't allowed, as
it doesn't make sense to enter it in such cases anyway.
2014-08-21 13:49:02 +02:00
Vincent Petry
607ea636be Fixed folder icon update routine when share owner exists
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
2014-08-15 16:19:50 +02:00
Bjoern Schiessle
54b5cecfb8 remove 'no people found' entry 2014-08-11 16:03:47 +02:00
Bjoern Schiessle
55a17a2b23 set minDate always to today + one day 2014-08-08 11:09:41 +02:00
Bjoern Schiessle
41cca70a63 don't display share permission if resharing was disabled by the admin 2014-08-05 10:57:51 +02:00
Vincent Petry
4fea521102 Fix enforced share expiration date to be based on share time 2014-07-21 15:01:20 +02:00
Thomas Müller
7159d6118e reduce share action text to the user name only 2014-07-14 21:11:50 +02:00