Commit graph

139 commits

Author SHA1 Message Date
Georg Ehrke
e256ac8791 fix unsharing of events 2012-04-13 21:49:24 -04:00
Georg Ehrke
1e0364baa8 check permission check in share function 2012-04-13 17:16:28 -04:00
Georg Ehrke
afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Georg Ehrke
854eaff34f hide share tab in shared events 2012-04-13 16:20:19 -04:00
Bart Visscher
7cf7d5c3dd Calendar: Also set repeat options when editing a non repeating event 2012-04-13 21:13:58 +02:00
Bart Visscher
28e0d64ede Calendar: Fix saving of Categories in an 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
Georg Ehrke
df2e788a1c fix calendarid in eventform and validation of calendarid 2012-04-12 23:15:19 -04: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
4d884c3849 clean up events.php of calendar 2012-04-07 22:39:37 -04:00
Georg Ehrke
eef9a1e7ed add access check to ajax files 2012-04-07 22:37:26 -04:00
Georg Ehrke
72a43b3929 revert 0fd8b1a044 2012-04-02 08:32:27 -04:00
Georg Ehrke
0fd8b1a044 fix events.php for rewritten OC_Caledar_App class 2012-03-31 16:16:34 -04:00
Georg Ehrke
1f8cf2d8f2 fix name of constants 2012-03-31 13:37:44 +02:00
Georg Ehrke
d15959d573 Merge branch 'master' into calendar_sharing 2012-03-29 23:19:31 +02:00
Georg Ehrke
08b4f996d3 add backslash r to the newline var 2012-03-28 17:06:16 +02: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
0e11cc9f6f fix previous made bug and fix oc bug - oc-139 2012-03-23 17:27:52 +01:00
Georg Ehrke
ac8362e34a check if the title of an event is null - bugfix for oc-139 2012-03-23 17:09:51 +01:00
Georg Ehrke
f2dcab50b5 fix merge conflicts 2012-03-03 15:06:51 +01:00
Georg Ehrke
4c45483ad3 make calendar compatible with php 5.2 - works for me with PHP 5.2.12 2012-03-03 14:30:52 +01:00
Bart Visscher
f914cd0144 Implement showing Birthdays of contacts in the calendar 2012-03-01 21:00:22 +01:00
Bart Visscher
fe3bcb5fe2 Calendar: fix bug in creating DTEND from DTSTART 2012-03-01 21:00:22 +01:00
Georg Ehrke
04c9cc6034 give users the possibility to choose between monday and sunday as first day of the week 2012-02-26 21:23:20 +01:00
Frank Karlitschek
ab96fa67c8 first part of the abstraction work of the apps folder. more to come 2012-02-26 18:26:41 +01:00
Georg Ehrke
89865cb8a0 stop using 3rdparty services for timezone detection 2012-02-26 13:45:51 +01:00
Georg Ehrke
bfb67286c8 fix merge conflicts 2012-02-25 16:54:27 +01:00
Georg Ehrke
b1fb325d48 rename updatecalendar to update 2012-02-23 22:07:31 +01:00
Georg Ehrke
8cd1027214 better var name in changeview.php 2012-02-23 22:00:46 +01:00
Georg Ehrke
b7de1850a0 add moved files to clean up ajax folder 2012-02-23 21:58:39 +01:00
Georg Ehrke
e188b96596 remove old ajax files 2012-02-23 21:58:01 +01:00
Frank Karlitschek
a62e109e8c make the location of the 3rdparty folder flexible.
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
Georg Ehrke
cff0ac2bf9 better permission check in resize.php 2012-02-22 10:42:33 +01:00
Bart Visscher
86d2927c02 Calendar: Correct calendarcolor format for ical color property 2012-02-21 20:10:40 +01:00
Georg Ehrke
236d2aa5b8 rename updatecalendar to update 2012-02-21 19:42:48 +01:00
Georg Ehrke
e227a65f66 Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing 2012-02-21 19:36:42 +01:00
Georg Ehrke
ec7ed3c882 add rw and r to events.php 2012-02-20 11:35:19 +01:00
Georg Ehrke
1cf7fc261f better var name in changeview.php 2012-02-20 11:26:43 +01:00
Georg Ehrke
8dff0fb58d add moved files to clean up ajax folder 2012-02-20 11:26:22 +01:00
Georg Ehrke
ceb0016bdc remove old ajax files 2012-02-20 11:25:42 +01:00
Bart Visscher
539fd7240c Calendar: optimize sending calendar events, also enabled caching of result 2012-02-17 22:09:31 +01:00
Bart Visscher
a33b757b19 Calendar: Add default repeat values when editing a non-repeating event 2012-02-17 22:09:22 +01:00
Georg Ehrke
011bc1e764 fix unsharing of groups 2012-02-17 21:19:04 +01:00
Georg Ehrke
73038156cc check userrights in events.php 2012-02-12 10:40:57 +01:00
Georg Ehrke
db23ec5c1c show shared calendars 2012-02-11 14:02:51 +01:00
Georg Ehrke
9fd07ee10d Merge branch 'master' into calendar 2012-02-08 17:13:50 +01:00
Georg Ehrke
cdf1cf82ba merge 64a617b2a1 into master 2012-02-07 22:49:23 +01:00