wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2542 commits 157 branches 562 tags 714 MiB
Commit graph

251 commits

Author SHA1 Message Date
Bart Visscher
0bbeb13e26 Calendar: Also check if the enddate is in the requested range for events 2011-11-30 21:13:26 +01:00
Bart Visscher
e5fdc6013a Calendar: Use the default timezone that is set in lib/base.php 2011-11-30 21:13:04 +01:00
Bart Visscher
ee549dfb38 Fix scrolling through months 2011-11-23 21:07:49 +01:00
Georg Ehrke
a38778f911 fix timeformat setting for fullcalendar 2011-11-20 14:23:26 +01:00
Georg Ehrke
3d498002d0 first implementation of the search function 2011-11-14 22:52:34 +01:00
Georg Ehrke
89b3a395df fix timezone for repeating events 2011-11-12 22:30:09 +01:00
Georg Ehrke
a303992d78 support for repeating events 2011-11-12 22:02:04 +01:00
Georg Ehrke
eea20e51d8 another fix of caldav url 2011-11-12 16:13:27 +01:00
Georg Ehrke
7fd52de2d3 fix merge conflicts 2011-11-12 15:13:44 +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
Bart Visscher
c65e417666 Use parse function in Calendar_Object 2011-11-09 22:16:24 +01:00
Brice Maron
e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Bart Visscher
8dd2f463f8 Cleanup tipsy popups on more actions 2011-10-27 22:56:22 +02:00
Bart Visscher
1e8e2ae353 Move unselect call to after the dialog starts 2011-10-27 22:54:39 +02:00
Bart Visscher
d0e9c81399 Quickfix hanging tipsy popups 2011-10-25 20:01:04 +02:00
Bart Visscher
55d957489d Fix fromtime/totime warnings 2011-10-25 19:59:23 +02:00
Bart Visscher
50649ad0d1 Implement select event creation 2011-10-25 19:57:20 +02:00
Bart Visscher
950018b5c3 Fix scrolling calendar 2011-10-25 19:56:57 +02: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
9761a1de3e translatable error messages 2011-10-22 13:14:54 +02:00
Georg Ehrke
433b57c315 fix new allday bug 2011-10-21 22:59:26 +02:00
Georg Ehrke
d50b014aba fix allday bug 2011-10-21 22:47:31 +02:00
Bart Visscher
eb68201bc5 Better event popup 2011-10-21 22:08:55 +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
Georg Ehrke
d09b3ad2e7 Revert "first implementation of fullcalendar plugin with old buttons working" 
This reverts commit b40122832f.
 2011-10-21 17:50:10 +02:00
Georg Ehrke
b40122832f first implementation of fullcalendar plugin with old buttons working 2011-10-21 16:11:38 +02:00
Bart Visscher
085001fa24 Disable calendar scrolling, doesn't work yet 2011-10-20 23:49:29 +02:00
Bart Visscher
96002c8c8f Implement listview for fullcalendar 2011-10-20 23:49:29 +02:00
Bart Visscher
beb5d62779 Optimize deleting event 2011-10-20 23:49:28 +02:00
Bart Visscher
2269f74c27 Fix changing calendar data 2011-10-20 23:49:28 +02:00
Bart Visscher
3d8a1ccb3f Implement resizing of events 2011-10-20 23:49:28 +02:00
Bart Visscher
a8bca282df Implement moving of event 2011-10-20 23:49:28 +02:00
Bart Visscher
bb5ccc5731 Connect popup to fullcalendar 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
Georg Ehrke
323a98adb7 Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar 2011-10-15 17:16:00 +02:00
Bart Visscher
c383543ec9 Remove unused parameter 2011-10-15 11:45:58 +02:00
Bart Visscher
9cfae56df5 Fix calendar colors with new calendar 2011-10-15 11:45:58 +02:00
Georg Ehrke
ea8461e83d scrolling in calendar 2011-10-14 13:46:28 +02:00
John Kristensen
c86d1824fe Improve handling of calendar export $_GET params 
* a notice would be reported if either of the 'cal' or 'event' $_GET params
   where not supplied, which would result in 'Cannot modify header information'
   warnings
 2011-10-12 15:23:39 +11:00
John Kristensen
ef8826ac2d remove 'description' from OC_Connector_Sabre_CalDAV propertyMap 
* the description field was removed in commit:
     f3f5d775b5
   but the field was still trying to be mapped - causing errors with CalDAV
 2011-10-12 15:10:59 +11:00
Georg Ehrke
f49ecee24c reload calendar automatically 2011-10-10 12:03:30 +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
Jan-Christoph Borchardt
0bb3270503 Revert "support of RRULE in calendar app" 
Reverting as per Georg's request (not stable enough yet)

This reverts commit 55ab68a332.
 2011-10-08 00:12:57 +02:00
Bart Visscher
980a0893f0 Change colorselector to use border for selected color 2011-10-07 16:03:26 +02:00
Marvin Thomas Rabe
e345fbd386 conflicts solved 2011-10-06 22:40:11 +02:00
Marvin Thomas Rabe
bb26fe9300 Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55 2011-10-06 22:37:06 +02:00
Bart Visscher
3cc7212c82 Add icon for calendar color selector 2011-10-06 21:22:55 +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
Georg Ehrke
bf017fb4bd Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-06 13:21:38 +02:00
Georg Ehrke
55ab68a332 support of RRULE in calendar app 2011-10-06 13:21:13 +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
7579fc7bc9 updated margins 2011-10-04 21:39:13 +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
77e12a15b1 fix checkLoggedIn function in import of ical files 2011-10-03 22:52:13 +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
1ea183a0f7 fix duration bug 2011-10-01 21:09:08 +02:00
Georg Ehrke
8219516ec0 removed bug, that the drag and drop function added 24h to the duration of the event, after moving an event from allday to a time 2011-10-01 20:44:08 +02:00
Georg Ehrke
50007f2d40 removed bug, that you can't change time in week view, when event was an allday event 2011-10-01 20:36:20 +02:00
Georg Ehrke
a7431d99e5 remove debugging text in drag and drop function 2011-10-01 20:31:58 +02:00
Georg Ehrke
43a3e46369 added drag and drop function for events in calendar app 2011-10-01 20:27:30 +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
ddd28aae67 Remove test data from calendar creation 2011-09-30 23:17:30 +02:00
Bart Visscher
f4782a7690 Check if the application is actually enabled 2011-09-30 23:17:18 +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
5875b50de0 Use .empty function instead of .html("") 2011-09-28 23:17:26 +02:00
Bart Visscher
7c20aea96c Use OC.filePath to locate ajax entry points 2011-09-28 23:17:25 +02:00
Bart Visscher
3f7d964acd Color event background with calendar color 2011-09-28 23:17:25 +02:00
Bart Visscher
45c983e899 Add missing datetime type 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
8e42b02a22 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 10:29:07 +02:00
Georg Ehrke
8c405a59d8 little bug fixes in calendar app 2011-09-28 23:28:14 +02:00