01bd048bb3
remove insert id
2012-06-11 15:01:48 +02:00
40459c8c66
some work on repeating events caching - basic class should work now :)
2012-06-11 15:00:51 +02:00
ece1162949
use native sabredav functions to generate repeating events
2012-06-11 10:55:26 +02:00
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +02:00
bdb76d4873
Merge branch 'master' into calendar_export
2012-06-10 18:37:16 +02:00
009fbd89b4
fix creation of monthly repeated events
2012-06-09 15:40:27 +02:00
cfb9c764ca
fix creation of monthly repeated events
2012-06-09 15:15:00 +02:00
a9b561430a
add hooks for events
2012-06-09 12:30:09 +02:00
7ed30649bb
add hooks for calendars
2012-06-09 12:18:25 +02:00
cac995ee9f
some more work on repeating events caching
2012-06-09 11:49:25 +02:00
ac74d87e3e
some work on repeating events caching
2012-06-08 22:22:16 +02:00
2fa19ce9a0
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
d8d558377c
Merge branch 'master' into calendar_export
2012-06-06 10:11:34 +02:00
44260a552c
xss vulnerability fixed
2012-06-05 10:49:36 +02:00
dcc5b5ca0a
xss vulnerability fixed
2012-06-05 10:37:22 +02:00
6560f1d894
don't change events timezone and remove the DTSTART value tag
2012-06-04 12:28:05 +02:00
c2a51d1f48
proper export for calendar app - doesn't work with apple ical yet - even though a ics validator says it's valid
2012-06-03 14:54:53 +02:00
7a8e322679
some work for repeating events caching
2012-06-01 11:30:54 +02:00
29b17672b4
a bit of work for repeating events caching
2012-05-29 19:46:17 +02:00
a56f2dbce7
Merge branch 'master' into calendar_repeat
2012-05-29 13:16:08 +02:00
d1f0261b5d
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:57:52 +00:00
22cd0f1cda
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:41:39 +00:00
7d49bf7f6e
some changes in calendar repeat class
2012-05-18 11:48:18 +02:00
f7366de673
Merge branch 'master' into calendar_repeat
2012-05-17 22:17:23 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
ddf0903ace
add post user delete hook for calendar sharing
2012-05-13 20:03:52 +02:00
dfef36ba2f
some changes for calendar repeat class
2012-05-12 23:16:11 +02:00
b1cae9651e
add functions get cached events in a specific time period
2012-05-12 23:00:21 +02:00
dc34ed5a12
Merge branch 'master' into calendar_repeat
2012-05-12 22:55:35 +02:00
ffe5ef2268
Correct calendar loading when calendar are from hooks. fix oc-619
2012-05-10 19:36:30 +00:00
9dbc6b5158
Correct wrong DB quotes for calendar share functions
2012-05-06 15:41:14 +00:00
f75a7c084f
add class for repeating events
2012-05-01 16:16:12 +02:00
d854e4a144
Calendar: fix return of insert id
2012-05-05 22:32:55 +02:00
2facf509cc
Merge branch 'tasks' for Tasks app
2012-05-05 18:26:13 +02:00
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
1e47156226
Merge branch 'master' into tasks
2012-05-04 17:04:11 +02:00
07ff1e723a
Calendar: Fix repeating events
2012-05-03 23:33:44 +02:00
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
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
9b1d6246a9
Remove useless, unmaintained dav.php
2012-04-15 16:50:44 +02:00
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
029e1aced7
Tasks: Update to use new categories interface
2012-04-14 14:55:37 +02:00
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02:00
ea3499a712
fix class name
2012-04-13 17:26:34 -04:00
77a9e343aa
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
4c52007996
Calendar: Update category list when updating/adding event
2012-04-13 21:13:58 +02:00
471e735b0c
Calendar: Document active parameter in allCalendars
2012-04-13 21:13:58 +02:00
28e0d64ede
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
f9b7ed3a1f
Calendar: Implement rescan of Categories
2012-04-13 21:13:58 +02:00
df2e788a1c
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
a7908ba76b
fix bugs in share class
2012-04-12 22:11:48 -04:00
9165b5c28e
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
b2011bd0a0
Remove unused function getCategoryOptions from OC_Calendar_Object
2012-04-12 23:10:49 +02:00
0f16935763
fix bugs and optimize OC_Calendar_Object Class
2012-04-11 10:21:45 -04:00
64d3301523
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
eaa649cfb2
fix bug in share lib of calendar
2012-04-10 11:18:02 -04:00
9294a95438
fix view of single shared events
2012-04-07 22:54:38 -04:00
960553f9c4
fix path and class name
2012-04-07 22:45:44 -04:00
e940152bce
fix bugs in share lib of calendar
2012-04-07 22:39:02 -04:00
e18c0d54f6
add output functions and access function to app.php of calendar
2012-04-07 22:35:29 -04:00
ca2c7001c4
remove unused code in OC_Calendar_App class
2012-03-31 16:15:04 -04:00
70237f7ecc
rewrite OC_Calendar_APP class
2012-03-31 16:13:04 -04:00
10fc51dc92
add public sharing fir calendars and events - add function in Share class
2012-03-31 16:12:27 -04:00
179bf15daf
fix group sql generator in calendar's share lib
2012-03-26 15:30:04 +02:00
71b32f7ad4
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
b7a5ae38c5
fix sql command in calendar's share lib
2012-03-26 09:48:58 +02:00
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
33b06c4484
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
d8cfe77ba5
Contacts: small fixes and cleanups
2012-03-07 21:46:42 +01:00
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
503e5cada3
Add /dav.php, a single location bundling all *DAV-operations.
2012-03-02 20:25:20 +01:00
d1dcd7893c
Search: Change provider registration to class name, for lazy loading of search providers
2012-03-01 22:59:35 +01:00
5dcd9e20d0
Small cleanups
2012-03-01 21:00:23 +01:00
fe3bcb5fe2
Calendar: fix bug in creating DTEND from DTSTART
2012-03-01 21:00:22 +01:00
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
1d1dfcbc1a
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
2012-02-24 22:20:40 +01:00
0ae088a50a
add getowner function to OC_Calendar_Object
2012-02-22 10:42:01 +01:00
48f42176cd
add is_editing_allowed function to OC_Calendar_Share
2012-02-22 10:41:16 +01:00
d20b8399c3
clean up sql commands in OC_Calendar_Share
2012-02-22 10:20:58 +01:00
3d8d6d718b
add 'permissions' as a sql condition in allSharedwithuser
2012-02-21 20:10:52 +01:00
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
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
d8734cee02
fix sql command
2012-02-18 11:21:07 +01:00
539fd7240c
Calendar: optimize sending calendar events, also enabled caching of result
2012-02-17 22:09:31 +01:00
e8b69d45a3
Fixup use of OC_Helper::linkTo function
2012-02-17 22:07:14 +01:00
4cc3a3096a
Server verhindert beim OSX Client einen Delete
2012-02-13 23:48:22 +01:00
db23ec5c1c
show shared calendars
2012-02-11 14:02:51 +01:00
b810380d56
add sharing management for calendars
2012-02-04 21:23:31 +01:00
ec3955b158
change description of the changed colors (calendar)
2012-01-15 10:58:39 +01:00
cf1023567b
change calendar colors
2012-01-15 10:52:07 +01:00
d92b083c1d
fix old calendar name and color not being preserved when editing a calendar
2012-01-11 01:53:25 +01:00
f18e866a1e
improve search function
2012-01-06 14:36:24 +01:00
a01a3d412c
fix autodetection for the week of the month
2012-01-05 17:53:13 +01:00
d3a0c7354c
fix repeat rule for every weekday
2012-01-05 17:09:01 +01:00
ffa835c56f
fix the default setting for yearly repeating events
2011-12-26 19:59:15 +01:00
9eef57faed
make repeating events editable
2011-12-25 23:19:49 +01:00
4eb36b0ecf
Calendar: refactor common ajax functions to OC_Calendar_App
2011-12-18 23:10:42 +01:00
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
0bbeb13e26
Calendar: Also check if the enddate is in the requested range for events
2011-11-30 21:13:26 +01:00
e5fdc6013a
Calendar: Use the default timezone that is set in lib/base.php
2011-11-30 21:13:04 +01:00
3d498002d0
first implementation of the search function
2011-11-14 22:52:34 +01:00
a303992d78
support for repeating events
2011-11-12 22:02:04 +01:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
b095859a92
Use Last-Modified property to check for changed events
2011-11-09 22:17:09 +01:00
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
55d957489d
Fix fromtime/totime warnings
2011-10-25 19:59:23 +02:00
2269f74c27
Fix changing calendar data
2011-10-20 23:49:28 +02:00
4075d18050
Implement loading of events in calendar
2011-10-20 23:49:27 +02:00
9cfae56df5
Fix calendar colors with new calendar
2011-10-15 11:45:58 +02:00
ef8826ac2d
remove 'description' from OC_Connector_Sabre_CalDAV propertyMap
...
* the description field was removed in commit:
f3f5d775b5
2011-10-12 15:10:59 +11:00
f3f5d775b5
removed description field for calendar
2011-10-08 13:28:01 +02:00
c9c7d5e1aa
Add support for DURATION in VEVENT
2011-09-28 23:17:26 +02:00
842ce24d2b
apps/calendar: check for unset variable
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:07 +02:00
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
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
782069e1fa
Change copyright notice to short form
2011-09-23 22:59:54 +02:00
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
aad62919da
Small styling fixes
2011-09-20 14:38:16 +02:00
7c5e389067
deleteUser function must be static
2011-09-18 17:13:47 +02:00
2353f02d9a
Fixes for Calendar app
2011-09-16 00:21:51 +02:00
15559d3e88
First implementation of edit event
2011-09-16 00:21:19 +02:00
b413dcfa7c
Fix conversion of VTODO and VJOURNAL items
2011-09-16 00:19:43 +02:00
388b14604a
Move Calendar Object code to its own class OC_Calendar_Object
2011-09-16 00:19:43 +02:00
4d7ed0f2f5
Add documentation to calendar.php
2011-09-15 22:45:58 +02:00
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
1afeb5cd12
bug fixes in calendar lib
2011-09-10 10:52:35 +02:00
3130234640
Remove execute permissions from source files
2011-09-03 22:15:23 +02:00
5678d78d54
new changes (e.g. show events) by Bart Visscher
2011-08-31 20:20:46 +02:00
9a60313c3b
commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar
2011-08-31 17:29:38 +02:00
112eccfe33
Support for etags in calendar
2011-08-24 10:19:48 +02:00
c87cee6b1f
Add VJOURNAL to objects that are allowed by default
2011-08-23 22:10:08 +02:00
778404fb29
VTODO and VJOURNAL exist as well
2011-08-23 22:07:40 +02:00
84761b1518
CalDAV seems to work now
2011-08-23 21:42:15 +02:00
fbb63f11e4
Some more work on CalDAV integration
2011-08-22 16:59:16 +02:00
414e5e174d
merge Georgs calendar
2011-08-11 11:22:07 +02:00
Georg Ehrke
Bjoern Schiessle
Brice Maron
Thomas Mueller
Bart Visscher
Frank Karlitschek
Jakob Sack
Robin Appelman
Georg Ehrke
Florian Pritz
Steven
Robin Appelman
John Kristensen
Marvin Thomas Rabe
Jakob Sack
Florian Jacob
Georg Ehrke