Thomas Mueller
|
89ab3bae90
|
adding space between) and {
|
2012-09-07 15:21:03 +02:00 |
|
Georg Ehrke
|
51d002c1a3
|
fix calendar
|
2012-06-21 16:24:05 +02:00 |
|
Georg Ehrke
|
683af756cb
|
Merge branch 'master' into calendar_repeat
|
2012-06-20 20:14:08 +02:00 |
|
Bjoern Schiessle
|
b14a6c4067
|
use sanitizeHTML() function
|
2012-06-20 15:11:14 +02:00 |
|
Georg Ehrke
|
c419c8bce1
|
Merge branch 'master' into calendar_repeat
|
2012-06-16 09:35:53 +02:00 |
|
Bart Visscher
|
54f263b258
|
Calendar: Write-close session to enable parallel events.php requests
|
2012-06-16 00:44:23 +02:00 |
|
Georg Ehrke
|
0afd453b06
|
fix merge conflicts
|
2012-06-15 11:48:26 +02:00 |
|
Thomas Tanghus
|
382d357ecc
|
Make events show again.
|
2012-06-15 00:26:34 +02:00 |
|
Georg Ehrke
|
0f2e7f9192
|
show username of the body who shares in the summary
|
2012-06-13 22:07:23 +02:00 |
|
Georg Ehrke
|
fc828e6630
|
remove include command for when
|
2012-06-10 18:41:17 +02:00 |
|
Thomas Mueller
|
4af9ab5d8d
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
|
Georg Ehrke
|
19f0d080db
|
fix php notice and displaying of events
|
2012-05-13 12:02:36 +02:00 |
|
Brice Maron
|
a7fe85c6fb
|
Correct undef variable mistake from prev commit
|
2012-05-10 19:51:03 +00:00 |
|
Brice Maron
|
7a19e3583e
|
Correct calendar loading when calendar are from hooks. fix oc-619
|
2012-05-10 19:36:30 +00:00 |
|
Georg Ehrke
|
842b077888
|
fix bug in events.php
|
2012-05-09 17:36:48 +02:00 |
|
Georg Ehrke
|
e94373322f
|
fix for previous commit
|
2012-05-08 08:49:14 +02:00 |
|
Georg Ehrke
|
ac964334db
|
fix calendar vulnerability
|
2012-05-08 08:46:27 +02:00 |
|
Bart Visscher
|
1c1475ec4f
|
Calendar: Use array_merge to join event arrays
|
2012-05-04 17:34:13 +02:00 |
|
Bart Visscher
|
8b7dec4031
|
Calendar: Fix repeating events
|
2012-05-03 23:33:44 +02:00 |
|
Bart Visscher
|
e939d31720
|
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
|
c7b935ada8
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Thomas Mueller
|
3f052f6d20
|
removing executable bit from various files
|
2012-04-30 12:05:57 +02:00 |
|
Georg Ehrke
|
490794bd0f
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
|
Georg Ehrke
|
3a8d8ca727
|
fix merge conflicts
|
2012-04-22 13:19:12 +02:00 |
|
Georg Ehrke
|
58102e4f8b
|
fix merge conflicts
|
2012-04-21 23:21:50 +02:00 |
|
Georg Ehrke
|
3822b9d130
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
|
Georg Ehrke
|
58e3d3d308
|
Merge branch 'master' into sabredav_1.6
|
2012-04-15 22:28:11 +02:00 |
|
Georg Ehrke
|
e2cc51f1b2
|
fix merge conflicts
|
2012-04-15 12:43:07 +02:00 |
|
Robin Appelman
|
8259890cb5
|
reuse OC_L10N objects
|
2012-04-14 16:44:15 +02:00 |
|
Georg Ehrke
|
bb8b0c6674
|
fix view of single shared events
|
2012-04-07 22:54:38 -04:00 |
|
Georg Ehrke
|
0b051e9c36
|
fix path and class name
|
2012-04-07 22:45:44 -04:00 |
|
Georg Ehrke
|
3c182d384f
|
clean up events.php of calendar
|
2012-04-07 22:39:37 -04:00 |
|
Georg Ehrke
|
1f6c6d70be
|
revert 0fd8b1a04430fc36bd62a0828530dc2bc3910e81
|
2012-04-02 08:32:27 -04:00 |
|
Georg Ehrke
|
0c0de05363
|
fix events.php for rewritten OC_Caledar_App class
|
2012-03-31 16:16:34 -04:00 |
|
Georg Ehrke
|
124da7a8d3
|
Merge branch 'master' into sabredav_1.6
|
2012-03-25 14:02:40 +02:00 |
|
Georg Ehrke
|
ee6da78c15
|
fix merge conflicts
|
2012-03-25 14:02:02 +02:00 |
|
Georg Ehrke
|
f3555063fe
|
fix previous made bug and fix oc bug - oc-139
|
2012-03-23 17:27:52 +01:00 |
|
Georg Ehrke
|
8dd2f1b945
|
check if the title of an event is null - bugfix for oc-139
|
2012-03-23 17:09:51 +01:00 |
|
Georg Ehrke
|
6db7b4c5fb
|
Merge branch 'master' into sabredav_1.6
|
2012-03-19 08:33:36 +01:00 |
|
Georg Ehrke
|
b51c938c08
|
fix merge conflicts
|
2012-03-03 15:06:51 +01:00 |
|
Georg Ehrke
|
9ccfafd787
|
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
|
15e7cf829c
|
Implement showing Birthdays of contacts in the calendar
|
2012-03-01 21:00:22 +01:00 |
|
Bart Visscher
|
23f7b05f93
|
Calendar: fix bug in creating DTEND from DTSTART
|
2012-03-01 21:00:22 +01:00 |
|
Georg Ehrke
|
11505801a9
|
fix merge conflicts
|
2012-02-25 16:54:27 +01:00 |
|
Georg Ehrke
|
37c0f664b8
|
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
|
2012-02-24 22:20:40 +01:00 |
|
Frank Karlitschek
|
90ed5ac5e7
|
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
|
45ca11be4c
|
add rw and r to events.php
|
2012-02-20 11:35:19 +01:00 |
|
Bart Visscher
|
9ee9a846f6
|
Calendar: optimize sending calendar events, also enabled caching of result
|
2012-02-17 22:09:31 +01:00 |
|
Henning Becker
|
1ca92cd700
|
Handle event exceptions in calendar app. Execeptions to recurring events are not shown anymore.
|
2012-02-17 14:32:02 +01:00 |
|
Georg Ehrke
|
df36d8f08e
|
check userrights in events.php
|
2012-02-12 10:40:57 +01:00 |