Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge public link icon check | Michael Gapczynski | 2011-08-18 | 1 | -14/+5 |
| | |||||
* | make entries in settings navigation translatable | Robin Appelman | 2011-08-18 | 1 | -0/+9 |
| | |||||
* | Swedish translation, thanks to HakanS | Jan-Christoph Borchardt | 2011-08-18 | 9 | -0/+403 |
| | |||||
* | still show the icon on row hover so the file type is still visible | Jan-Christoph Borchardt | 2011-08-18 | 1 | -2/+1 |
| | |||||
* | updated translations | Jan-Christoph Borchardt | 2011-08-18 | 86 | -436/+3051 |
| | |||||
* | Comment rename() and prevent trying to move items if the user doesn't have ↵ | Michael Gapczynski | 2011-08-17 | 1 | -0/+6 |
| | | | | write permission | ||||
* | Bug fixes for mkdir(), renaming/moving support for files inside a shared ↵ | Michael Gapczynski | 2011-08-17 | 1 | -8/+10 |
| | | | | folder with write permission | ||||
* | -1 is now a class constant (UNSHARED), for unsharing files from self | Michael Gapczynski | 2011-08-17 | 2 | -2/+3 |
| | |||||
* | Remove navigation entry for shared files | Michael Gapczynski | 2011-08-17 | 1 | -6/+1 |
| | |||||
* | New system of unsharing files from self, and a small bug fix when all files ↵ | Michael Gapczynski | 2011-08-17 | 2 | -13/+22 |
| | | | | inside a shared folder are unshared from self | ||||
* | Fix my last commit 9ee4fc | Michael Gapczynski | 2011-08-17 | 1 | -2/+4 |
| | |||||
* | Only show 'Shared' directory if files are shared with you | Michael Gapczynski | 2011-08-17 | 1 | -1/+3 |
| | |||||
* | Fix bug in getPermissions() and clean-up unlink() and rename() | Michael Gapczynski | 2011-08-17 | 2 | -39/+29 |
| | |||||
* | Merge branch 'sharing' | Jan-Christoph Borchardt | 2011-08-17 | 23 | -5/+1877 |
|\ | |||||
| * | Functions to get the token of a public link now stored by OC_Share, remove ↵ | Michael Gapczynski | 2011-08-16 | 3 | -10/+33 |
| | | | | | | | | no longer needed ajax call to getlink.php | ||||
| * | Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing | Michael Gapczynski | 2011-08-16 | 2 | -2/+2 |
| |\ | |||||
| | * | fix problem with building the IN query | Robin Appelman | 2011-08-17 | 1 | -1/+1 |
| | | | |||||
| | * | fix default file actions not working | Robin Appelman | 2011-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | Initial merging of files_sharing and files_publiclink | Michael Gapczynski | 2011-08-16 | 2 | -49/+64 |
| |/ | |||||
| * | hiding public links from navigation now that it's easier to use in the dropdown | Jan-Christoph Borchardt | 2011-08-16 | 1 | -1/+1 |
| | | |||||
| * | Display public icon next to publicly shared files | Michael Gapczynski | 2011-08-16 | 1 | -0/+14 |
| | | |||||
| * | Public link folder uploading not implemented, comment out checkbox for it in ↵ | Michael Gapczynski | 2011-08-16 | 1 | -1/+1 |
| | | | | | | | | dropdown | ||||
| * | This should actually make the 'Shared' directory automatically everytime | Michael Gapczynski | 2011-08-15 | 2 | -1/+2 |
| | | |||||
| * | Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' ↵ | Michael Gapczynski | 2011-08-15 | 3 | -21/+27 |
| | | | | | | | | directory | ||||
| * | Merge branch 'master' into sharing | Michael Gapczynski | 2011-08-15 | 37 | -307/+1126 |
| |\ | |||||
| * \ | Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing | Michael Gapczynski | 2011-08-15 | 138 | -2935/+2054 |
| |\ \ | |||||
| | * \ | resolved merge conflict | Jan-Christoph Borchardt | 2011-08-14 | 138 | -2935/+2054 |
| | |\ \ | |||||
| * | | | | Additional user group sharing support and more clean-up in the constructor | Michael Gapczynski | 2011-08-15 | 2 | -46/+59 |
| |/ / / | |||||
| * | | | Refactor getUserAndGroups() for new user group sharing standard - user@group | Michael Gapczynski | 2011-08-14 | 1 | -15/+15 |
| | | | | |||||
| * | | | Change OC_GROUP to OC_Group | Michael Gapczynski | 2011-08-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into sharing | Michael Gapczynski | 2011-08-12 | 36 | -198/+964 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: files/css/files.css | ||||
| * | | | | Add missing parameter to usersInGroup() | Michael Gapczynski | 2011-08-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | OC_Share constructor refactored for user group sharing | Michael Gapczynski | 2011-08-12 | 2 | -28/+52 |
| | | | | | |||||
| * | | | | Clean up constructor for OC_Share, add some error handling for sharing files | Michael Gapczynski | 2011-08-12 | 3 | -36/+44 |
| | | | | | |||||
| * | | | | Change the share file action icon if the file is already shared with someone | Michael Gapczynski | 2011-08-12 | 2 | -4/+22 |
| | | | | | |||||
| * | | | | Merge branch 'master' into sharing | Michael Gapczynski | 2011-08-11 | 20 | -66/+1796 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into sharing | Michael Gapczynski | 2011-08-11 | 75 | -110/+21434 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore | ||||
| * | | | | | | Remove hardcoded http:// when generating public links | Michael Gapczynski | 2011-08-11 | 1 | -9/+10 |
| | | | | | | | |||||
| * | | | | | | Make unshare work from dropdown | Michael Gapczynski | 2011-08-11 | 3 | -9/+11 |
| | | | | | | | |||||
| * | | | | | | Fix some areas on dropdown triggering the dropdown to hide | Michael Gapczynski | 2011-08-11 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Hide the dropdown if you click the share file action button | Michael Gapczynski | 2011-08-11 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Don't spawn a new dropdown if there is already one open | Michael Gapczynski | 2011-08-11 | 1 | -13/+11 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing | Michael Gapczynski | 2011-08-11 | 42 | -383/+638 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/js/share.js | ||||
| | * | | | | | | changed quotes | Jan-Christoph Borchardt | 2011-08-11 | 1 | -12/+12 |
| | | | | | | | | |||||
| | * | | | | | | only load share action when in file browser | Jan-Christoph Borchardt | 2011-08-11 | 1 | -3/+5 |
| | | | | | | | | |||||
| | * | | | | | | merged master into sharing | Jan-Christoph Borchardt | 2011-08-11 | 40 | -366/+608 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | Refactoring in dropdown javascript | Michael Gapczynski | 2011-08-11 | 1 | -62/+53 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' into sharing | Michael Gapczynski | 2011-08-10 | 90 | -1275/+876 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: files/templates/index.php | ||||
| * | | | | | | | | Fix shared list for files inside of shared folders | Michael Gapczynski | 2011-08-10 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Only show can edit (if not checked) and unshare button on hover | Michael Gapczynski | 2011-08-09 | 2 | -10/+32 |
| | | | | | | | | |