summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #8877 from owncloud/getpath-storage-checkThomas Müller2014-06-061-8/+12
|\
| * Update PHPDocThomas Müller2014-06-061-1/+1
| * Verify that we have a valid storage in View->getPathRobin Appelman2014-06-051-7/+11
* | Merge pull request #8911 from owncloud/common-langJan-Christoph Borchardt2014-06-061-1/+1
|\ \
| * | Add Turkish to common languagesVolkan Gezer2014-06-051-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-06823-11672/+11384
|/ /
* | Merge pull request #8483 from owncloud/encryption_use_oc_preferencesThomas Müller2014-06-0514-183/+318
|\ \
| * | adding unit tests for encryption data migrationThomas Müller2014-06-054-14/+224
| * | use oc_preferences instead of oc_encryption to store encyption settingsBjoern Schiessle2014-06-059-184/+69
| * | allow to set pre-condition for setValueBjoern Schiessle2014-06-053-31/+71
* | | Merge pull request #8865 from owncloud/improve_share_settingsVincent Petry2014-06-057-28/+38
|\ \ \ | |/ / |/| |
| * | unify share settingsBjoern Schiessle2014-06-056-18/+32
| * | This settings doesn't belong togetherBjoern Schiessle2014-06-052-11/+10
| * | improve share settings workingBjoern Schiessle2014-06-051-5/+2
| |/
* | Merge pull request #8893 from owncloud/feature/get-users-by-preferenceThomas Müller2014-06-052-0/+48
|\ \
| * | Sort the result before comparingJoas Schilling2014-06-051-1/+3
| * | Hack around oracle for CLOB fieldsJoas Schilling2014-06-051-1/+9
| * | Add method to get users by their preferenceJoas Schilling2014-06-052-0/+38
* | | Merge pull request #8902 from owncloud/fix_ldap_typo_2Thomas Müller2014-06-051-1/+1
|\ \ \
| * | | fix typo in var nameArthur Schiwon2014-06-051-1/+1
|/ / /
* | | Merge pull request #8891 from owncloud/design-emptycontentjbtbnl2014-06-051-2/+1
|\ \ \ | |_|/ |/| |
| * | fix size and unbold empty content messageJan-Christoph Borchardt2014-06-051-2/+1
* | | Merge pull request #8897 from owncloud/fix-multiselectJörn Friedrich Dreyer2014-06-051-1/+1
|\ \ \
| * | | fix files multiselect bar now that the app list is goneJan-Christoph Borchardt2014-06-051-1/+1
* | | | Merge pull request #8529 from owncloud/remove-legacy-routingThomas Müller2014-06-056-62/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Move authentication to it's own callLukas Reschke2014-06-053-3/+6