summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into quota-space-rootRobin Appelman2014-02-0718-143/+239
|\
| * 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-041-12/+28
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-3053-320/+731
| | |\ \ \ \
| | * | | | | Separate PHP upload limit and free spacePellaeon Lin2013-12-081-12/+28
| * | | | | | 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-042-25/+6
| |\ \ \ \ \ \
| | * | | | | | Remove unused functions from OC_HelperBart Visscher2014-01-311-23/+0
| | * | | | | | Merge branch 'master' into setupBart Visscher2014-01-31209-5169/+3590
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'origin/master' into setupBart Visscher2013-10-021-2/+6
| * | | | | | | Merge pull request #6647 from owncloud/memcache-publicicewind19912014-02-045-28/+38
| |\ \ \ \ \ \ \
| | * | | | | | | Fix some phpdoc errors and rename interfaceRobin Appelman2014-01-241-1/+3
| | * | | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-2211-10/+42
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-157-35/+54
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into memcache-publicRobin Appelman2014-01-0918-25/+148
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Also update the OCP\IServerContainerRobin Appelman2014-01-081-1/+1
| | * | | | | | | | | get the memorycache factory from OCP\Server instead of a cache instanceRobin Appelman2014-01-081-6/+5
| | * | | | | | | | | Remove the static dependency on OC_Util from MemcacheRobin Appelman2014-01-063-2/+16
| | * | | | | | | | | 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-032-6/+26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | also load error handler if debugging is enabledBjoern Schiessle2014-02-031-3/+15
| | * | | | | | | | | | 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-272-3/+53
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Added exception logger plugin for sabre connectorVincent Petry2014-01-272-3/+53
| | |/ / / / / / /
* | | | | | | | | Don't create new thumbnails on the write hookRobin Appelman2014-02-041-1/+1
* | | | | | | | | Actually rename the variableRobin Appelman2014-01-271-2/+2
* | | | | | | | | Fix phpdocRobin Appelman2014-01-271-1/+1
* | | | | | | | | Allow passing a root folder to get the used space from in the quota wrapperRobin Appelman2014-01-272-2/+8
|/ / / / / / / /
* / / / / / / / Add check for apc.enabled optionOtto Sabart2014-01-241-0/+2
|/ / / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'Jörn Friedrich Dreyer2014-01-211-1/+1
* | | | | | | | | OC_Util::setupFS($user) will create a data dir for the given string - no matt...Thomas Müller2014-01-212-0/+18
|/ / / / / / / /