summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1469-226/+1130
|\
| * Merge pull request #7207 from owncloud/fileinfo-serializableMorris Jobke2014-02-141-5/+1
| |\
| | * remove the JsonSerializable interface from \OC\Files\FileInfoRobin Appelman2014-02-141-5/+1
| * | Merge pull request #7204 from owncloud/groupexists-duplicateThomas Müller2014-02-142-10/+41
| |\ \
| | * | Fix test cases for group managerRobin Appelman2014-02-142-4/+37
| | * | remove duplicate call to groupExistsRobin Appelman2014-02-141-6/+4
| * | | Merge pull request #7206 from owncloud/fix_enc_testsblizzz2014-02-141-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | fileinfo is no longer a arrayBjoern Schiessle2014-02-141-1/+1
| |/ /
| * | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-148-34/+367
| |\ \
| | * \ merge master into fileinfoRobin Appelman2014-01-29125-5300/+16010
| | |\ \
| | * | | Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-242-1/+65
| | * | | undo 3rdparty changeRobin Appelman2014-01-201-0/+0
| | * | | undo 3rdparty changeRobin Appelman2014-01-201-0/+0
| | * | | Merge branch 'master' into fileinfoRobin Appelman2014-01-1733-85/+269
| | |\ \ \
| | * | | | remove more is_array from encryptionRobin Appelman2014-01-173-13/+13
| | * | | | Dont use php5.4 only featuresRobin Appelman2014-01-171-2/+3
| | * | | | Don't use is_array on FileInfoRobin Appelman2014-01-172-3/+3
| | * | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-1429-3395/+101
| | |\ \ \ \
| | * | | | | add Support for passing a FileInfo instance to View->putFileInfoRobin Appelman2014-01-132-1/+8
| | * | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfoRobin Appelman2014-01-132-17/+7
| | * | | | | Extends phpdoc for \OCP\File\FileInfoRobin Appelman2014-01-131-4/+37
| | * | | | | Add a FileInfo class which holds all info of a file and return that from getF...Robin Appelman2014-01-134-18/+257
| * | | | | | Merge pull request #6726 from owncloud/fix_6630Vincent Petry2014-02-145-5/+5
| |\ \ \ \ \ \
| | * | | | | | Fixed double file encoding for previewsVincent Petry2014-01-302-2/+2
| | * | | | | | remove empty lineGeorg Ehrke2014-01-301-1/+0
| | * | | | | | don't urldecode get var, php does this automaticallyGeorg Ehrke2014-01-303-3/+4
| * | | | | | | Merge pull request #7183 from owncloud/remove-force-lowercaseThomas Müller2014-02-141-3/+20
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | remove forced lowercase from extension, fix #4747, also coding style fixesJan-Christoph Borchardt2014-02-131-3/+20
| * | | | | | | Merge pull request #7201 from owncloud/fix_error_msg_imagick_queryFormatsThomas Müller2014-02-144-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | suppress error msg caused by php bugGeorg Ehrke2014-02-144-4/+4
| * | | | | | | | Merge pull request #7168 from owncloud/issue/7152Vincent Petry2014-02-141-4/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Send correct path on file upload when using public appJoas Schilling2014-02-121-4/+12
| * | | | | | | | Merge pull request #4624 from owncloud/convert-oc_appconfigThomas Müller2014-02-137-91/+342
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | sort expected result in testsRobin Appelman2014-02-131-0/+2
| | * | | | | | | Add explicit sortingRobin Appelman2014-02-111-2/+4
| | * | | | | | | Merge branch 'master' into convert-oc_appconfigRobin Appelman2014-02-1133-58/+266
| | |\ \ \ \ \ \ \
| | * | | | | | | | Remove the Test_AppConfig_Object tests as they no longer make sense with cachingRobin Appelman2014-02-071-180/+0
| | * | | | | | | | Add caching to appconfigRobin Appelman2014-02-072-16/+48
| | * | | | | | | | use the 'new' server container for appconfigRobin Appelman2014-02-072224-76883/+172118
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Move legacy file to correct locationBart Visscher2013-10-021-0/+0
| | * | | | | | | | | Merge branch 'master' into convert-oc_appconfigBart Visscher2013-10-021012-10067/+30755
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Enable appconfig assertsBart Visscher2013-09-191-4/+4
| | * | | | | | | | | | 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-193-67/+382
| * | | | | | | | | | | Merge pull request #7178 from owncloud/issue/6277Thomas Müller2014-02-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | External FTP Storage should request hostname instead of URLJoas Schilling2014-02-121-1/+1
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #6964 from owncloud/storagestatistics-reuseicewind19912014-02-123-13/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into storagestatistics-reuseRobin Appelman2014-02-1041-192/+737
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ merge master into storagestatistics-reuseRobin Appelman2014-02-0577-587/+1513
| | |\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 02:29:30 +0000