summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-1625-284/+247
|\
| * write_close the session when scanning files or musicRobin Appelman2012-06-162-0/+4
| * fix for encryption binary filesRobin Appelman2012-06-164-20/+59
| * Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-06-154-13/+3
| |\
| | * Calendar: Write-close session to enable parallel events.php requestsBart Visscher2012-06-161-0/+1
| | * Merge commit 'refs/merge-requests/121' of git://gitorious.org/owncloud/owncloudBart Visscher2012-06-161-1/+1
| | |\
| | | * remote.php :: use non apache-only env varsBlackEagle2012-05-251-2/+2
| | * | Remove $DOCUMENTROOT, not usedBart Visscher2012-06-162-12/+1
| * | | Move user import to personal settings. Fix user migration between servers.Tom Needham2012-06-155-129/+90
| |/ /
| * | fix encryption proxy for updated filecacheRobin Appelman2012-06-151-1/+1
| * | add binary test case for encryptionRobin Appelman2012-06-152-4/+36
| * | get rid of php4 style constructors in mdb2Robin Appelman2012-06-154-93/+0
| * | Optimize WebDav access by preloading dav custom propertiesBart Visscher2012-06-152-11/+41
| * | Spelling fixBart Visscher2012-06-151-1/+1
| * | Fix webdav property name compareBart Visscher2012-06-151-1/+1
| * | Use setter for FileinfoCacheBart Visscher2012-06-152-11/+11
* | | Merge branch 'master' into calendar_repeatGeorg Ehrke2012-06-1519-398/+439
|\| |
| * | cleanup oc_filecache, splitting it in several parts and using the new hasUpdatedRobin Appelman2012-06-157-373/+344
| * | also add hasUpdated to oc_filesystem and oc_filesystemviewRobin Appelman2012-06-152-0/+18
| * | add hasUpdated to oc_filestorageRobin Appelman2012-06-155-0/+44
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-154-24/+32
| |\ \
| | * | Optimize WebDav access using OC_FileCacheBart Visscher2012-06-153-23/+31
| | * | Files: Double encode download links. Fix for oc-1016.Thomas Tanghus2012-06-151-1/+1
| * | | fixed xss vulnerabilityBjoern Schiessle2012-06-151-1/+1
| |/ /
* | | create OC_Calendar_Object::generateStartEndDate functionGeorg Ehrke2012-06-153-44/+22
* | | fix merge conflictsGeorg Ehrke2012-06-1542-206/+895
|\| |
| * | Load app before running update scriptBart Visscher2012-06-151-0/+1
| * | Disable minizing when DEBUG is trueBart Visscher2012-06-152-2/+6
| * | Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/ownclo...Bjoern Schiessle2012-06-152-24/+45
| |\ \
| | * | fixed handling of fallback_imagesStephan Bergemann2012-06-141-1/+4
| | * | fixed one issue with last directory in structure having a lot ofStephan Bergemann2012-06-141-0/+5
| | * | fixed bug #996: first picture in folder is repeated in the last position beha...Bjoern Schiessle2012-06-141-26/+26
| | * | we don't neede the functions for empty stacks any moreStephan Bergemann2012-06-141-16/+0
| | * | we don't have empty previewstacks any more - code cleaned upStephan Bergemann2012-06-141-25/+10
| | * | deleted some debugging outputStephan Bergemann2012-06-141-1/+0
| | * | use images from deeper directories for preview if the actual directory doesn'...Stephan Bergemann2012-06-141-16/+29
| | * | improved look of directories not containing images directlyStephan Bergemann2012-06-142-4/+4
| | * | now also working for directories only containing one imageStephan Bergemann2012-06-141-1/+2
| | * | fixed second_level_images issueStephan Bergemann2012-06-141-3/+2
| | * | fixed sorting errors and missbehaviours - now sorting like file browserStephan Bergemann2012-06-142-35/+65
| * | | Update stylesheet for type=url.Thomas Tanghus2012-06-151-3/+3
| * | | Use type=url for URL field.Thomas Tanghus2012-06-151-1/+1
| * | | Fix upload for Google Drive; Google Documents List API documentation was misl...Michael Gapczynski2012-06-141-7/+9
| * | | Make sure there is a calendar after delete.Thomas Tanghus2012-06-151-0/+4
| * | | Update calendar after delete.Thomas Tanghus2012-06-151-0/+1
| * | | Only create new calendar when there are none. Fix oc-1007.Thomas Tanghus2012-06-151-2/+4
| * | | Agree on argument type (cleaned this time).Thomas Tanghus2012-06-154-7/+7
| * | | Revert "Agree on argument type."Thomas Tanghus2012-06-154-10/+10
| * | | Agree on argument type.Thomas Tanghus2012-06-154-10/+10
| * | | No need to find calendar twice.Thomas Tanghus2012-06-151-4/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-02 21:46:47 +0000