summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add is_editing_allowed function to OC_Calendar_ShareGeorg Ehrke2012-02-221-0/+17
* clean up sql commands in OC_Calendar_ShareGeorg Ehrke2012-02-221-19/+35
* add 'permissions' as a sql condition in allSharedwithuserGeorg Ehrke2012-02-211-2/+7
* rename updatecalendar to updateGeorg Ehrke2012-02-211-0/+0
* Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharingGeorg Ehrke2012-02-21206-1953/+46031
|\
| * fix sql commandGeorg Ehrke2012-02-181-2/+2
| * fix unsharing of groupsGeorg Ehrke2012-02-172-6/+5
| * Merge branch 'master' into calendar_sharingGeorg Ehrke2012-02-1736-1333/+1392
| |\
| | * UI tweaks for name selector combobox.Thomas Tanghus2012-02-162-4/+1
| | * Added method for loading from file handle.Thomas Tanghus2012-02-161-16/+31
| | * Minor tweaksThomas Tanghus2012-02-163-912/+7
| | * Revert "remove the 3rdparty files. everything is now in https://gitorious.org...Robin Appelman2012-02-16419-2/+123978
| | * Merge branch 'master' of gitorious.org:owncloud/owncloudRobin Appelman2012-02-16450-124387/+438
| | |\
| | | * remove the 3rdparty files. everything is now in https://gitorious.org/ownclou...Frank Karlitschek2012-02-15419-123978/+2
| | | * use cached size for getting the size of a moved fileRobin Appelman2012-02-151-2/+1
| | | * Update breadcrumb css on closeTom Needham2012-02-141-0/+1
| | | * Fix editing shared files and file opening bug. Fixes oc-209 and oc-195Tom Needham2012-02-141-14/+14
| | | * Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-02-1431-388/+1333
| | | |\
| | | | * Added some fixes for what to show when address books are (de)selected, all co...Thomas Tanghus2012-02-143-4/+48
| | | | * Added some check for when addinf deleting contacts.Thomas Tanghus2012-02-143-54/+137
| | | | * Merge branch 'master' of gitorious.org:owncloud/owncloudKlaas Freitag2012-02-1425-314/+1133
| | | | |\
| | | | | * Added some error checking as mentioned in http://bugs.owncloud.org/thebuggeni...Thomas Tanghus2012-02-141-5/+13
| | | | | * Modify check for missing UID.Thomas Tanghus2012-02-141-3/+9
| | | | | * Use proper index file.Thomas Tanghus2012-02-144-134/+32
| | | | | * Don't try to load a profile picture for contacts the doesn't have any.Thomas Tanghus2012-02-141-15/+16
| | | | | * Removed superfluous debug.Thomas Tanghus2012-02-141-1/+0
| | | | | * Added OC_Contacts_VCard::moveToAddressBookThomas Tanghus2012-02-141-0/+40
| | | | | * Added function for later testing.Thomas Tanghus2012-02-141-0/+15
| | | | | * make local filestorage comply with test casesRobin Appelman2012-02-141-8/+5
| | | | | * dummy data for tests casesRobin Appelman2012-02-143-0/+879
| | | | | * some additional test cases for file storage backendsRobin Appelman2012-02-141-0/+51
| | | | | * External: Use OC_Util::checkLoggedInBart Visscher2012-02-141-6/+1
| | | | | * Gallery: remove unused cover.phpBart Visscher2012-02-141-81/+0
| | | | | * Replace Expires and caching headers by OC_Response functionsBart Visscher2012-02-136-22/+10
| | | | | * Send gallery album thumbnail with OC_Response::sendFileBart Visscher2012-02-133-3/+29
| | | | | * Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModif...Bart Visscher2012-02-133-2/+3
| | | | | * OC_Image: Move Content-Type header to show functionBart Visscher2012-02-131-6/+4
| | | | | * Gallery: Only get local file when generating photo thumbnailBart Visscher2012-02-131-5/+4
| | | | | * Gallery: Use OC_Respone::enableCaching for (album)thumbnailsBart Visscher2012-02-132-10/+2
| | | | | * OC_Response: Set Expire and Cache-Control headers in enableCachingBart Visscher2012-02-131-3/+17
| | | | | * OC_Response: fix var name bugsBart Visscher2012-02-131-2/+2
| | | | | * Gallery: Move login check to beginning of galleryOp.phpBart Visscher2012-02-131-7/+1
| | | | | * Gallery: Remove autoloaded includes from galleryOp.phpBart Visscher2012-02-131-2/+1
| | | | * | allow to set a files mtime through a PROPPATCH request on resourceKlaas Freitag2012-02-144-19/+18
| | | | |/
| | | * / make it possible to override every image and logo with a new version from wit...Frank Karlitschek2012-02-141-12/+19
| | | |/
| | * | make local filestorage comply with test casesRobin Appelman2012-02-131-8/+5
| | * | dummy data for tests casesRobin Appelman2012-02-133-0/+879
| | * | some additional test cases for file storage backendsRobin Appelman2012-02-131-0/+51
| * | | Merge branch 'master' into calendar_sharingGeorg Ehrke2012-02-13174-634/+44654
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of gitorious.org:owncloud/owncloudGeorg Ehrke2012-02-131-1/+3
| | |\ \ | | | |/ | | |/|