summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4624 from owncloud/convert-oc_appconfigThomas Müller2014-02-136-91/+339
|\
| * Add explicit sortingRobin Appelman2014-02-111-2/+4
| * Merge branch 'master' into convert-oc_appconfigRobin Appelman2014-02-1113-22/+118
| |\
| * | Add caching to appconfigRobin Appelman2014-02-072-16/+48
| * | use the 'new' server container for appconfigRobin Appelman2014-02-07287-3246/+6972
| |\ \
| * | | Move legacy file to correct locationBart Visscher2013-10-021-0/+0
| * | | Merge branch 'master' into convert-oc_appconfigBart Visscher2013-10-02340-1200/+6325
| |\ \ \
| * | | | Style fixesBart Visscher2013-09-191-21/+25
| * | | | check for valid appinfo in installerBart Visscher2013-09-191-0/+3
| * | | | Convert OC_Appconfig to object interfaceBart Visscher2013-09-192-67/+201
* | | | | Merge pull request #6964 from owncloud/storagestatistics-reuseicewind19912014-02-122-9/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into storagestatistics-reuseRobin Appelman2014-02-1012-19/+33
| |\ \ \ \ \
| * \ \ \ \ \ merge master into storagestatistics-reuseRobin Appelman2014-02-0518-145/+297
| |\ \ \ \ \ \
| * | | | | | | Reuse the calculated free_space in buildFileStorageStatisticsRobin Appelman2014-01-272-6/+10
* | | | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfileVincent Petry2014-02-115-1/+36
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Added isLocal() method to storage, used for xsendfileVincent Petry2014-02-065-1/+36
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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-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
| |\ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 21:04:03 +0000