Bart Visscher
|
1fef13b0c0
|
Calendar: Use array_merge to join event arrays
|
2012-05-04 17:34:13 +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 |
Thomas Mueller
|
07f2e316e4
|
removing executable bit from various files
|
2012-04-30 12:05:57 +02:00 |
Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
|
Georg Ehrke
|
4c2cf35050
|
fix merge conflicts
|
2012-04-22 13:19:12 +02:00 |
|
Georg Ehrke
|
0918fc7d91
|
fix merge conflicts
|
2012-04-21 23:21:50 +02:00 |
|
Georg Ehrke
|
69ee0efc0b
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
|
Georg Ehrke
|
77cefdedb8
|
Merge branch 'master' into sabredav_1.6
|
2012-04-15 22:28:11 +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 |
|
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
|
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
|
ac0c5ba6da
|
Merge branch 'master' into sabredav_1.6
|
2012-03-25 14:02:40 +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
|
33b06c4484
|
Merge branch 'master' into sabredav_1.6
|
2012-03-19 08:33:36 +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
|
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 |
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
|
ec7ed3c882
|
add rw and r to events.php
|
2012-02-20 11:35:19 +01:00 |
|
Bart Visscher
|
539fd7240c
|
Calendar: optimize sending calendar events, also enabled caching of result
|
2012-02-17 22:09:31 +01:00 |
Henning Becker
|
62da0bae43
|
Handle event exceptions in calendar app. Execeptions to recurring events are not shown anymore.
|
2012-02-17 14:32:02 +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
|
cdf1cf82ba
|
merge 64a617b2a1 into master
|
2012-02-07 22:49:23 +01:00 |
|
Georg Ehrke
|
92b8f32386
|
Calendar: Bugfix: better input validation
|
2012-02-02 15:01:05 +01:00 |
|
Georg Ehrke
|
8ee53708ae
|
use pre-decrement instead of post-decrement
|
2011-12-25 15:07:53 +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
|
e5fdc6013a
|
Calendar: Use the default timezone that is set in lib/base.php
|
2011-11-30 21:13:04 +01:00 |
|
Georg Ehrke
|
89b3a395df
|
fix timezone for repeating events
|
2011-11-12 22:30:09 +01:00 |
|
Georg Ehrke
|
a303992d78
|
support for repeating events
|
2011-11-12 22:02:04 +01:00 |
|
Bart Visscher
|
b095859a92
|
Use Last-Modified property to check for changed events
|
2011-11-09 22:17:09 +01:00 |
|
Bart Visscher
|
c65e417666
|
Use parse function in Calendar_Object
|
2011-11-09 22:16:24 +01:00 |
Georg Ehrke
|
433b57c315
|
fix new allday bug
|
2011-10-21 22:59:26 +02:00 |
|
Georg Ehrke
|
d50b014aba
|
fix allday bug
|
2011-10-21 22:47:31 +02:00 |
|
Bart Visscher
|
96002c8c8f
|
Implement listview for fullcalendar
|
2011-10-20 23:49:29 +02:00 |
|
Bart Visscher
|
bb5ccc5731
|
Connect popup to fullcalendar
|
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 |