summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix bug in getPermissions() and clean-up unlink() and rename()Michael Gapczynski2011-08-172-39/+29
* Merge branch 'sharing'Jan-Christoph Borchardt2011-08-1723-5/+1877
|\
| * Functions to get the token of a public link now stored by OC_Share, remove no...Michael Gapczynski2011-08-163-10/+33
| * Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharingMichael Gapczynski2011-08-162-2/+2
| |\
| | * fix problem with building the IN queryRobin Appelman2011-08-171-1/+1
| | * fix default file actions not workingRobin Appelman2011-08-171-1/+1
| * | Initial merging of files_sharing and files_publiclinkMichael Gapczynski2011-08-162-49/+64
| |/
| * hiding public links from navigation now that it's easier to use in the dropdownJan-Christoph Borchardt2011-08-161-1/+1
| * Display public icon next to publicly shared filesMichael Gapczynski2011-08-161-0/+14
| * Public link folder uploading not implemented, comment out checkbox for it in ...Michael Gapczynski2011-08-161-1/+1
| * This should actually make the 'Shared' directory automatically everytimeMichael Gapczynski2011-08-152-1/+2
| * Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' dir...Michael Gapczynski2011-08-153-21/+27
| * Merge branch 'master' into sharingMichael Gapczynski2011-08-1537-307/+1126
| |\
| * \ Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharingMichael Gapczynski2011-08-15138-2935/+2054
| |\ \
| | * \ resolved merge conflictJan-Christoph Borchardt2011-08-14138-2935/+2054
| | |\ \
| * | | | Additional user group sharing support and more clean-up in the constructorMichael Gapczynski2011-08-152-46/+59
| |/ / /
| * | | Refactor getUserAndGroups() for new user group sharing standard - user@groupMichael Gapczynski2011-08-141-15/+15
| * | | Change OC_GROUP to OC_GroupMichael Gapczynski2011-08-141-1/+1
| * | | Merge branch 'master' into sharingMichael Gapczynski2011-08-1236-198/+964
| |\ \ \
| * | | | Add missing parameter to usersInGroup()Michael Gapczynski2011-08-121-1/+1
| * | | | OC_Share constructor refactored for user group sharingMichael Gapczynski2011-08-122-28/+52
| * | | | Clean up constructor for OC_Share, add some error handling for sharing filesMichael Gapczynski2011-08-123-36/+44
| * | | | Change the share file action icon if the file is already shared with someoneMichael Gapczynski2011-08-122-4/+22
| * | | | Merge branch 'master' into sharingMichael Gapczynski2011-08-1120-66/+1796
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sharingMichael Gapczynski2011-08-1175-110/+21434
| |\ \ \ \ \
| * | | | | | Remove hardcoded http:// when generating public linksMichael Gapczynski2011-08-111-9/+10
| * | | | | | Make unshare work from dropdownMichael Gapczynski2011-08-113-9/+11
| * | | | | | Fix some areas on dropdown triggering the dropdown to hideMichael Gapczynski2011-08-111-3/+3
| * | | | | | Hide the dropdown if you click the share file action buttonMichael Gapczynski2011-08-111-1/+5
| * | | | | | Don't spawn a new dropdown if there is already one openMichael Gapczynski2011-08-111-13/+11
| * | | | | | Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharingMichael Gapczynski2011-08-1142-383/+638
| |\ \ \ \ \ \
| | * | | | | | changed quotesJan-Christoph Borchardt2011-08-111-12/+12
| | * | | | | | only load share action when in file browserJan-Christoph Borchardt2011-08-111-3/+5
| | * | | | | | merged master into sharingJan-Christoph Borchardt2011-08-1140-366/+608
| | |\ \ \ \ \ \
| * | | | | | | | Refactoring in dropdown javascriptMichael Gapczynski2011-08-111-62/+53
| |/ / / / / / /
| * | | | | | | Merge branch 'master' into sharingMichael Gapczynski2011-08-1090-1275/+876
| |\ \ \ \ \ \ \
| * | | | | | | | Fix shared list for files inside of shared foldersMichael Gapczynski2011-08-101-2/+1
| * | | | | | | | Only show can edit (if not checked) and unshare button on hoverMichael Gapczynski2011-08-092-10/+32
| * | | | | | | | Remove users and groups from the select form that have already been shared withMichael Gapczynski2011-08-091-0/+2
| * | | | | | | | No more subnavigation entries, fixing 'Shared'Michael Gapczynski2011-08-091-2/+2
| * | | | | | | | Merge branch 'master' into sharingMichael Gapczynski2011-08-0994-1516/+2274
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Actually add the chosen pluginMichael Gapczynski2011-08-094-0/+1136
| * | | | | | | | | Use chosen select form for selecting users in sharing drop downMichael Gapczynski2011-08-094-21/+35
| * | | | | | | | | Show which parent folder is shared with the user in the sharing drop downMichael Gapczynski2011-08-082-8/+7
| * | | | | | | | | Merge branch 'master' into sharingJan-Christoph Borchardt2011-08-084-33/+16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sharingJan-Christoph Borchardt2011-08-0823-292/+265
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sharingMichael Gapczynski2011-08-07353-472/+9074
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Sharing dropdown changes: show users that have a parent folder shared with th...Michael Gapczynski2011-08-074-23/+78
| * | | | | | | | | | | | Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharingMichael Gapczynski2011-08-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Revert "widen upload and new folder so that upload button text does not overf...Jan-Christoph Borchardt2011-08-041-4/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 10:12:31 +0000