summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into calendar_importGeorg Ehrke2012-07-21356-1227/+1714
|\
| * some style fixes for calendarGeorg Ehrke2012-07-211-1/+3
| * Implemented undelete for contacts.Thomas Tanghus2012-07-211-49/+71
| * Made contactlist optional in insertContact().Thomas Tanghus2012-07-211-0/+5
| * White space.Thomas Tanghus2012-07-211-37/+37
| * Added option to notify method.Thomas Tanghus2012-07-211-3/+21
| * DRYed inserting into contacts list.Thomas Tanghus2012-07-211-30/+41
| * Fix missing parameter decleration, thanks Jenkins :-)Bart Visscher2012-07-211-1/+1
| * Tasks: Remove unused codeBart Visscher2012-07-2111-285/+0
| * DRY for getting calendar timezone settingBart Visscher2012-07-219-14/+24
| * Style fixesBart Visscher2012-07-212-7/+7
| * Damn, that Jenkins dude is tough ;)Thomas Tanghus2012-07-213-11/+17
| * fix ununsed variablesRobin Appelman2012-07-212-4/+4
| * cleanup some obsolete foldersize code from the shared storage backendRobin Appelman2012-07-211-34/+1
| * remove obsolete oc_filesystem::mountallRobin Appelman2012-07-211-11/+0
| * Add missing public to function definitionBart Visscher2012-07-211-1/+1
| * Fix parameter order in OC_Filestorage_Common->hashBart Visscher2012-07-211-1/+1
| * Add ETag support to the Sabre file connector.Bart Visscher2012-07-214-7/+74
| * adapted to new SabreDav versionBjoern Schiessle2012-07-201-10/+12
| * Trying to get documentation to "Do The Right Thing" (TM)Thomas Tanghus2012-07-201-70/+73
| * Hide progressbar on error.Thomas Tanghus2012-07-201-0/+2
| * Corrected retry count for uploaded imports.Thomas Tanghus2012-07-201-1/+1
| * Fix strict standards warningsTom Needham2012-07-201-1/+1
| * Added some more documentation to OCP\JSON.Thomas Tanghus2012-07-201-8/+57
| * Added some documentation for OCP\JSON::callCheck()Thomas Tanghus2012-07-201-0/+15
| * forgot to make one function abstractRobin Appelman2012-07-201-1/+1
| * remove unused variablesRobin Appelman2012-07-2025-82/+39
| * remove unused and depricated getFolderSizeRobin Appelman2012-07-202-41/+2
| * dont try to create mountpoints automaticallyRobin Appelman2012-07-201-3/+0
| * fix OC_Cache_File tests if encryption is not enabledRobin Appelman2012-07-201-2/+4
| * fix unused variablesRobin Appelman2012-07-2016-47/+28
| * fix increasing folder sizes in filecache for custom rootsRobin Appelman2012-07-201-2/+2
| * fix eventsource fallback when more then one eventsource is activeRobin Appelman2012-07-201-1/+1
| * Remove unused file.Thomas Tanghus2012-07-201-16/+0
| * Code style.Thomas Tanghus2012-07-2018-87/+143
| * remove unused variable from dropbox filestorage backendRobin Appelman2012-07-201-1/+1
| * minor fixes for the google filestorage backendRobin Appelman2012-07-201-5/+4
| * dont check for filecache updates when getting quota info over webdavRobin Appelman2012-07-201-1/+1
| * remove unused variables from webdav file backendRobin Appelman2012-07-201-10/+5
| * Add CSRF checksLukas Reschke2012-07-203-2/+8
| * add SabreDav 1.6.3 filesGeorg Ehrke2012-07-20180-0/+25055
| * remove old filesGeorg Ehrke2012-07-20180-24866/+0
| * Change uri fields from 100 to 200 chars.Thomas Tanghus2012-07-202-3/+3
| * fixing syntax errorThomas Mueller2012-07-201-1/+1
| * fixing syntax errorThomas Mueller2012-07-201-1/+1
| * dont use the mtimes stored in zip archives since they dont update correctlyRobin Appelman2012-07-201-2/+1
| * Coding style.Thomas Tanghus2012-07-204-111/+111
| * Code styleThomas Tanghus2012-07-2023-105/+152
| * Trigger loading of more contacts a bit earlier.Thomas Tanghus2012-07-201-1/+1
| * Cleaning up a bit.Thomas Tanghus2012-07-201-2/+2