summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix the default setting for yearly repeating eventsGeorg Ehrke2011-12-263-13/+13
* make repeating events editableGeorg Ehrke2011-12-256-89/+857
* use pre-decrement instead of post-decrementGeorg Ehrke2011-12-251-1/+1
* use OC_JSON::checkLoggedIn() in all ajax filesGeorg Ehrke2011-12-2211-33/+11
* fix merge conflictsGeorg Ehrke2011-12-2122-138/+139
|\
| * Gallery: fix calculation of folder thumbnail selectionBart Visscher2011-12-181-1/+1
| * Contacts: check if PREF parameter is set before useing itBart Visscher2011-12-181-1/+1
| * Contacts: add missing property_options template varBart Visscher2011-12-182-1/+3
| * Calendar: small for loop fixBart Visscher2011-12-181-2/+2
| * Calendar: refactor common ajax functions to OC_Calendar_AppBart Visscher2011-12-1817-128/+131
| * Fix shared status for files inside a shared folderMichael Gapczynski2011-12-171-0/+1
* | Merge branch 'master' into calendarGeorg Ehrke2011-12-161-1/+3
|\|
| * make the sharing app return the corrrect result for is_writable on the shared...Robin Appelman2011-12-161-1/+3
* | delete unused filesGeorg Ehrke2011-12-106-98/+0
* | check for php version is greater than 5.3.0 - we make extensive use of Date T...Georg Ehrke2011-12-101-19/+21
* | Merge branch 'master' into calendarGeorg Ehrke2011-12-103-17/+6
|\|
| * Some small changesBart Visscher2011-12-091-3/+2
| * Update OC_VObjectBart Visscher2011-12-091-14/+3
| * Gallary: Fix alignment of album thumbnailsBart Visscher2011-12-091-0/+1
* | Merge branch 'master' into calendarGeorg Ehrke2011-12-0912-43/+104
|\|
| * Gallery: splitout model codeBart Visscher2011-12-0812-43/+104
* | add resettimezone file for testing timezone detectionGeorg Ehrke2011-12-091-0/+4
* | optimize timezone detectionGeorg Ehrke2011-12-092-1/+2
* | Merge branch 'master' into calendarGeorg Ehrke2011-12-0830-535/+381
|\|
| * bump version number to force db rebuildMichiel de Jong2011-12-081-1/+1
| * Imageviewer: fix fancybox.png image url in fancybox cssBart Visscher2011-12-071-21/+21
| * Contacts: Add "Preferred" before phone label for preferred numbersBart Visscher2011-12-071-1/+1
| * Contacts: Add direct link to details of a contactBart Visscher2011-12-072-3/+10
| * Contacts: Fix postname var spellingBart Visscher2011-12-071-1/+1
| * Contacts: refactor common ajax functions to OC_Contacts_AppBart Visscher2011-12-0712-195/+84
| * Contacts: refactor rendering of part.details templateBart Visscher2011-12-079-73/+88
| * Use a proxy class to interface with Sabre_VObject classesBart Visscher2011-12-0714-189/+60
| * compliance with http://www.w3.org/community/unhosted/wiki/remoteStorageMichiel de Jong2011-12-076-71/+135
* | fix merge conflictsGeorg Ehrke2011-12-0349-235/+604
|\|
| * Contacts: make name editable againBart Visscher2011-12-025-4/+20
| * Calendar: Also check if the enddate is in the requested range for eventsBart Visscher2011-11-301-0/+2
| * Calendar: Use the default timezone that is set in lib/base.phpBart Visscher2011-11-303-3/+3
| * Correct ldap check in dependencies_chk appBrice Maron2011-11-251-1/+1
| * Contacts: layout updatesBart Visscher2011-11-243-5/+6
| * Contacts: better label for saving a propertyBart Visscher2011-11-241-1/+1
| * Contacts: make type of phone property also multiselect in addpropertyBart Visscher2011-11-242-1/+2
| * Bookmarks: make a soft-requirement of php-curlBart Visscher2011-11-241-1/+4
| * Total rewite of fix.Insanemal2011-11-243-19/+30
| * Adjusted the check user function to lowercase the return.Insanemal2011-11-241-1/+8
| * Added option to lowercase all usernames.Insanemal2011-11-243-2/+14
| * Music - Fix album and artist expand layout.Ignacio Daniel Rostagno2011-11-241-1/+2
| * fix ampache htmlentity callsRobin Appelman2011-11-241-6/+6
| * Merge branch 'fullcalendar'Bart Visscher2011-11-2324-1189/+837
| |\
| | * Fix scrolling through monthsBart Visscher2011-11-231-0/+4
| | * fix timeformat setting for fullcalendarGeorg Ehrke2011-11-202-5/+7