summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-masterThomas Müller2014-06-231-6/+11
|\
| * update PHPDoc $fileInfo is a SplFileInfoThomas Müller2014-06-231-1/+1
| * dir itself has to be removed as wellThomas Müller2014-06-231-0/+1
| * fix recursion on rmdirrThomas Müller2014-06-231-7/+11
* | Merge pull request #9159 from owncloud/enabledapp-cache-loggedinJoas Schilling2014-06-231-2/+7
|\ \
| * | Add commentRobin Appelman2014-06-231-0/+3
| * | Only cache enabled apps when logged inRobin Appelman2014-06-231-2/+4
| |/
* | Merge pull request #8974 from owncloud/router-preventloadappsonupgradeVincent Petry2014-06-232-2/+19
|\ \ | |/ |/|
| * Prevent loadApps on upgradeVincent Petry2014-06-182-2/+19
* | trusted domains shall not be ignored on autosetupArthur Schiwon2014-06-231-1/+7
* | Add explanation about the current implementation of updateAppBart Visscher2014-06-221-1/+5
|/
* Merge pull request #8399 from owncloud/server-server-sharingicewind19912014-06-1711-61/+115
|\
| * Fix moving movablemount over webdavRobin Appelman2014-06-171-7/+16
| * Also support removeable mounts with rmdirRobin Appelman2014-06-161-19/+28
| * Fix permission for movable storage rootRobin Appelman2014-06-161-5/+8
| * Fix storage being passed to cache/watcher and scanner when using storage wrap...Robin Appelman2014-06-144-19/+51
| * Fix check for shared files inside sharesRobin Appelman2014-06-141-3/+3
| * Fix exposing single files over webdavRobin Appelman2014-06-141-1/+1
| * Add server<->server sharing backendRobin Appelman2014-06-145-9/+10
* | Merge pull request #9065 from owncloud/migrator-keepprimaryindexnameVincent Petry2014-06-171-1/+7
|\ \
| * | Do not rename primary key index when renaming tableVincent Petry2014-06-171-1/+7
* | | We obviously have to pass the hostname as is when there is no ':' in the host...Andreas Fischer2014-06-171-1/+1
* | | add new keynote mimetypeJörn Friedrich Dreyer2014-06-161-0/+1
* | | Merge pull request #8808 from owncloud/update_shipped_apps_from_appstoreGeorg Ehrke2014-06-162-191/+405
|\ \ \ | |/ / |/| |
| * | disable code check for shipped appsGeorg Ehrke2014-06-161-1/+1
| * | don't skip code check for skipped appsGeorg Ehrke2014-06-131-1/+1
| * | skip certain tests for shipped appsGeorg Ehrke2014-06-131-6/+10
| * | don't show update button when appstore is disabled or no writable dir existsGeorg Ehrke2014-06-101-0/+15
| * | fix php doc blockGeorg Ehrke2014-06-101-0/+2
| * | always return a bool in OC_App::updateAppGeorg Ehrke2014-06-101-1/+1
| * | fix php doc blockGeorg Ehrke2014-06-101-3/+1
| * | remove unnecessary @returnGeorg Ehrke2014-06-101-1/+0
| * | some additional type checksGeorg Ehrke2014-06-062-3/+3
| * | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-06-0556-935/+1431
| |\ \
| * | | reenable checkCode()Thomas Müller2014-06-051-1/+0
| * | | add unit testGeorg Ehrke2014-06-041-16/+25
| * | | use isset() instead of array_key_exists()Georg Ehrke2014-06-031-1/+1
| * | | various fixes as requested by pr reviewersGeorg Ehrke2014-06-022-22/+18
| * | | read ocsid from shipped apps on installGeorg Ehrke2014-05-311-0/+3
| * | | add button for properly uninstalling appsGeorg Ehrke2014-05-312-11/+17
| * | | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-31136-1954/+2874
| |\ \ \
| * | | | make it possible to update shipped apps via the appstoreGeorg Ehrke2014-05-312-174/+358
* | | | | Merge pull request #8917 from owncloud/repair-routine-baseVincent Petry2014-06-163-43/+152
|\ \ \ \ \
| * | | | | Fixed instanceof to use interface instead of classVincent Petry2014-06-121-1/+2
| * | | | | Added RepairStep interface and default repair step listsVincent Petry2014-06-123-63/+131
| * | | | | Add support for repair step classesVincent Petry2014-06-121-3/+43
* | | | | | Merge pull request #9022 from owncloud/speedup-nested-ldap-groupsmacjohnny2014-06-162-6/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | drastic speedup for nested ldap groupsmacjohnny2014-06-132-6/+13
* | | | | | Merge pull request #8978 from owncloud/movie_preview_improvementsMorris Jobke2014-06-141-8/+17
|\ \ \ \ \ \
| * | | | | | movie previews: use file directly when it's stored locally and encryption is ...Georg Ehrke2014-06-101-8/+17