summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into migration_unit_testsBart Visscher2014-02-1057-257/+705
|\
| * Merge pull request #6881 from owncloud/remove-user-storage-entryVincent Petry2014-02-102-0/+22
| |\
| | * Merge branch 'master' into remove-user-storage-entryRobin Appelman2014-02-1030-161/+335
| | |\
| | * | Also clean up the filecache table when deleting a storage entryRobin Appelman2014-02-031-0/+6
| | * | Revert "Use Cache->clear to cleanup the filecache for removed users"Robin Appelman2014-02-031-10/+5
| | * | Use Cache->clear to cleanup the filecache for removed usersRobin Appelman2014-01-221-5/+10
| | * | Also remove the user's home storage from the storage table when deleting a userRobin Appelman2014-01-212-0/+16
| * | | Merge pull request #6988 from owncloud/oc_api_fix_warinigsTom Needham2014-02-101-6/+12
| |\ \ \ | | |_|/ | |/| |
| | * | getData() always needs to return an arrayBjoern Schiessle2014-02-071-6/+12
| * | | Merge pull request #7131 from owncloud/issue/6269Thomas Müller2014-02-101-6/+6
| |\ \ \
| | * | | Change MySQL to MySQL/MariaDB in the frontendJoas Schilling2014-02-071-6/+6
| * | | | Merge pull request #7066 from owncloud/check_svg_installedThomas Müller2014-02-104-4/+4
| |\ \ \ \
| | * | | | properly check if pdf and svg modules are installedGeorg Ehrke2014-02-044-4/+4
| * | | | | Merge pull request #7071 from jcfischer/masterThomas Müller2014-02-101-1/+2
| |\ \ \ \ \
| | * | | | | close statement in MimeType detection is executed [#7069]Jens-Christian Fischer2014-02-041-1/+2
| | |/ / / /
| * | | | | Merge pull request #6247 from owncloud/memcached-multiple-serversAndreas Fischer2014-02-081-2/+10
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Readd support for memcached_server config variable.Andreas Fischer2014-01-101-1/+9
| | * | | | Add support for multiple memcached servers.Andreas Fischer2014-01-101-2/+2
| * | | | | Merge pull request #7112 from owncloud/enc_fix_size_for_shared_filesVincent Petry2014-02-071-1/+1
| |\ \ \ \ \
| | * | | | | replace 'size' with 'unencrypted_size' if encryption is enabledBjoern Schiessle2014-02-071-1/+1
| * | | | | | Merge pull request #6997 from owncloud/fix_l10n_warningsThomas Müller2014-02-071-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | change order of issubdirectory() calls to avoid error messages for non-appsBjoern Schiessle2014-01-291-2/+2
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #6952 from MartialGeek/add_freebox_supportVincent Petry2014-02-062-1/+6
| |\ \ \ \ \
| | * | | | | The regexp of the Freebox user agent is now more strict.Martial Saunois2014-01-291-1/+1
| | * | | | | New user agent added for the Freebox.Martial Saunois2014-01-262-1/+6
| * | | | | | Merge pull request #6445 from owncloud/fix_5956Vincent Petry2014-02-061-2/+2
| |\ \ \ \ \ \
| | * | | | | | encode imagePath and fix documentation of loadFromFileGeorg Ehrke2014-01-111-2/+2
| | * | | | | | fix issue with logging non utf8 charsGeorg Ehrke2013-12-161-1/+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