summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Fix test cases for group managerRobin Appelman2014-02-141-2/+2
* remove duplicate call to groupExistsRobin Appelman2014-02-141-6/+4
* suppress error msg caused by php bugGeorg Ehrke2014-02-144-4/+4
* Merge pull request #4624 from owncloud/convert-oc_appconfigThomas Müller2014-02-134-91/+241
|\
| * Add explicit sortingRobin Appelman2014-02-111-2/+4
| * Merge branch 'master' into convert-oc_appconfigRobin Appelman2014-02-1112-21/+117
| |\
| * | Add caching to appconfigRobin Appelman2014-02-072-16/+48
| * | use the 'new' server container for appconfigRobin Appelman2014-02-07214-5212/+3653
| |\ \
| * | | Move legacy file to correct locationBart Visscher2013-10-021-0/+120
| * | | Merge branch 'master' into convert-oc_appconfigBart Visscher2013-10-022-72/+93
* | | | Merge pull request #6964 from owncloud/storagestatistics-reuseicewind19912014-02-121-6/+10
|\ \ \ \
| * \ \ \ Merge branch 'master' into storagestatistics-reuseRobin Appelman2014-02-1011-18/+32
| |\ \ \ \
| * \ \ \ \ merge master into storagestatistics-reuseRobin Appelman2014-02-0514-141/+233
| |\ \ \ \ \
| * | | | | | Reuse the calculated free_space in buildFileStorageStatisticsRobin Appelman2014-01-271-3/+6
* | | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfileVincent Petry2014-02-114-1/+25
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Added isLocal() method to storage, used for xsendfileVincent Petry2014-02-064-1/+25
| | |_|_|_|/ | |/| | | |
* | | | | | fix DIArthur Schiwon2014-02-111-4/+6
* | | | | | Inject loggerArthur Schiwon2014-02-111-3/+6
* | | | | | wrong tldArthur Schiwon2014-02-111-1/+1
* | | | | | sort following entries in alphabetical orderArthur Schiwon2014-02-111-3/+4
* | | | | | move sorter into a classArthur Schiwon2014-02-111-0/+53
* | | | | | 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-1025-156/+263
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | 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 #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
|\ \ \ \ \ \ \ \ \ \