summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / / / /
* / / / / / / 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
|/ / / / / / /
* | | | | | | Merge pull request #6820 from owncloud/phpunit-test-configThomas Müller2014-01-203-3/+2
|\ \ \ \ \ \ \
| * | | | | | | Load a separate config (if present) when running unit testsRobin Appelman2014-01-173-3/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Reuse the data retrieved from the cache in checkUpdateRobin Appelman2014-01-202-4/+7
* | | | | | | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfixVincent Petry2014-01-201-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fixed quota wrapper to not wrap failed fopen streamsVincent Petry2014-01-191-1/+1
* | | | | | | Merge pull request #6676 from aseques/check_internet_proxyThomas Müller2014-01-191-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Disabled internet checking as mentioned when in proxy modeJoan2014-01-101-0/+5
* | | | | | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-appsMorris Jobke2014-01-181-0/+3
|\ \ \ \ \ \ \
| * | | | | | | error handling in case a requested app doesn't existsThomas Müller2014-01-151-0/+3
| | |/ / / / / | |/| | | | |
* / | | | | | show link to app documentationBjoern Schiessle2014-01-171-0/+4
|/ / / / / /
* | | | | | Merge pull request #6744 from owncloud/fix_ocs_response_messagesThomas Müller2014-01-151-20/+22
|\ \ \ \ \ \
| * | | | | | keep response messageBjoern Schiessle2014-01-131-20/+22
* | | | | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtimeVincent Petry2014-01-151-1/+1
|\ \ \ \ \ \ \