summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-04-218-27/+183
|\
| * improve the app installer.Frank Karlitschek2012-04-211-0/+1
| * support searching the knowledge baseFrank Karlitschek2012-04-201-2/+3
| * new OC_Mail class to handle all mail sending. The benefit is that is way mor ...Frank Karlitschek2012-04-201-0/+116
| * add function to get mimetype from stringRobin Appelman2012-04-181-0/+20
| * check if PHP mod GD is installedArthur Schiwon2012-04-171-0/+3
| * check if PHP mod JSON is installedArthur Schiwon2012-04-171-0/+3
| * merge log into adminRobin Appelman2012-04-163-22/+26
| * fix creating unique filenamesRobin Appelman2012-04-161-1/+4
| * fix group backendRobin Appelman2012-04-161-1/+1
| * return user specific paths from oc_filecache::getpathRobin Appelman2012-04-161-1/+6
* | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-1528-513/+621
|\|
| * OC_Group_Backend.php misses function groupexistsBart Visscher2012-04-152-1/+18
| * Add well-known redirects to htaccessBart Visscher2012-04-151-1/+7
| * fixing oc-375 - a number is appended tp the filenameThomas Müller2012-04-151-0/+28
| * fix filecache rename hookRobin Appelman2012-04-151-1/+1
| * renamed extention to extension, also now only showing lowercaseJan-Christoph Borchardt2012-04-154-14/+14
| * add public api to get the file id from the cacheRobin Appelman2012-04-151-0/+34
| * fix installing shipped appsRobin Appelman2012-04-151-1/+1
| * fix getAppVersion errorBartek Przybylski2012-04-151-1/+1
| * firefighting Robin-breakageJan-Christoph Borchardt2012-04-141-1/+1
| * don't rely on the old version in info.xml anymoreRobin Appelman2012-04-143-4/+4
| * Merge branch 'master' of gitorious.org:owncloud/owncloudJan-Christoph Borchardt2012-04-147-37/+94
| |\
| | * Typo fix (breif->brief)Bart Visscher2012-04-144-28/+28
| | * Fix default database type stringBart Visscher2012-04-141-1/+1
| | * cache app types in the dbRobin Appelman2012-04-142-5/+62
| | * use the correct array indexes...Robin Appelman2012-04-141-3/+3
| * | improved installation instructionsJan-Christoph Borchardt2012-04-141-1/+1
| * | improved updater wordingJan-Christoph Borchardt2012-04-141-2/+2
| |/
| * reuse OC_L10N objectsRobin Appelman2012-04-145-8/+28
| * some minor optimizationsRobin Appelman2012-04-142-19/+32
| * keep version numbers in their own files for faster readingRobin Appelman2012-04-141-3/+16
| * remove outdated fileRobin Appelman2012-04-141-40/+0
| * Fix annoying error in logTom Needham2012-04-141-150/+151
| * show error when installing an app has failedRobin Appelman2012-04-141-3/+8
| * prevent users with the same name but different casing from being createdRobin Appelman2012-04-141-1/+1
| * remove outdated codeRobin Appelman2012-04-141-204/+0
| * improve flexibility of search providers a bitRobin Appelman2012-04-143-7/+33
| * test cases for user backendsRobin Appelman2012-04-141-0/+114
| * typoArthur Schiwon2012-04-131-3/+3
| * don't fail on missing extensionArthur Schiwon2012-04-131-1/+5
| * make sure temporary files are being removed, fixes oc-450Arthur Schiwon2012-04-132-16/+30
* | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-1313-160/+498
|\|
| * file settings: let people set no more than upper boundary for file uploads, b...Arthur Schiwon2012-04-131-5/+13
| * make upload size settings work probably. do not replace whole .htaccess, only...Arthur Schiwon2012-04-131-6/+35
| * allow multiply group backendsRobin Appelman2012-04-136-140/+407
| * OC_VCategories: sort categories in natural order using usortBart Visscher2012-04-121-1/+2
| * Implement default categories in OC_VCategoriesBart Visscher2012-04-121-3/+2
| * Fix a session fixation vulnerabilityFlorian Preinstorfer2012-04-121-2/+4
| * UTF8 locale by defaultGrundik2012-04-122-2/+4