summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8895 from owncloud/mimetype_fixesThomas Müller2014-06-063-3/+78
|\
| * increase version number of files and migration triggerJörn Friedrich Dreyer2014-06-062-2/+2
| * add more and fix office mimetypes, migrate wrong mimetypesJörn Friedrich Dreyer2014-06-062-2/+77
|/
* Merge pull request #8666 from owncloud/mount-removeicewind19912014-06-0630-377/+1185
|\
| * Dont connect hooks twiceRobin Appelman2014-06-061-0/+6
| * check if permissions existsBjoern Schiessle2014-06-061-1/+5
| * Limit permissions to share permissionsRobin Appelman2014-06-061-0/+3
| * make sure that we only delete shares for the current userBjoern Schiessle2014-06-061-3/+8
| * only unshare user share if it was shared with the current userBjoern Schiessle2014-06-061-1/+2
| * make sure that we remove all shares refering to the same parentBjoern Schiessle2014-06-061-21/+0
| * fix unshareFromSelf()Bjoern Schiessle2014-06-063-32/+115
| * update unit tests and make sure that we return the right permissions for file...Bjoern Schiessle2014-06-061-0/+5
| * the mount point always have delete permissions to allow unmountBjoern Schiessle2014-06-061-2/+2
| * add some testsBjoern Schiessle2014-06-061-1/+59
| * nake sure ti create new db entry when user renames a group shareBjoern Schiessle2014-06-061-1/+1
| * Fix unit testRobin Appelman2014-06-061-1/+1
| * Fix unit testsRobin Appelman2014-06-061-1/+1
| * fix db queryBjoern Schiessle2014-06-061-1/+1
| * Movable storage root can always be moved and deletedRobin Appelman2014-06-061-1/+1
| * use triple equalsRobin Appelman2014-06-061-1/+1
| * Fix phpdoc and commentsRobin Appelman2014-06-064-3/+5
| * update share API tests, file shares never have delete permissionsBjoern Schiessle2014-06-061-4/+6
| * make sure that we have a path relative to data/user/files to work withBjoern Schiessle2014-06-061-2/+3
| * update mount point if file_target changedBjoern Schiessle2014-06-061-2/+5
| * add additional unit testsBjoern Schiessle2014-06-062-3/+144
| * remove unused variableBjoern Schiessle2014-06-061-1/+1
| * get unique_name value directly from the share arrayBjoern Schiessle2014-06-061-1/+1
| * fix mount point move up if the parent no longer existsBjoern Schiessle2014-06-062-80/+61
| * allow moving files to the rootBjoern Schiessle2014-06-061-4/+0
| * bring back updateFileTarget() got lost during last rebaseBjoern Schiessle2014-06-061-0/+31
| * remove encryption keys if user unshares a fileBjoern Schiessle2014-06-064-4/+72
| * remove share mountBjoern Schiessle2014-06-061-1/+4
| * Fix folder name for storage rootRobin Appelman2014-06-062-2/+2
| * don't allow to share single files with delete permissions, user should only b...Bjoern Schiessle2014-06-068-130/+413
| * Fix the removeMount for personal mountsRobin Appelman2014-06-062-1/+4
| * Add the removing logic for mountsRobin Appelman2014-06-061-5/+9
| * Move shared mount moving from the storage to the mountRobin Appelman2014-06-062-122/+157
| * Make personal external mount points (re)movable from the files appRobin Appelman2014-06-062-1/+72
| * Don't do rename hooks for cache when moving the mountpointRobin Appelman2014-06-061-0/+4
| * Add a system for (re)movable mount pointsRobin Appelman2014-06-064-28/+64
* | Merge pull request #8900 from guruz/webdav_permission_moveable_renameableVincent Petry2014-06-061-1/+1
|\ \
| * | WebDAV Permissions: Distinguish between renameing and movingMarkus Goetz2014-06-051-1/+1
* | | Merge pull request #8905 from owncloud/update-cli-skipcheckmigrateVincent Petry2014-06-062-20/+93
|\ \ \
| * | | Added CLI arguments for upgrade simulation stepsVincent Petry2014-06-062-20/+93
* | | | Merge pull request #8159 from owncloud/mobile-sidebar-swipeThomas Müller2014-06-0614-20/+778
|\ \ \ \
| * | | | Fixed viewer mode for sidebar swipeVincent Petry2014-06-062-2/+8
| * | | | Fixed Snap mockVincent Petry2014-06-061-5/+10
| * | | | Added debounce on resizeVincent Petry2014-06-061-1/+1
| * | | | prevent scrollbar when sidebar is openJan-Christoph Borchardt2014-06-061-1/+6
| * | | | Disable snapper on bigger screens and on public/login pageMorris Jobke2014-06-061-33/+52