summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4553 from owncloud/update_search_classesVincent Petry2014-06-0622-134/+687
|\
| * allow apps to add translation for search result typeidJörn Friedrich Dreyer2014-06-062-1/+8
| * use non static access to searchJörn Friedrich Dreyer2014-06-062-2/+2
| * fix namespace for legacy search classesJörn Friedrich Dreyer2014-06-062-2/+2
| * make search non-static, add ISearch to server container, make legacy a static...Jörn Friedrich Dreyer2014-06-069-31/+146
| * minor phpdoc cleanup and importsJörn Friedrich Dreyer2014-06-056-13/+14
| * Simplify client-side result customizationAndrew Brown2014-06-051-28/+9
| * Move new search results to 'lib/private/search'Andrew Brown2014-06-055-1/+1
| * Move legacy search to 'lib/private/legacy'Andrew Brown2014-06-055-68/+29
| * Re-add type to legacy OC_Search_Result classAndrew Brown2014-06-051-1/+14
| * use path param to create scrollto urlJörn Friedrich Dreyer2014-06-051-11/+16
| * decode filename for scrolltoJörn Friedrich Dreyer2014-06-051-1/+1
| * fix minor typosJörn Friedrich Dreyer2014-06-051-0/+25
| * Add audio and image result typesAndrew Brown2014-06-051-2/+2
| * Add audio and image result typesAndrew Brown2014-06-053-1/+81
| * fix formattingJörn Friedrich Dreyer2014-06-0510-191/+200
| * Add legacy adapters for file searchAndrew Brown2014-06-054-0/+133
| * Move to new namespace convention and add new result sub-classingAndrew Brown2014-06-056-100/+323
* | 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