summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4553 from owncloud/update_search_classesVincent Petry2014-06-0617-122/+657
|\
| * 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
| * 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
| * 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
* | add more and fix office mimetypes, migrate wrong mimetypesJörn Friedrich Dreyer2014-06-061-2/+20
* | Merge pull request #8666 from owncloud/mount-removeicewind19912014-06-0610-82/+145
|\ \
| * | Dont connect hooks twiceRobin Appelman2014-06-061-0/+6
| * | 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-061-23/+38
| * | 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-061-0/+1
| * | allow moving files to the rootBjoern Schiessle2014-06-061-4/+0
| * | remove encryption keys if user unshares a fileBjoern Schiessle2014-06-061-1/+12
| * | Fix folder name for storage rootRobin Appelman2014-06-061-1/+1
| * | don't allow to share single files with delete permissions, user should only b...Bjoern Schiessle2014-06-061-0/+5
| * | Add the removing logic for mountsRobin Appelman2014-06-061-5/+9
| * | 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-061-17/+51
|\ \ \ \
| * | | | Added CLI arguments for upgrade simulation stepsVincent Petry2014-06-061-17/+51
* | | | | Merge pull request #8159 from owncloud/mobile-sidebar-swipeThomas Müller2014-06-061-0/+1
|\ \ \ \ \
| * | | | | add snap.js scriptJan-Christoph Borchardt2014-06-051-0/+1
* | | | | | Merge pull request #8783 from owncloud/remove-serializersThomas Müller2014-06-062-47/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | remove controller serializersBernhard Posselt2014-06-052-47/+3
* | | | | | Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-masterThomas Müller2014-06-061-0/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | use system function to recursive remove the directory used by temporary storageThomas Müller2014-06-061-0/+4
| | |_|_|/ | |/| | |
* | | | | 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
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0612-11/+23
| |/ / / / |/| | | |
* | | | | Merge pull request #8483 from owncloud/encryption_use_oc_preferencesThomas Müller2014-06-052-18/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | allow to set pre-condition for setValueBjoern Schiessle2014-06-052-18/+30
* | | | | Merge pull request #8865 from owncloud/improve_share_settingsVincent Petry2014-06-052-5/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | unify share settingsBjoern Schiessle2014-06-052-5/+22
| |/ / /
* | | | Merge pull request #8893 from owncloud/feature/get-users-by-preferenceThomas Müller2014-06-051-0/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Hack around oracle for CLOB fieldsJoas Schilling2014-06-051-1/+9
| * | | Add method to get users by their preferenceJoas Schilling2014-06-051-0/+22