summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* remove some more global variable $RUNTIME_NOAPPSThomas Müller2014-02-062-8/+1
* remove global variable $RUNTIME_NOAPPS - it's just superfluousThomas Müller2014-02-061-2/+1
* Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-042-12/+47
|\
| * Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-30102-518/+1141
| |\
| * | Separate PHP upload limit and free spacePellaeon Lin2013-12-082-12/+47
* | | Merge pull request #6081 from owncloud/partfilewebdavfixVincent Petry2014-02-041-1/+14
|\ \ \
| * | | Allow getting info or renaming part files through WebDAVVincent Petry2014-01-231-1/+14
* | | | Merge pull request #4795 from owncloud/setupMorris Jobke2014-02-043-26/+8
|\ \ \ \
| * | | | Remove unused functions from OC_HelperBart Visscher2014-01-311-23/+0
| * | | | Merge branch 'master' into setupBart Visscher2014-01-31280-3205/+6752
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'origin/master' into setupBart Visscher2013-10-02350-1308/+8644
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into setupBart Visscher2013-09-126-28/+38
| |\ \ \ \ \
| * | | | | | Check for failure in creating htaccessWorking testfileBart Visscher2013-09-101-4/+8
| * | | | | | Move core setup code to controller classBart Visscher2013-09-101-1/+2
* | | | | | | Merge pull request #6647 from owncloud/memcache-publicicewind19912014-02-047-28/+73
|\ \ \ \ \ \ \
| * | | | | | | Fix some phpdoc errors and rename interfaceRobin Appelman2014-01-243-5/+9
| * | | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-2214-18/+113
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-159-49/+56
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into memcache-publicRobin Appelman2014-01-0921-27/+171
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use $server->getMemCacheFactory() in ldap connectionRobin Appelman2014-01-091-0/+9
| * | | | | | | | | Also update the OCP\IServerContainerRobin Appelman2014-01-082-4/+4
| * | | | | | | | | get the memorycache factory from OCP\Server instead of a cache instanceRobin Appelman2014-01-082-6/+22
| * | | | | | | | | Remove the static dependency on OC_Util from MemcacheRobin Appelman2014-01-064-2/+23
| * | | | | | | | | Use APCIterator for Memcache\APC::clear()Robin Appelman2014-01-062-26/+8
| * | | | | | | | | expose memory cache in public apiRobin Appelman2014-01-061-0/+13
* | | | | | | | | | add test for password remove methodBjoern Schiessle2014-02-041-1/+1
* | | | | | | | | | Merge pull request #7013 from owncloud/dont_write_passwords_to_logBjörn Schießle2014-02-033-7/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | also load error handler if debugging is enabledBjoern Schiessle2014-02-032-4/+17
| * | | | | | | | | | remove passwords in URLs from all log messagesBjoern Schiessle2014-02-032-4/+12
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* / | | | | | | | | Mark an app as loaded before we start loading itRobin Appelman2014-01-311-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6903 from owncloud/fix-ms-office-iconsJan-Christoph Borchardt2014-01-292-62/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add icons for mdb and accdb files.Andreas Fischer2014-01-232-0/+3
| * | | | | | | | | Fix icons for xml,ppt,dot,dotx files.Andreas Fischer2014-01-232-0/+4
| * | | | | | | | | Remove duplicate mimetypes while keeping previous behaviour.Andreas Fischer2014-01-231-5/+0
| * | | | | | | | | Bring mimetype list into alphabetical order.Andreas Fischer2014-01-231-62/+61
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6907 from owncloud/webdav-logexceptionsThomas Müller2014-01-273-5/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added exception logger plugin for sabre connectorVincent Petry2014-01-273-5/+59
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6930 from jcfischer/masterMorris Jobke2014-01-271-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added function documentationJens-Christian Fischer2014-01-241-0/+4
| * | | | | | | | | Add 'mail_from_address' configurationJens-Christian Fischer2014-01-241-0/+1
* | | | | | | | | | Merge pull request #6933 from seberm/masterMorris Jobke2014-01-271-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add check for apc.enabled optionOtto Sabart2014-01-241-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #6912 from owncloud/replace-webroot-in-cssMorris Jobke2014-01-271-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | add icons.css file, first step to get rid of %webroot%Jan-Christoph Borchardt2014-01-231-0/+1
* | | | | | | | | | Merge pull request #6736 from owncloud/tests-jsunittestsThomas Müller2014-01-231-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Added Javascript unit testsVincent Petry2014-01-161-0/+1
* | | | | | | | | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-214-2/+28
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #6844 from owncloud/fix-css-loading-masterJörn Friedrich Dreyer2014-01-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Revert "use getAppWebPath() in here as well"Thomas Müller2014-01-201-1/+1
| * | | | | | | | | | Merge branch 'master' into fix-setupfs-only-for-existing-users-masterThomas Müller2014-01-211-1/+1
| |\ \ \ \ \ \ \ \ \ \