4767c70578
fix merge conflicts
2012-06-15 11:48:26 +02:00
3c75ac5f62
Update calendar after delete.
2012-06-15 02:07:32 +02:00
7a8e7f18db
Calendar: Clicking #datecontrol_date gives datepicker to jump to date
2012-06-13 21:39:12 +02:00
4da6b3a391
Calendar: Make button of #datecontrol_date
2012-06-13 21:39:12 +02:00
3c9be43aa4
add some information about repeating events caching on personal settings page
2012-06-11 22:16:26 +02:00
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +02:00
2862740674
increase height of event dialog
2012-06-09 15:38:03 +02:00
28ab92ee76
make use of post instead of get
2012-06-09 14:41:26 +02:00
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
482caa04f9
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
5e7b318e42
add urlencode for caldav link
2012-05-28 10:49:27 +02:00
a1c9191006
fix share for users with a point within their name
2012-05-26 15:23:46 +02:00
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
6146b6a131
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
0892abd050
some little js fixes for drop import
2012-05-13 15:08:27 +02:00
63a1b066bc
add first version of drop import
2012-05-13 15:05:57 +02:00
da1da8197e
Calendar: Resize content after creating calendar layout
...
The calendar can be higher than the window, this corrects for the scrollbar
2012-05-08 18:40:40 +02:00
ef073a148f
make calendar compatible with public.php
2012-05-07 15:48:41 +02:00
6c908a4cd0
fix path in calendars geo.js
2012-04-30 21:18:54 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
8959e0af3d
implement shared calendar activation on js-side
2012-04-18 11:39:00 +02:00
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
02dc343209
fix address of public shared calendars
2012-04-13 16:26:06 -04:00
9165b5c28e
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
8b9d439841
Calendar: fix address for import file
2012-03-26 15:37:47 +02:00
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
ec2f49833d
Calendar: Don't request edit form for readonly events
2012-03-01 21:00:23 +01:00
8c09330959
add missing parameter to addEventListener function - bugfix for oc-225
2012-02-26 21:29:52 +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
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
cfa284bfa8
update js files for new ajax pathes
2012-02-23 22:06:16 +01:00
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
e227a65f66
Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing
2012-02-21 19:36:42 +01:00
3efa69bc84
update js files for new ajax pathes
2012-02-20 11:27:25 +01:00
6bbd67c3c6
Calendar: only update default view when it really changed
2012-02-17 22:10:02 +01:00
011bc1e764
fix unsharing of groups
2012-02-17 21:19:04 +01:00
01827e9340
Merge branch 'master' into calendar_sharing
2012-02-13 17:08:52 +01:00
40d343e2af
fix oc-bug 239 - & => &
2012-02-12 22:34:10 +01:00
66ac6c232c
fix sharing calendar manager
2012-02-11 13:30:15 +01:00
a8b7ae515c
Merge branch 'master' into calendar_sharing
2012-02-10 19:36:00 +01:00
7c03b612d2
OC-41: [Calendar] Date format not translatable
2012-02-08 21:12:30 +01:00
5e08d1bb40
Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar
2012-02-04 21:27:18 +01:00
b810380d56
add sharing management for calendars
2012-02-04 21:23:31 +01:00
f81ac81550
fix merge conflicts
2012-02-02 17:48:29 +01:00
92b8f32386
Calendar: Bugfix: better input validation
2012-02-02 15:01:05 +01:00
fc70c7094a
add tabs for repeating and attendees in the event form
2012-01-31 11:57:09 +01:00
66f8a0e1a3
validate the calendar name
2012-01-21 17:42:52 +01:00
Georg Ehrke
Thomas Tanghus
Bart Visscher
Thomas Mueller
Georg Ehrke