Georg Ehrke
b7a5ae38c5
fix sql command in calendar's share lib
2012-03-26 09:48:58 +02:00
Georg Ehrke
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
Georg Ehrke
33b06c4484
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
Georg Ehrke
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
Bart Visscher
d8cfe77ba5
Contacts: small fixes and cleanups
2012-03-07 21:46:42 +01:00
Georg Ehrke
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
Jakob Sack
503e5cada3
Add /dav.php, a single location bundling all *DAV-operations.
2012-03-02 20:25:20 +01:00
Bart Visscher
d1dcd7893c
Search: Change provider registration to class name, for lazy loading of search providers
2012-03-01 22:59:35 +01:00
Bart Visscher
5dcd9e20d0
Small cleanups
2012-03-01 21:00:23 +01:00
Bart Visscher
fe3bcb5fe2
Calendar: fix bug in creating DTEND from DTSTART
2012-03-01 21:00:22 +01:00
Georg Ehrke
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
Georg Ehrke
1d1dfcbc1a
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
2012-02-24 22:20:40 +01:00
Georg Ehrke
0ae088a50a
add getowner function to OC_Calendar_Object
2012-02-22 10:42:01 +01:00
Georg Ehrke
48f42176cd
add is_editing_allowed function to OC_Calendar_Share
2012-02-22 10:41:16 +01:00
Georg Ehrke
d20b8399c3
clean up sql commands in OC_Calendar_Share
2012-02-22 10:20:58 +01:00
Georg Ehrke
3d8d6d718b
add 'permissions' as a sql condition in allSharedwithuser
2012-02-21 20:10:52 +01:00
Bart Visscher
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
Florian Pritz
9d2379742b
apps/calendar: update ctag after deleteFromDAVData
...
Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-02-19 21:42:47 +01:00
Georg Ehrke
d8734cee02
fix sql command
2012-02-18 11:21:07 +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
e8b69d45a3
Fixup use of OC_Helper::linkTo function
2012-02-17 22:07:14 +01:00
Georg Ehrke
db23ec5c1c
show shared calendars
2012-02-11 14:02:51 +01:00
Georg Ehrke
b810380d56
add sharing management for calendars
2012-02-04 21:23: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
Georg Ehrke
f18e866a1e
improve search function
2012-01-06 14:36:24 +01:00
Georg Ehrke
a01a3d412c
fix autodetection for the week of the month
2012-01-05 17:53:13 +01:00
Georg Ehrke
d3a0c7354c
fix repeat rule for every weekday
2012-01-05 17:09:01 +01:00
Georg Ehrke
ffa835c56f
fix the default setting for yearly repeating events
2011-12-26 19:59:15 +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
Bart Visscher
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
Bart Visscher
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
Bart Visscher
0bbeb13e26
Calendar: Also check if the enddate is in the requested range for events
2011-11-30 21:13:26 +01:00
Bart Visscher
e5fdc6013a
Calendar: Use the default timezone that is set in lib/base.php
2011-11-30 21:13:04 +01:00
Georg Ehrke
3d498002d0
first implementation of the search function
2011-11-14 22:52:34 +01:00
Georg Ehrke
a303992d78
support for repeating events
2011-11-12 22:02:04 +01:00
Georg Ehrke
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
Bart Visscher
b095859a92
Use Last-Modified property to check for changed events
2011-11-09 22:17:09 +01:00
Brice Maron
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
Bart Visscher
55d957489d
Fix fromtime/totime warnings
2011-10-25 19:59:23 +02:00
Bart Visscher
2269f74c27
Fix changing calendar data
2011-10-20 23:49:28 +02:00
Bart Visscher
4075d18050
Implement loading of events in calendar
2011-10-20 23:49:27 +02:00
Bart Visscher
9cfae56df5
Fix calendar colors with new calendar
2011-10-15 11:45:58 +02:00
John Kristensen
ef8826ac2d
remove 'description' from OC_Connector_Sabre_CalDAV propertyMap
...
* the description field was removed in commit:
f3f5d775b5
but the field was still trying to be mapped - causing errors with CalDAV
2011-10-12 15:10:59 +11:00
Marvin Thomas Rabe
f3f5d775b5
removed description field for calendar
2011-10-08 13:28:01 +02:00
Bart Visscher
c9c7d5e1aa
Add support for DURATION in VEVENT
2011-09-28 23:17:26 +02:00
Florian Pritz
842ce24d2b
apps/calendar: check for unset variable
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:07 +02:00
Florian Pritz
ff10303755
apps/calendar: change ctag after modifying event
...
edit() tried to do that, but it used $id which is the event id and not
the calendar id.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:55 +02:00
Florian Pritz
761ba4a379
don't escape new lines in vevent description
...
This ended up as "\n\\n" in the data base and the escaped \n was also
visible in the edit form.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:50 +02:00
Bart Visscher
782069e1fa
Change copyright notice to short form
2011-09-23 22:59:54 +02:00
Bart Visscher
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
Bart Visscher
aad62919da
Small styling fixes
2011-09-20 14:38:16 +02:00
Bart Visscher
7c5e389067
deleteUser function must be static
2011-09-18 17:13:47 +02:00
Bart Visscher
2353f02d9a
Fixes for Calendar app
2011-09-16 00:21:51 +02:00
Bart Visscher
15559d3e88
First implementation of edit event
2011-09-16 00:21:19 +02:00
Bart Visscher
b413dcfa7c
Fix conversion of VTODO and VJOURNAL items
2011-09-16 00:19:43 +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
Florian Jacob
9a5530a48f
Correct deleting events over CalDAV
...
A quick patch that corrects not being able to delete
calendar events. (misnamed variable). Thanks to Robert J. Clark.
2011-09-12 19:50:07 +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
112eccfe33
Support for etags in calendar
2011-08-24 10:19:48 +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