Commit Graph

45 Commits

Author SHA1 Message Date
Georg Ehrke 6a060ecd23 use light grey instead of white 2012-07-01 01:02:54 +02:00
Georg Ehrke be11f71d27 fix doc for OC_Calendar_Calendar::generateTextColor() 2012-07-01 00:31:05 +02:00
Georg Ehrke 601237a0c3 add algorithm to generate the calendar's text color 2012-07-01 00:09:33 +02:00
Georg Ehrke 4890bbb30d Merge branch 'master' into calendar_import 2012-06-30 22:08:36 +02:00
Georg Ehrke fa5b31ac9c fix documentation style 2012-06-30 17:09:20 +02:00
Georg Ehrke 390f5cc89f some work on (drop)import) 2012-06-30 15:17:29 +02:00
Georg Ehrke 77c66e8cc4 move some documentation to the right place 2012-06-27 21:05:46 +02:00
Georg Ehrke 25a50f00bd add merge calendar function and add some documentation to OC_Calendar_Calendar 2012-06-27 20:56:58 +02:00
Bart Visscher 1d07b9e291 Calendar: Missing userid in allCalendars call 2012-06-21 23:30:04 +02:00
Georg Ehrke 4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Thomas Tanghus f6aa366857 Make sure there is a calendar after delete. 2012-06-15 02:10:55 +02:00
Thomas Tanghus ad32c20300 Agree on argument type (cleaned this time). 2012-06-15 01:51:26 +02:00
Thomas Tanghus 6d43e6565e Revert "Agree on argument type."
This reverts commit 0f6b1be0e6.
2012-06-15 00:53:13 +02:00
Thomas Tanghus 0f6b1be0e6 Agree on argument type. 2012-06-15 00:50:42 +02:00
Georg Ehrke 5cb9d82b45 modify hooks in OC_Calendar_Calendar 2012-06-11 15:16:59 +02:00
Georg Ehrke 7ed30649bb add hooks for calendars 2012-06-09 12:18:25 +02:00
Brice Maron 22cd0f1cda Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:41:39 +00:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Frank Karlitschek 97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Bart Visscher 471e735b0c Calendar: Document active parameter in allCalendars 2012-04-13 21:13:58 +02:00
Bart Visscher 5dcd9e20d0 Small cleanups 2012-03-01 21:00:23 +01:00
Bart Visscher 86d2927c02 Calendar: Correct calendarcolor format for ical color property 2012-02-21 20:10:40 +01:00
Bart Visscher 539fd7240c Calendar: optimize sending calendar events, also enabled caching of result 2012-02-17 22:09:31 +01:00
Georg Ehrke ec3955b158 change description of the changed colors (calendar) 2012-01-15 10:58:39 +01:00
Georg Ehrke cf1023567b change calendar colors 2012-01-15 10:52:07 +01:00
Robin Appelman d92b083c1d fix old calendar name and color not being preserved when editing a calendar 2012-01-11 01:53:25 +01:00
Bart Visscher 4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Georg Ehrke e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Brice Maron e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Bart Visscher 2269f74c27 Fix changing calendar data 2011-10-20 23:49:28 +02:00
Bart Visscher 9cfae56df5 Fix calendar colors with new calendar 2011-10-15 11:45:58 +02:00
Marvin Thomas Rabe f3f5d775b5 removed description field for calendar 2011-10-08 13:28:01 +02:00
Bart Visscher 782069e1fa Change copyright notice to short form 2011-09-23 22:59:54 +02:00
Bart Visscher 388b14604a Move Calendar Object code to its own class OC_Calendar_Object 2011-09-16 00:19:43 +02:00
Jakob Sack 4d7ed0f2f5 Add documentation to calendar.php 2011-09-15 22:45:58 +02:00
Georg Ehrke 1afeb5cd12 bug fixes in calendar lib 2011-09-10 10:52:35 +02:00
Bart Visscher 3130234640 Remove execute permissions from source files 2011-09-03 22:15:23 +02:00
Georg Ehrke 5678d78d54 new changes (e.g. show events) by Bart Visscher 2011-08-31 20:20:46 +02:00
Georg Ehrke 9a60313c3b commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar 2011-08-31 17:29:38 +02:00
Jakob Sack c87cee6b1f Add VJOURNAL to objects that are allowed by default 2011-08-23 22:10:08 +02:00
Jakob Sack 778404fb29 VTODO and VJOURNAL exist as well 2011-08-23 22:07:40 +02:00
Jakob Sack 84761b1518 CalDAV seems to work now 2011-08-23 21:42:15 +02:00
Jakob Sack fbb63f11e4 Some more work on CalDAV integration 2011-08-22 16:59:16 +02:00
Jakob Sack 414e5e174d merge Georgs calendar 2011-08-11 11:22:07 +02:00