Commit graph

296 commits

Author SHA1 Message Date
Georg Ehrke
a8b7ae515c Merge branch 'master' into calendar_sharing 2012-02-10 19:36:00 +01:00
Bart Visscher
7c03b612d2 OC-41: [Calendar] Date format not translatable 2012-02-08 21:12:30 +01:00
Georg Ehrke
9fd07ee10d Merge branch 'master' into calendar 2012-02-08 17:13:50 +01:00
Georg Ehrke
cdf1cf82ba merge 64a617b2a1 into master 2012-02-07 22:49:23 +01:00
Georg Ehrke
55be59e738 Merge branch 'master' into calendar 2012-02-04 21:34:38 +01:00
Georg Ehrke
5e08d1bb40 Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar 2012-02-04 21:27:18 +01:00
Georg Ehrke
b810380d56 add sharing management for calendars 2012-02-04 21:23:31 +01:00
Georg Ehrke
ab31a890b6 use strip_tags for calendar names 2012-02-02 21:23:41 +01:00
Georg Ehrke
bfa69c3e59 add a label calendar to the settings page - bugfix for oc-157 2012-02-02 18:37:06 +01:00
Georg Ehrke
f81ac81550 fix merge conflicts 2012-02-02 17:48:29 +01:00
Georg Ehrke
92b8f32386 Calendar: Bugfix: better input validation 2012-02-02 15:01:05 +01:00
Georg Ehrke
91b705cc4f remove debug file 2012-02-02 12:37:58 +01:00
Georg Ehrke
f870f9efcf validate parameters in changeview.php 2012-02-02 12:18:29 +01:00
Georg Ehrke
39d312861a add active to the db structure of shared calendars 2012-01-31 22:33:39 +01:00
Georg Ehrke
2b8ec1cad0 Calendar: fix html of import dialog 2012-01-31 22:03:08 +01:00
Georg Ehrke
153467dbe0 add share as a tab 2012-01-31 21:39:40 +01:00
Georg Ehrke
3a5d3dfd97 increase version number to force db upgrade 2012-01-31 21:33:50 +01:00
Georg Ehrke
32bff22dc7 change db structure of calendar for sharing calendars 2012-01-31 21:26:09 +01:00
Georg Ehrke
64a617b2a1 fix all day with one day to much - bugfix for oc-126 2012-01-31 20:46:27 +01:00
Georg Ehrke
149bbeb260 make tab names translatable 2012-01-31 17:15:25 +01:00
Georg Ehrke
c72c4dd412 add alarm as a tab 2012-01-31 16:59:34 +01:00
Georg Ehrke
4c1fb4c282 fix style of the tabs 2012-01-31 16:49:21 +01:00
Georg Ehrke
fc70c7094a add tabs for repeating and attendees in the event form 2012-01-31 11:57:09 +01:00
Georg Ehrke
30f1de71a6 remove debug file 2012-01-29 16:08:09 +01:00
Georg Ehrke
928e9b121b fix version-compare in calendars app.php 2012-01-29 10:59:15 +01:00
Robin Appelman
ad4e305c96 update translations 2012-01-27 00:59:24 +01:00
Robin Appelman
830cf87697 use the correct hooks to remove contact/calendars of remvoed users 2012-01-26 19:05:46 +01:00
Robin Appelman
6fccf12299 update translations 2012-01-24 00:42:08 +01:00
Robin Appelman
cdfb252ced Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-24 00:24:09 +01:00
Georg Ehrke
b8e01939e9 fix undefined indices - bugfix for oc-99 2012-01-23 15:05:53 +01:00
Georg Ehrke
66f8a0e1a3 validate the calendar name 2012-01-21 17:42:52 +01:00
Georg Ehrke
78c5c2e7d5 fix Undefined variable - bugfix for oc-69 2012-01-21 17:42:52 +01:00
Robin Appelman
7ea2923fa8 translation updates 2012-01-20 18:53:45 +01:00
Bart Visscher
ccad24a925 [Calendar] Use class for active view button 2012-01-19 21:00:19 +01:00
Bart Visscher
838766add0 OC-23: [Calendar] Double vertical scrollbar in week view 2012-01-19 20:50:22 +01:00
Georg Ehrke
ce13b3b7cd fix double new calendar button - bugfix for oc 59 2012-01-19 12:27:16 +01:00
Georg Ehrke
69ca0ae177 move loading icon to the top bar 2012-01-17 19:48:29 +01:00
Georg Ehrke
1f95231801 use button for new calendar 2012-01-17 19:09:11 +01:00
Georg Ehrke
6e86b34586 Merge branch 'master' into calendar 2012-01-17 15:57:29 +01:00
Georg Ehrke
91016e37d4 fix ocbug 34 2012-01-17 15:38:32 +01:00
Georg Ehrke
42b1c75a66 fix ocbug 24 2012-01-17 15:18:01 +01:00
Georg Ehrke
2179437726 use timepicker to force users to use HH:MM 2012-01-16 20:22:54 +01:00
Robin Appelman
965ea96439 update translations 2012-01-16 17:34:53 +01:00
Georg Ehrke
c81beab96d Merge branch 'master' into calendar 2012-01-15 18:33:46 +01:00
Georg Ehrke
3364502f00 use svg icon for calendar 2012-01-15 18:29:44 +01:00
Robin Appelman
7cd809b286 update translations 2012-01-15 15:12:58 +01:00
Georg Ehrke
ec3955b158 change description of the changed colors (calendar) 2012-01-15 10:58:39 +01:00
Georg Ehrke
cf1023567b change calendar colors 2012-01-15 10:52:07 +01:00
Georg Ehrke
360778e520 use backslash n instead of a real new line 2012-01-15 00:56:11 +01:00
Georg Ehrke
43f7b2fd2d fix newline problem in calendar 2012-01-15 00:45:27 +01:00