2fa19ce9a0
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
091b343d5c
Calendar & Contacts: Store import progress in OC_Cache
...
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
46b3b30d46
add status
...
file for repeating events caching
2012-06-01 13:47:48 +02:00
e75146a811
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
2ae58ee6c0
Calendar: small cleanup of import progress writing
2012-05-31 13:01:30 +02:00
482caa04f9
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
1c1ed52867
fix status
...
of timezone detection
2012-05-29 13:14:36 +02:00
75afc09b9d
fix status
...
of timezone detection
2012-05-29 13:14:05 +02:00
ad66bb9c84
Merge branch 'calendar_dropimport'
2012-05-19 18:58:24 +02:00
07fa8da278
fix for calendar
2012-05-19 15:05:58 +02:00
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
18c8896b3c
better user permission check for files in ajax/calendar/
2012-05-14 15:59:06 +02:00
9c8eb104b6
check user permissions in calendar's changepermission.php
2012-05-14 15:42:16 +02:00
55eb318265
check user permissions in calendar's unshare.php
2012-05-14 15:42:16 +02:00
62a86748b5
Merge branch 'master' into calendar_dropimport
2012-05-13 15:06:02 +02:00
63a1b066bc
add first version of drop import
2012-05-13 15:05:57 +02:00
f45411f79d
fix another php notice
2012-05-13 12:25:26 +02:00
f6dc158d51
fix php notice and displaying of events
2012-05-13 12:02:36 +02:00
4094f6f8e0
Correct undef variable mistake from prev commit
2012-05-10 19:51:03 +00:00
ffe5ef2268
Correct calendar loading when calendar are from hooks. fix oc-619
2012-05-10 19:36:30 +00:00
99db3c01ee
fix bug in events.php
2012-05-09 17:36:48 +02:00
cdf5d4e231
fix for previous commit
2012-05-08 08:49:14 +02:00
0ce1cbdd14
fix calendar vulnerability
2012-05-08 08:46:27 +02:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
1fef13b0c0
Calendar: Use array_merge to join event arrays
2012-05-04 17:34:13 +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
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
4fe90f62f4
port checkAppEnabled
2012-05-02 19:08:37 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
254b8b9506
porting of OC_User to public API complete.
...
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
5bf69237b2
ported isLoggedIn
2012-05-01 18:46:15 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
8a3d41c043
fix a PHP Notice
2012-04-30 21:46:33 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +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
e256ac8791
fix unsharing of events
2012-04-13 21:49:24 -04:00
1e0364baa8
check permission check in share function
2012-04-13 17:16:28 -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
854eaff34f
hide share tab in shared events
2012-04-13 16:20:19 -04:00
7cf7d5c3dd
Calendar: Also set repeat options when editing a non repeating event
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
64d3301523
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -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
4d884c3849
clean up events.php of calendar
2012-04-07 22:39:37 -04:00
eef9a1e7ed
add access check to ajax files
2012-04-07 22:37:26 -04:00
72a43b3929
revert 0fd8b1a044
2012-04-02 08:32:27 -04:00
0fd8b1a044
fix events.php for rewritten OC_Caledar_App class
2012-03-31 16:16:34 -04:00
1f8cf2d8f2
fix name of constants
2012-03-31 13:37:44 +02:00
90286353e2
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
71b32f7ad4
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
ac0c5ba6da
Merge branch 'master' into sabredav_1.6
2012-03-25 14:02:40 +02:00
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
0e11cc9f6f
fix previous made bug and fix oc bug - oc-139
2012-03-23 17:27:52 +01:00
ac8362e34a
check if the title of an event is null - bugfix for oc-139
2012-03-23 17:09:51 +01:00
33b06c4484
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
4c45483ad3
make calendar compatible with php 5.2 - works for me with PHP 5.2.12
2012-03-03 14:30:52 +01:00
f914cd0144
Implement showing Birthdays of contacts in the calendar
2012-03-01 21:00:22 +01:00
fe3bcb5fe2
Calendar: fix bug in creating DTEND from DTSTART
2012-03-01 21:00:22 +01:00
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
ab96fa67c8
first part of the abstraction work of the apps folder. more to come
2012-02-26 18:26:41 +01:00
89865cb8a0
stop using 3rdparty services for timezone detection
2012-02-26 13:45:51 +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
b1fb325d48
rename updatecalendar to update
2012-02-23 22:07:31 +01:00
8cd1027214
better var name in changeview.php
2012-02-23 22:00:46 +01:00
b7de1850a0
add moved files to clean up ajax folder
2012-02-23 21:58:39 +01:00
e188b96596
remove old ajax files
2012-02-23 21:58:01 +01:00
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
cff0ac2bf9
better permission check in resize.php
2012-02-22 10:42:33 +01:00
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
236d2aa5b8
rename updatecalendar to update
2012-02-21 19:42:48 +01:00
e227a65f66
Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing
2012-02-21 19:36:42 +01:00
ec7ed3c882
add rw and r to events.php
2012-02-20 11:35:19 +01:00
1cf7fc261f
better var name in changeview.php
2012-02-20 11:26:43 +01:00
8dff0fb58d
add moved files to clean up ajax folder
2012-02-20 11:26:22 +01:00
ceb0016bdc
remove old ajax files
2012-02-20 11:25:42 +01:00
539fd7240c
Calendar: optimize sending calendar events, also enabled caching of result
2012-02-17 22:09:31 +01:00
a33b757b19
Calendar: Add default repeat values when editing a non-repeating event
2012-02-17 22:09:22 +01:00
011bc1e764
fix unsharing of groups
2012-02-17 21:19:04 +01:00
62da0bae43
Handle event exceptions in calendar app. Execeptions to recurring events are not shown anymore.
2012-02-17 14:32:02 +01:00
73038156cc
check userrights in events.php
2012-02-12 10:40:57 +01:00
db23ec5c1c
show shared calendars
2012-02-11 14:02:51 +01:00
Georg Ehrke
Bart Visscher
Thomas Mueller
Brice Maron
Frank Karlitschek
Robin Appelman
Frank Karlitschek
Georg Ehrke
Henning Becker