summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* API: Add required auth level to OCS routes, move some routes to provisioning_...Tom Needham2012-09-131-13/+9
* API: Use http authentication, check the auth level requiredTom Needham2012-09-131-19/+22
* API: Default to user authentication levelTom Needham2012-09-131-2/+3
* Fix autoloader merge conflictTom Needham2012-09-131-2/+4
* Remove a merge conflictTom Needham2012-09-131-4/+1
* Remove provisioning_api apps from coreTom Needham2012-09-137-332/+0
* Fix merge conflictsTom Needham2012-09-132729-216321/+157922
|\
| * mark as an updated beta 3 with some more fixesFrank Karlitschek2012-09-131-1/+1
| * Set configured to true after configuring Dropbox storageMichael Gapczynski2012-09-121-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-13105-432/+895
| * Enable post_write triggerBart Visscher2012-09-131-2/+2
| * dirname can also return '.' for empty pathBart Visscher2012-09-131-1/+1
| * Don't hide errors doing the versioning copyBart Visscher2012-09-131-1/+1
| * correctly calculate the MDB2 portabilityJörn Friedrich Dreyer2012-09-121-1/+1
| * log details for an error when upgrading the schemaJörn Friedrich Dreyer2012-09-121-1/+2
| * fix schema updates with oracle\n basically this took me all day to debug and ...Jörn Friedrich Dreyer2012-09-122-22/+79
| * add proper logging to filecacheJörn Friedrich Dreyer2012-09-121-2/+13
| * Don't get metadata directly from the 'cached' file cache after uploadMichael Gapczynski2012-09-121-1/+1
| * Fixed bug oc-1659 - history dialogue cannot be closed once openedSam Tuke2012-09-121-22/+43
| * add proper error logging in OC_User database queriesv4.5.0beta3Jörn Friedrich Dreyer2012-09-121-10/+33
| * add getErrorMessage to OC_DBJörn Friedrich Dreyer2012-09-121-0/+24
| * show the current username. This confused some peopleFrank Karlitschek2012-09-121-1/+1
| * this is now 4.5 beta 3Frank Karlitschek2012-09-121-2/+2
| * Merge branch 'master' of https://github.com/owncloud/coreFrank Karlitschek2012-09-121-1/+1
| |\
| | * return a message when app could not be enabledJörn Friedrich Dreyer2012-09-121-1/+1
| * | improve the documentation for the cron config a bitFrank Karlitschek2012-09-121-2/+2
| |/
| * Don't call clearCache() for OC_Minimizer statically, create OC_Minimizer obje...Michael Gapczynski2012-09-121-2/+4
| * Treat getUsers() as case insensitive, helpful for showing proper results in t...Michael Gapczynski2012-09-121-1/+1
| * Merge branch 'master' into share_expirationMichael Gapczynski2012-09-12981-13794/+26627
| |\
| | * Add lock and clock icon for sharingMichael Gapczynski2012-09-126-2/+32
| | * Temporarily disable sharing with contacts and emails, will come in next releaseMichael Gapczynski2012-09-123-42/+42
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-1227-150/+223
| | * added hint to restart the web server in case recetly installed php modules ar...Thomas Mueller2012-09-111-0/+14
| | * allow using only dbname for oracleJörn Friedrich Dreyer2012-09-111-6/+14
| | * don't set values with oc_appconfig when oc is not installed yet, allows to re...Jörn Friedrich Dreyer2012-09-111-1/+1
| | * Fix problem with non share collection item types being treated as collectionsMichael Gapczynski2012-09-111-6/+14
| | * Change version number update occurs on to prevent problem with betas, users u...Michael Gapczynski2012-09-101-1/+1
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-1129-140/+217
| | * fix file uploadGeorg Ehrke2012-09-101-2/+2
| | * Merge branch 'master' of github.com:owncloud/coreJörn Friedrich Dreyer2012-09-101-88/+82
| | |\
| | | * Respect coding styleThomas Müller2012-09-101-88/+82
| | * | use tabs for indentationJörn Friedrich Dreyer2012-09-101-189/+189
| | |/
| | * Respect coding styleThomas Müller2012-09-101-26/+26
| | * Respect coding styleThomas Müller2012-09-101-3/+3
| | * Respect coding styleThomas Müller2012-09-101-5/+4
| | * Respect coding styleThomas Müller2012-09-101-1/+1
| | * Respect coding styleThomas Müller2012-09-101-3/+9
| | * Respect coding styleThomas Müller2012-09-101-2/+2
| | * Respect coding styleThomas Müller2012-09-101-1/+1
| | * Respect coding styleThomas Müller2012-09-101-15/+15