wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5806 commits 157 branches 562 tags 714 MiB
Commit graph

50 commits

Author SHA1 Message Date
Bart Visscher
b12ed88794 Calendar: remove double html encoding 2012-08-03 16:18:33 +02:00
Bart Visscher
060b8865a4 DRY for getting calendar timezone setting 2012-07-21 00:45:30 +02:00
Georg Ehrke
fa5b31ac9c fix documentation style 2012-06-30 17:09:20 +02:00
Georg Ehrke
652a874fa6 fix displaying of events 2012-06-29 18:13:52 +02:00
Georg Ehrke
bda0026374 fix birthday calendar 2012-06-29 15:43:18 +02:00
Thomas Tanghus
df1eca4fa2 Also load categories from VJOURNAL. 2012-06-24 22:25:32 +02:00
Georg Ehrke
f5740a6f92 fix a PHP Notice 2012-06-21 15:20:15 +02:00
Georg Ehrke
5ce0097b6f Calendar: only run ->expand if the event is repeating 2012-06-19 13:30:45 +02:00
Georg Ehrke
13aad8f06d some little fixes for repeating events caching 2012-06-18 15:58:01 +02:00
Georg Ehrke
beed6e0f0e Revert "Revert "create OC_Calendar_Object::generateStartEndDate function"" 
This reverts commit e3b58f6783.
 2012-06-18 14:47:58 +02:00
Georg Ehrke
e3b58f6783 Revert "create OC_Calendar_Object::generateStartEndDate function" 
This reverts commit aa7ce480f4.
 2012-06-18 14:47:09 +02:00
Georg Ehrke
aa7ce480f4 create OC_Calendar_Object::generateStartEndDate function 2012-06-15 12:11:22 +02:00
Georg Ehrke
4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Georg Ehrke
22a33b509f use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod 2012-06-15 11:39:19 +02:00
Georg Ehrke
6f20d51646 fix generateEventOutput for calendar hook 2012-06-15 11:25:29 +02:00
Thomas Tanghus
1e76a530ea No need to find calendar twice. 2012-06-15 00:28:12 +02:00
Georg Ehrke
6bd80d6457 show username of the body who shares in the summary 2012-06-13 22:07:23 +02:00
Lukas Reschke
68f819ee20 Removed double sanitization 2012-06-11 19:47:42 +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