Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add "Reply-To" support to sharing mails and refactor code | Lukas Reschke | 2015-04-10 | 1 | -2/+16 |
| | |||||
* | Merge pull request #15182 from rullzer/fix-8231 | Thomas Müller | 2015-04-10 | 1 | -0/+17 |
|\ | | | | | ajax/share.php should return correct list of suggestions | ||||
| * | Make sure we do not return people that we already shared with | Roeland Jago Douma | 2015-03-25 | 1 | -0/+17 |
| | | | | | | | | | | We should use the provided list of users and groups that we already shared with to filter suggestions. | ||||
* | | Merge pull request #15169 from rullzer/fix_displayNamesInGroup | Morris Jobke | 2015-03-30 | 1 | -1/+1 |
|\ \ | | | | | | | Groupmanagers displayNamesInGroup should actually search in displaynames | ||||
| * | | Call the proper function | Roeland Jago Douma | 2015-03-24 | 1 | -1/+1 |
| |/ | | | | | | | * Fix for #6967 | ||||
* / | Update license headers | Jenkins for ownCloud | 2015-03-26 | 1 | -18/+32 |
|/ | |||||
* | Revert "Updating license headers" | Morris Jobke | 2015-02-26 | 1 | -33/+19 |
| | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36. | ||||
* | Updating license headers | Jenkins for ownCloud | 2015-02-23 | 1 | -19/+33 |
| | |||||
* | Manually type-case all AJAX files | Lukas Reschke | 2015-02-13 | 1 | -38/+38 |
| | | | | | | This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support :see_no_evil: Fixes https://github.com/owncloud/core/issues/14196 for core | ||||
* | kill ancient code | Morris Jobke | 2015-01-20 | 1 | -17/+0 |
| | |||||
* | shareType and permissions are integers | Bjoern Schiessle | 2015-01-07 | 1 | -2/+2 |
| | |||||
* | Next step in server-to-server sharing next generation, see #12285 | Bjoern Schiessle | 2014-12-19 | 1 | -1/+16 |
| | | | | | | | | | | | | | | 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. | ||||
* | Merge pull request #9512 from libasys/patch-2 | Lukas Reschke | 2014-09-09 | 1 | -1/+2 |
|\ | | | | | Fix use Sharing Api with calendar | ||||
| * | Fix use Sharing Api with calendar | libasys | 2014-07-08 | 1 | -2/+3 |
| | | | | | | | | | | Without this fix it logs this error: Undefined index: itemSourceName at /opt/local/apache2/htdocs/oc7/core/ajax/share.php#44 I think the itemSourceName is only used with sharing files! | ||||
* | | Use public api for getting l10n | Robin Appelman | 2014-08-31 | 1 | -3/+3 |
| | | |||||
* | | we need the recipient as a additional parameter to know for which share the ↵ | Bjoern Schiessle | 2014-08-13 | 1 | -2/+2 |
| | | | | | | | | notification was send | ||||
* | | in case $_POST['itemSourceName'] does not exist we simply default it to null | Thomas Müller | 2014-08-01 | 1 | -1/+2 |
| | | |||||
* | | add OCS api call to set expire date for link shares | Bjoern Schiessle | 2014-07-25 | 1 | -11/+5 |
|/ | |||||
* | set minDate and maxDate in datepicker | Bjoern Schiessle | 2014-06-06 | 1 | -0/+2 |
| | |||||
* | unify share settings | Bjoern Schiessle | 2014-06-05 | 1 | -3/+3 |
| | |||||
* | Automatically copy the share expiration date when new shares are created | Joas Schilling | 2014-05-19 | 1 | -1/+2 |
| | | | | Fix #4823 | ||||
* | Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master | Thomas Müller | 2014-04-11 | 1 | -0/+28 |
|\ | | | | | introduce auto completion on share email - integrated with the contactsm... | ||||
| * | Fix copy/paste error :P | Thomas Tanghus | 2014-03-25 | 1 | -1/+1 |
| | | |||||
| * | 'ID' => 'id' and check existence of EMAIL | Thomas Tanghus | 2014-03-25 | 1 | -1/+5 |
| | | |||||
| * | introduce auto completion on share email - integrated with the ↵ | Thomas Müller | 2013-11-14 | 1 | -0/+24 |
| | | | | | | | | contactsmanager api | ||||
* | | killing some more calls to OC_App::loadApps(); - because we load all apps in ↵ | Thomas Müller | 2014-03-25 | 1 | -1/+0 |
| | | | | | | | | handleRequest() | ||||
* | | Merge pull request #7557 from owncloud/issue/7297 | Vincent Petry | 2014-03-19 | 1 | -0/+8 |
|\ \ | | | | | | | Do not allow setting an expiration date in the past | ||||
| * | | Do not allow setting an expiration date in the past | Joas Schilling | 2014-03-05 | 1 | -0/+8 |
| | | | | | | | | | | | | Fix #7297 | ||||
* | | | send an individual email to each recipient | Thomas Müller | 2014-03-10 | 1 | -2/+9 |
|/ / | |||||
* | | clean up the sharing ajax calls, add mail notification class | Bjoern Schiessle | 2014-02-19 | 1 | -99/+13 |
| | | |||||
* | | fix DI | Arthur Schiwon | 2014-02-11 | 1 | -1/+2 |
| | | |||||
* | | move sorter into a class | Arthur Schiwon | 2014-02-11 | 1 | -24/+3 |
| | | |||||
* | | respect coding guidelines | Arthur Schiwon | 2014-02-11 | 1 | -1/+1 |
| | | |||||
* | | on filtering the share box users and groups whose name begins with the ↵ | Arthur Schiwon | 2014-02-11 | 1 | -0/+24 |
| | | | | | | | | search term shall appear on top, fixes #6430 | ||||
* | | use localised date in notification mails | Bjoern Schiessle | 2014-01-27 | 1 | -5/+4 |
| | | |||||
* | | add expire date to link share if possible | Bjoern Schiessle | 2014-01-24 | 1 | -2/+19 |
|/ | |||||
* | pass the name of the item source from the browser to the server - no need to ↵ | Thomas Müller | 2013-10-23 | 1 | -1/+2 |
| | | | | get the data via complicated db queries | ||||
* | Merge pull request #5446 from frisco82/fixNotifyUser | Frank Karlitschek | 2013-10-21 | 1 | -1/+1 |
|\ | | | | | Fix notify user checkbox | ||||
| * | fix notify user, and made js more resiliant to changes | Ramiro Aparicio | 2013-10-21 | 1 | -1/+1 |
| | | |||||
* | | fix user displayName not being shown after add, added class for improved ↵ | Ramiro Aparicio | 2013-10-21 | 1 | -3/+4 |
|/ | | | | styling, fix strong for groups when english is not being used | ||||
* | find users which are in the same group | Bjoern Schiessle | 2013-10-08 | 1 | -1/+1 |
| | |||||
* | Fixed array syntax to work with PHP 5.3 | Vincent Petry | 2013-10-04 | 1 | -1/+1 |
| | | | | | | It seems that array brackets are only supported starting with PHP 5.4. Fixed the array brackets to be compatible and not cause a syntax error in PHP 5.3. | ||||
* | fix array_diff call | Bjoern Schiessle | 2013-10-04 | 1 | -1/+1 |
| | |||||
* | fix mail subject; don't show time for expire date | Bjoern Schiessle | 2013-09-30 | 1 | -2/+3 |
| | |||||
* | use template for txt and html mails to send notification mails | Bjoern Schiessle | 2013-09-25 | 1 | -19/+22 |
| | |||||
* | coding-style fixes | Bjoern Schiessle | 2013-09-03 | 1 | -2/+14 |
| | |||||
* | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-02 | 1 | -6/+5 |
|\ | | | | | | | | | Conflicts: lib/util.php | ||||
| * | Use Group methods for searching, fixes #4201 | Arthur Schiwon | 2013-08-30 | 1 | -6/+5 |
| | | |||||
* | | add expiration date if it is already set | Bjoern Schiessle | 2013-08-30 | 1 | -2/+6 |
| | | |||||
* | | don't send mail to the user who shared the file | Bjoern Schiessle | 2013-08-30 | 1 | -0/+3 |
| | |