Georg Ehrke
|
dc18e65b46
|
fix merge conflicts
|
2012-04-15 22:26:55 +02:00 |
Jakob Sack
|
0b426b5e64
|
Display correct URL in caldav and carddav paths
|
2012-04-15 16:50:45 +02:00 |
|
Georg Ehrke
|
e256ac8791
|
fix unsharing of events
|
2012-04-13 21:49:24 -04:00 |
|
Georg Ehrke
|
5d4c546693
|
fix public sharing of calendars
|
2012-04-13 17:36:47 -04:00 |
|
Georg Ehrke
|
afcb0aee40
|
fix merge conflicts
|
2012-04-13 16:40:10 -04:00 |
|
Georg Ehrke
|
02dc343209
|
fix address of public shared calendars
|
2012-04-13 16:26:06 -04:00 |
|
Georg Ehrke
|
854eaff34f
|
hide share tab in shared events
|
2012-04-13 16:20:19 -04:00 |
Bart Visscher
|
28e0d64ede
|
Calendar: Fix saving of Categories in an event
|
2012-04-13 21:13:58 +02:00 |
|
Georg Ehrke
|
df2e788a1c
|
fix calendarid in eventform and validation of calendarid
|
2012-04-12 23:15:19 -04:00 |
|
Bart Visscher
|
9165b5c28e
|
Use the same category input and management as the contacts app
|
2012-04-12 23:10:49 +02:00 |
|
Georg Ehrke
|
64d3301523
|
make shared events editable and add (empty) classes for alarm and attendees
|
2012-04-10 16:03:38 -04:00 |
|
Georg Ehrke
|
5a4237a31d
|
make dropdown menu work with single event sharing
|
2012-04-07 22:41:24 -04:00 |
|
Georg Ehrke
|
97d216c94d
|
add dropdown to eventform
|
2012-04-07 22:40:20 -04:00 |
|
Georg Ehrke
|
a88305b4cb
|
remove share tab from read only event dialog
|
2012-03-31 13:11:30 +02:00 |
|
Georg Ehrke
|
c384e3ba4f
|
fix width of dropdown to select monthdays - bugfix oc-354
|
2012-03-27 09:24:55 +02:00 |
|
Georg Ehrke
|
f479105f5e
|
optimize choosecalendar dialog for shared calendars
|
2012-03-26 16:01:55 +02:00 |
|
Georg Ehrke
|
10ef01b04b
|
fix displayed username of person who shares
|
2012-03-26 15:44:24 +02:00 |
|
Georg Ehrke
|
71b32f7ad4
|
add read only 'form' for shared events
|
2012-03-26 15:24:43 +02:00 |
|
Georg Ehrke
|
eaa1074ccb
|
Merge branch 'master' into calendar_sharing
|
2012-03-17 13:59:00 +01:00 |
Tom Needham
|
122f7e4c2f
|
Dont truncate the time format
|
2012-03-17 12:41:16 +00:00 |
|
Georg Ehrke
|
f2dcab50b5
|
fix merge conflicts
|
2012-03-03 15:06:51 +01:00 |
|
Georg Ehrke
|
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 |
|
Georg Ehrke
|
bfb67286c8
|
fix merge conflicts
|
2012-02-25 16:54:27 +01:00 |
Marvin Thomas Rabe
|
9df193f051
|
Calendar selection only available if there are more than one.
|
2012-02-23 22:28:14 +01:00 |
Georg Ehrke
|
f285790fa1
|
change links in the event form for the new ajax folders
|
2012-02-23 22:07:08 +01:00 |
|
Georg Ehrke
|
319e93f7fb
|
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
|
2012-02-23 22:06:43 +01:00 |
|
Georg Ehrke
|
70a369e16d
|
change links in the event form for the new ajax folders
|
2012-02-21 19:16:14 +01:00 |
|
Georg Ehrke
|
0ae2e250f5
|
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
|
2012-02-20 11:52:19 +01:00 |
|
Bart Visscher
|
f47444e1f7
|
Use separate function to make absolute urls
|
2012-02-17 22:07:14 +01:00 |
|
Georg Ehrke
|
66ac6c232c
|
fix sharing calendar manager
|
2012-02-11 13:30:15 +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
|
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
|
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
|
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
|
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 |
|
Bart Visscher
|
ccad24a925
|
[Calendar] Use class for active view button
|
2012-01-19 21:00:19 +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
|
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
|
b1433119cc
|
highlight the current view
|
2012-01-15 00:06:26 +01:00 |
|
Georg Ehrke
|
868cf46290
|
improve import function
|
2012-01-14 14:22:30 +01:00 |
|
Georg Ehrke
|
f9c4975a45
|
improve import form for calendar
|
2012-01-13 13:57:46 +01:00 |
|
Georg Ehrke
|
c3cda81577
|
update calendar pot file
|
2012-01-07 18:30:32 +01:00 |
|
Georg Ehrke
|
67a8ae084a
|
fix search function
|
2012-01-07 14:31:47 +01:00 |
|
Georg Ehrke
|
f18e866a1e
|
improve search function
|
2012-01-06 14:36:24 +01:00 |
|
Georg Ehrke
|
e6739d230e
|
add function to detect always the timezone
|
2012-01-02 11:35:50 +01:00 |
|
Georg Ehrke
|
3bb11db943
|
Merge branch 'master' into calendar
|
2011-12-29 19:16:33 +01:00 |
|
Bart Visscher
|
5fd595c0bf
|
Calendar: add loading indicator
|
2011-12-27 21:50:31 +01:00 |
|
Georg Ehrke
|
9eef57faed
|
make repeating events editable
|
2011-12-25 23:19:49 +01:00 |
|
Georg Ehrke
|
a38778f911
|
fix timeformat setting for fullcalendar
|
2011-11-20 14:23:26 +01:00 |
|
Georg Ehrke
|
eea20e51d8
|
another fix of caldav url
|
2011-11-12 16:13:27 +01:00 |
|
Georg Ehrke
|
e5a3ab8aad
|
Merge branch 'master' into fullcalendar
|
2011-11-12 15:09:37 +01:00 |
|
Georg Ehrke
|
03d9fab3c0
|
fix caldav url
|
2011-11-12 14:06:14 +01:00 |
|
Georg Ehrke
|
26272c4252
|
automatic timezone detection
|
2011-11-11 15:51:44 +01:00 |
|
Bart Visscher
|
ef124c3e21
|
Use a function to generate select options
|
2011-11-09 22:19:52 +01:00 |
|
Bart Visscher
|
b095859a92
|
Use Last-Modified property to check for changed events
|
2011-11-09 22:17:09 +01:00 |
Georg Ehrke
|
9761a1de3e
|
translatable error messages
|
2011-10-22 13:14:54 +02:00 |
|
Bart Visscher
|
2269f74c27
|
Fix changing calendar data
|
2011-10-20 23:49:28 +02:00 |
|
Bart Visscher
|
0eb6c759d7
|
Connect newEvent & editEvent to fullcalendar
|
2011-10-20 23:49:28 +02:00 |
|
Bart Visscher
|
4fe48a50f0
|
Translation of calendar interface
|
2011-10-20 23:49:27 +02:00 |
|
Bart Visscher
|
2e6ec6ce0b
|
Connect calendar buttons to actions
|
2011-10-20 23:49:27 +02:00 |
|
Bart Visscher
|
4075d18050
|
Implement loading of events in calendar
|
2011-10-20 23:49:27 +02:00 |
|
Bart Visscher
|
a12cdb55b1
|
Replace ownCloud calendar html with fullcalendar implementation
|
2011-10-20 23:49:27 +02:00 |
|
Marvin Thomas Rabe
|
f3f5d775b5
|
removed description field for calendar
|
2011-10-08 13:28:01 +02:00 |
|
Marvin Thomas Rabe
|
590ff0ced9
|
moved bookmarklet to personal. username must be provided when adding a new user.
|
2011-10-08 13:10:49 +02:00 |
|
Marvin Thomas Rabe
|
e345fbd386
|
conflicts solved
|
2011-10-06 22:40:11 +02:00 |
|
Bart Visscher
|
4786ed321e
|
Replace _ in timezone setting with a space
|
2011-10-06 13:22:36 +02:00 |
|
Bart Visscher
|
c28f1e0276
|
Implement timezone fix from Stephen Rees-Carter
|
2011-10-06 13:22:36 +02:00 |
Stephen Rees-Carter
|
c853fc75a1
|
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
|
2011-10-06 10:31:05 +11:00 |
Jan-Christoph Borchardt
|
8e532b5ceb
|
removed extra calendar settings. Also, table layout?
|
2011-10-05 14:32:25 +02:00 |
|
Marvin Thomas Rabe
|
340f6bbaba
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-04 19:37:54 +02:00 |
|
Marvin Thomas Rabe
|
d1518f2901
|
updated calendar settings
|
2011-10-04 19:37:26 +02:00 |
|
Georg Ehrke
|
33b660857a
|
fix ical import
|
2011-10-04 10:17:11 +02:00 |
|
Georg Ehrke
|
c40a1fcede
|
added import function as filehandler
|
2011-10-03 22:50:10 +02:00 |
|
Bart Visscher
|
dec8106665
|
Add user friendly calendar color chooser
|
2011-10-03 20:42:47 +02:00 |
|
Bart Visscher
|
6159b79715
|
Take setting default value out of loop
|
2011-10-03 20:42:47 +02:00 |
|
Marvin Thomas Rabe
|
bdcf31cc73
|
Added translatable text.
|
2011-10-02 16:06:30 +02:00 |
|
Marvin Thomas Rabe
|
213275a1f8
|
Add translation and fixed some css problems
|
2011-10-02 15:55:23 +02:00 |
|
Marvin Thomas Rabe
|
daee88fd26
|
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
|
2011-10-02 15:51:24 +02:00 |
|
Georg Ehrke
|
0ebe9ad70c
|
added function to export single events
|
2011-10-01 23:19:06 +02:00 |
|
Georg Ehrke
|
f9824f6108
|
choosable default duration of event
|
2011-10-01 22:53:18 +02:00 |
|
Georg Ehrke
|
bf6414d3ad
|
choosable time format
|
2011-10-01 10:39:07 +02:00 |
|
Georg Ehrke
|
0514a1925b
|
choosable first day of week & choosable days of weekend
|
2011-10-01 09:54:52 +02:00 |
|
Bart Visscher
|
d59c48217d
|
Change colspan in choose calendar dialog to 6
|
2011-09-29 22:15:42 +02:00 |
|
Bart Visscher
|
f29f601ec4
|
Revert "commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)"
Implemented the calendar color as background of the events.
This reverts commit 59d4ddd905.
|
2011-09-28 23:25:22 +02:00 |
|
Bart Visscher
|
c9c7d5e1aa
|
Add support for DURATION in VEVENT
|
2011-09-28 23:17:26 +02:00 |
|
Bart Visscher
|
3f7d964acd
|
Color event background with calendar color
|
2011-09-28 23:17:25 +02:00 |
|
Jan-Christoph Borchardt
|
c39c6d36df
|
do not use 'URL' but 'address'
|
2011-09-28 22:11:47 +02:00 |
|
Georg Ehrke
|
61c4f9b3c8
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-09-28 18:44:17 +02:00 |
|
Georg Ehrke
|
59d4ddd905
|
commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)
|
2011-09-28 18:43:59 +02:00 |
Frank Karlitschek
|
98c59605aa
|
show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration
|
2011-09-28 16:05:01 +02:00 |
|
Georg Ehrke
|
61aa00899d
|
show only most essential stuff in add and edit event form
|
2011-09-27 21:56:16 +02:00 |