Georg Ehrke
|
361d4ac13b
|
fix merge conflicts
|
2011-12-03 17:25:17 +01:00 |
|
Georg Ehrke
|
7fd52de2d3
|
fix merge conflicts
|
2011-11-12 15:13:44 +01:00 |
|
Georg Ehrke
|
26272c4252
|
automatic timezone detection
|
2011-11-11 15:51:44 +01:00 |
Bart Visscher
|
9832a0817d
|
Merge branch 'master' into fullcalendar
Conflicts:
apps/calendar/index.php
|
2011-10-24 22:40:22 +02:00 |
David Iwanowitsch
|
74740fb71a
|
Do not set incorrect components for default calendar
|
2011-10-23 11:35:29 +02:00 |
Georg Ehrke
|
a1eda425ed
|
added transition function from 'old' calendar to fullcalendar (fixed currentview bug)
|
2011-10-21 22:08:30 +02:00 |
|
Georg Ehrke
|
c40383b610
|
enable listview button
|
2011-10-21 18:27:12 +02:00 |
|
Georg Ehrke
|
e48377d85b
|
added transition function from 'old' calendar to fullcalendar (fixed currentview bug) and removed listview (it is not implemented in fullcalendar yet)
|
2011-10-21 18:19:44 +02:00 |
|
Bart Visscher
|
96002c8c8f
|
Implement listview for fullcalendar
|
2011-10-20 23:49:29 +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
|
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 |
|
Bart Visscher
|
f4782a7690
|
Check if the application is actually enabled
|
2011-09-30 23:17:18 +02:00 |
|
Bart Visscher
|
782069e1fa
|
Change copyright notice to short form
|
2011-09-23 22:59:54 +02:00 |
|
Bart Visscher
|
e9950defb2
|
Make event category choice multiselect
|
2011-09-23 19:40:06 +02:00 |
Bart Visscher
|
e990ef3542
|
Move some common code to OC_Util
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
|
2011-09-18 21:31:56 +02:00 |
|
Bart Visscher
|
fbde66a56c
|
Eliminate most global calendar js vars
|
2011-09-07 09:49:23 +02:00 |
|
Bart Visscher
|
3130234640
|
Remove execute permissions from source files
|
2011-09-03 22:15:23 +02:00 |
|
Georg Ehrke
|
bf68cd8ba4
|
better multiple language support, first integration of new calendar class
|
2011-08-23 18:02:36 +02:00 |
Jakob Sack
|
fbb63f11e4
|
Some more work on CalDAV integration
|
2011-08-22 16:59:16 +02:00 |
|
Georg Ehrke
|
4ae5c4bc33
|
bug fixes, style fixes
|
2011-08-12 14:29:45 +02:00 |
|
Jakob Sack
|
414e5e174d
|
merge Georgs calendar
|
2011-08-11 11:22:07 +02:00 |