summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-masterThomas Müller2013-07-171-2/+2
|\
| * fixing UNIX_TIMESTAMP() for mssqlThomas Mueller2013-07-171-2/+2
* | Merge pull request #4042 from guruz/webdav_auth_check_existingMarkus Goetz2013-07-171-0/+21
|\ \ | |/ |/|
| * WebDAV Auth Connector: Check if already logged inMarkus Goetz2013-07-171-0/+21
* | Merge pull request #2395 from owncloud/cacheicewind19912013-07-167-138/+285
|\ \
| * | memcache: also switch factory to prefixRobin Appelman2013-07-161-5/+5
| * | mamcache: implement the ArrayAccess interfaceRobin Appelman2013-07-161-1/+19
| * | memchache: use prefix string instead of global flagRobin Appelman2013-07-164-29/+15
| * | split out memcache factory from base classRobin Appelman2013-07-162-24/+39
| * | Merge branch 'master' into cacheRobin Appelman2013-07-16172-3454/+7688
| |\ \
| * | | Add memcached backendRobin Appelman2013-03-172-1/+86
| * | | Seperate memory based cache from OC_CacheRobin Appelman2013-03-175-132/+175
* | | | Merge pull request #3959 from owncloud/buildNotExistingFileNameForViewBart Visscher2013-07-161-5/+33
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix renaming using parenthesisBart Visscher2013-07-051-5/+21
| * | | Make buildNotExistingFileName testable and write unittestsBart Visscher2013-07-051-1/+13
* | | | Merge pull request #4076 from owncloud/fix_typos_kondouVicDeo2013-07-167-14/+14
|\ \ \ \
| * | | | Fix some typoskondou2013-07-167-14/+14
* | | | | Merge pull request #3962 from owncloud/move-error-handlersBart Visscher2013-07-153-30/+56
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Check if logger is set, also no need to return trueBart Visscher2013-07-081-3/+1
| * | | | Move error handlers from OC_Log to OC\Log\ErrorHandlerBart Visscher2013-07-053-30/+58
| |/ / /
* | | | Merge pull request #3487 from owncloud/basic_auth_hackThomas Müller2013-07-141-7/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move comment and set requesttoken.Thomas Tanghus2013-06-051-3/+2
| * | | Cleanup hacke v.2Thomas Tanghus2013-05-311-4/+2
| * | | Revert "Clean up hack."Thomas Tanghus2013-05-311-2/+4
| * | | Clean up hack.Thomas Tanghus2013-05-311-4/+2
| * | | Hack base.php to make Basic Auth workThomas Tanghus2013-05-251-1/+2
* | | | Merge pull request #3270 from owncloud/convert-oc_configicewind19912013-07-115-105/+223
|\ \ \ \
| * | | | stupid namespaceBart Visscher2013-07-081-1/+1
| * | | | Add constructor documentationBart Visscher2013-07-081-0/+3
| * | | | Merge branch 'master' into convert-oc_configBart Visscher2013-07-0867-27/+146
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into convert-oc_configBart Visscher2013-07-044-48/+178
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into convert-oc_configThomas Mueller2013-07-033-11/+36
| |\ \ \ \ \ \
| * | | | | | | on unit test use @expectedExceptionThomas Müller2013-07-021-0/+3
| * | | | | | | Merge branch 'master' into convert-oc_configThomas Müller2013-07-0163-1212/+1979
| |\ \ \ \ \ \ \
| * | | | | | | | Set debugMode after reading the config fileBart Visscher2013-06-272-3/+8
| * | | | | | | | Revert "Can't determine if debug mode is defined until we read the config"Bart Visscher2013-06-272-4/+7
| * | | | | | | | Use file_exists to fix the unittestsBart Visscher2013-06-271-1/+1
| * | | | | | | | Fix stupid namespace separatorBart Visscher2013-06-271-1/+1
| * | | | | | | | Merge branch 'master' into convert-oc_configBart Visscher2013-06-2744-312/+609
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Can't determine if debug mode is defined until we read the configMichael Gapczynski2013-06-102-7/+4
| * | | | | | | | | Fix potential glob errorMichael Gapczynski2013-06-101-14/+10
| * | | | | | | | | One more style fixMichael Gapczynski2013-06-031-1/+1
| * | | | | | | | | Merge branch 'master' into convert-oc_configMichael Gapczynski2013-06-0383-933/+2279
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Style and comment fixesMichael Gapczynski2013-06-033-35/+37
| * | | | | | | | | | Merge branch 'master' into convert-oc_configThomas Mueller2013-05-1518-86/+396
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | camelCase class propertiesBart Visscher2013-05-081-16/+15
| * | | | | | | | | | | Remove include for loading legacy classBart Visscher2013-05-081-2/+0
| * | | | | | | | | | | Fix returns of values in OCP\ConfigBart Visscher2013-05-071-6/+21
| * | | | | | | | | | | Convert OC_Config to object interfaceBart Visscher2013-05-074-77/+175
* | | | | | | | | | | | - eventsource.php: in case of potential CSRF attack we send an error message ...Thomas Müller2013-07-111-4/+5