summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Revert using item name, no longer allowing the same item source exist for a userMichael Gapczynski2012-08-222-23/+32
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-08-221-8/+8
|
* Fix share ajax calls to use itemName/itemSource, show who shared a file with youMichael Gapczynski2012-08-202-38/+52
|
* Remove setTarget from ajaxMichael Gapczynski2012-08-201-6/+0
|
* Merge branch 'share_api'Michael Gapczynski2012-08-192-0/+547
|\ | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php
| * Refactor again so we can tell what item is being reshared in case the same ↵Michael Gapczynski2012-08-191-1/+1
| | | | | | | | source shows up. This is the end of the share_api branch, moving to master.
| * File sharing cleanup, works perfectly I think :)Michael Gapczynski2012-08-161-1/+0
| |
| * Merge branch 'master' into share_apiMichael Gapczynski2012-08-147-84/+129
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php
| * | Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a ↵Michael Gapczynski2012-08-121-1/+1
| | | | | | | | | | | | constructor...
| * | Merge branch 'master' into share_apiMichael Gapczynski2012-08-091-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php
| * | | Fix issues with hiding and showing dropdownMichael Gapczynski2012-08-081-14/+33
| | | |
| * | | Reset item shares variable, fixes autocomplete not showing peopleMichael Gapczynski2012-08-081-1/+2
| | | |
| * | | Actually change background image of shared itemsMichael Gapczynski2012-08-071-2/+3
| | | |
| * | | Fix warnings and better stylingBart Visscher2012-08-071-2/+10
| | | |
| * | | Don't return error when just no sharing foundBart Visscher2012-08-071-1/+1
| | | |
| * | | Try to fix last commitMichael Gapczynski2012-08-071-3/+3
| | | |
| * | | Check if itemShares share type is an array instead of set, javascript likes ↵Michael Gapczynski2012-08-071-3/+3
| | | | | | | | | | | | | | | | to set indexes to 'undefined'
| * | | Only show the user's groups in the share with autocompleteMichael Gapczynski2012-08-061-9/+6
| | | |
| * | | Somewhat fixes dropdown display issues in the contacts appMichael Gapczynski2012-08-061-1/+1
| | | |
| * | | Remove person from array after unshare, so name appears in autocomplete againMichael Gapczynski2012-08-061-1/+5
| | | |
| * | | Merge branch 'master' into share_apiMichael Gapczynski2012-08-0650-130/+796
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php
| * | | | Don't load item if it doesn't have it status setMichael Gapczynski2012-08-061-2/+2
| | | | |
| * | | | Lots of refactoring to share APIMichael Gapczynski2012-08-061-12/+13
| | | | |
| * | | | Hide 'can edit' if not checkedMichael Gapczynski2012-08-011-1/+6
| | | | |
| * | | | Throw exceptions in share API for UI to displayMichael Gapczynski2012-08-012-4/+8
| | | | |
| * | | | Basic setup for sharing with contactsMichael Gapczynski2012-08-011-1/+1
| | | | |
| * | | | Prevent up and down arrow from changing the share with input valueMichael Gapczynski2012-07-311-1/+5
| | | | |
| * | | | Include contacts in share with searchMichael Gapczynski2012-07-311-1/+13
| | | | |
| * | | | Merge branch 'master' into share_apiMichael Gapczynski2012-07-319-99/+151
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js
| * | | | | Give share with search focus when sharing dropdown appearsMichael Gapczynski2012-07-311-1/+2
| | | | | |
| * | | | | Don't show self or already shared with users and groups in the share with searchMichael Gapczynski2012-07-312-8/+36
| | | | | |
| * | | | | Add suggestion to share with search for sharing via emailMichael Gapczynski2012-07-311-3/+9
| | | | | |
| * | | | | Use search and limit parameters for share with search in sharing dropdownMichael Gapczynski2012-07-301-2/+2
| | | | | |
| * | | | | Autocomplete for share with search in sharing dropdownMichael Gapczynski2012-07-302-16/+44
| | | | | |
| * | | | | Add support for configuring which permissions are possible for itemsMichael Gapczynski2012-07-271-11/+23
| | | | | |
| * | | | | Implement CRUDS in share dropdown, and some clean-upMichael Gapczynski2012-07-261-24/+79
| | | | | |
| * | | | | Merge branch 'master' into share_apiMichael Gapczynski2012-07-255-1/+35
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php
| * | | | | | Make file actions permissions awareMichael Gapczynski2012-07-251-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into share_apiMichael Gapczynski2012-07-1110-18/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php
| * | | | | | | Sanitization isn't required hereMichael Gapczynski2012-07-111-19/+6
| | | | | | | |
| * | | | | | | Show private link in dropdownMichael Gapczynski2012-07-111-1/+5
| | | | | | | |
| * | | | | | | Generate random token for private links (more entropy than past private links)Michael Gapczynski2012-07-111-2/+3
| | | | | | | |
| * | | | | | | Get rid of sneaky error_log() that got left behindMichael Gapczynski2012-07-101-1/+0
| | | | | | | |
| * | | | | | | Sanitize POST and GET in ajax/shareMichael Gapczynski2012-07-101-14/+38
| | | | | | | |
| * | | | | | | Sharing files working using share APIMichael Gapczynski2012-07-101-7/+11
| | | | | | | |
| * | | | | | | Add parameter to showDropDown to not show private link UI, only files can be ↵Michael Gapczynski2012-07-031-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared as private links
| * | | | | | | Add share with to list in dropdown after sharingMichael Gapczynski2012-07-031-1/+5
| | | | | | | |
| * | | | | | | Clean up in the dropdown for unsharingMichael Gapczynski2012-07-032-71/+28
| | | | | | | |
| * | | | | | | Remove the method getItemsSharedStatuses, it is easy enough to just pass the ↵Michael Gapczynski2012-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format instead
| * | | | | | | Fix fetching item type from share class element, comment out the auto hider ↵Michael Gapczynski2012-06-301-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for now since it doesn't work outside of the Files app