Commit Graph

33 Commits

Author SHA1 Message Date
Georg Ehrke 6f20d51646 fix generateEventOutput for calendar hook 2012-06-15 11:25:29 +02:00
Georg Ehrke 09e744b793 connect OC_Calendar_repeat to events.php 2012-06-11 17:25:03 +02:00
Georg Ehrke ece1162949 use native sabredav functions to generate repeating events 2012-06-11 10:55:26 +02:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Brice Maron ffe5ef2268 Correct calendar loading when calendar are from hooks. fix oc-619 2012-05-10 19:36:30 +00:00
Bart Visscher 2facf509cc Merge branch 'tasks' for Tasks app 2012-05-05 18:26:13 +02:00
Frank Karlitschek 9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Bart Visscher 1e47156226 Merge branch 'master' into tasks 2012-05-04 17:04:11 +02:00
Bart Visscher 07ff1e723a Calendar: Fix repeating events 2012-05-03 23:33:44 +02:00
Bart Visscher 077ea94f71 Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
Conflicts:
	apps/calendar/ajax/events.php
2012-05-03 23:18:43 +02:00
Frank Karlitschek 43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek 351740601a port oc_response 2012-05-03 10:46:27 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Georg Ehrke e292b1fcdb fix merge conflicts 2012-04-15 12:43:07 +02:00
Robin Appelman b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Bart Visscher 029e1aced7 Tasks: Update to use new categories interface 2012-04-14 14:55:37 +02:00
Georg Ehrke afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Bart Visscher 4c52007996 Calendar: Update category list when updating/adding event 2012-04-13 21:13:58 +02:00
Bart Visscher f9b7ed3a1f Calendar: Implement rescan of Categories 2012-04-13 21:13:58 +02:00
Bart Visscher 9165b5c28e Use the same category input and management as the contacts app 2012-04-12 23:10:49 +02:00
Georg Ehrke 64d3301523 make shared events editable and add (empty) classes for alarm and attendees 2012-04-10 16:03:38 -04:00
Georg Ehrke 9294a95438 fix view of single shared events 2012-04-07 22:54:38 -04:00
Georg Ehrke 960553f9c4 fix path and class name 2012-04-07 22:45:44 -04:00
Georg Ehrke e18c0d54f6 add output functions and access function to app.php of calendar 2012-04-07 22:35:29 -04:00
Georg Ehrke ca2c7001c4 remove unused code in OC_Calendar_App class 2012-03-31 16:15:04 -04:00
Georg Ehrke 70237f7ecc rewrite OC_Calendar_APP class 2012-03-31 16:13:04 -04:00
Georg Ehrke 71b32f7ad4 add read only 'form' for shared events 2012-03-26 15:24:43 +02:00
Georg Ehrke 19c101a660 fix merge conflicts 2012-03-25 14:02:02 +02:00
Georg Ehrke bfb67286c8 fix merge conflicts 2012-02-25 16:54:27 +01:00
Georg Ehrke db23ec5c1c show shared calendars 2012-02-11 14:02:51 +01:00
Georg Ehrke 9eef57faed make repeating events editable 2011-12-25 23:19:49 +01:00
Bart Visscher 4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00