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

313 commits

Author SHA1 Message Date
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
Bart Visscher
c6f78fbe43 Add flag in info.xml to control the apps that are installed by default 2011-09-27 22:36:14 +02:00
Georg Ehrke
61aa00899d show only most essential stuff in add and edit event form 2011-09-27 21:56:16 +02:00
Bart Visscher
17e631bc5e Use OC_JSON for json responses 
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
 2011-09-25 22:19:28 +02:00
Jan-Christoph Borchardt
700ac75565 updated translations 2011-09-24 23:12:18 +02:00
Georg Ehrke
4aeb2990c0 delete calendar function for userinterface 2011-09-24 19:52:55 +02:00
Florian Pritz
842ce24d2b apps/calendar: check for unset variable 
Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:42:07 +02:00
Florian Pritz
ff10303755 apps/calendar: change ctag after modifying event 
edit() tried to do that, but it used $id which is the event id and not
the calendar id.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:55 +02:00
Florian Pritz
b0e23a1634 apps/calendar: add delete button to edit event form 
Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:51 +02:00
Florian Pritz
761ba4a379 don't escape new lines in vevent description 
This ended up as "\n\\n" in the data base and the escaped \n was also
visible in the edit form.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:50 +02:00
Florian Pritz
6f3c118038 apps/calendar: check if variables are set before using them 
Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:42 +02:00
Bart Visscher
782069e1fa Change copyright notice to short form 2011-09-23 22:59:54 +02:00
Bart Visscher
5741811d36 Fix use of reserved javascript keyword 'new' 2011-09-23 22:22:03 +02:00
Jan-Christoph Borchardt
6e46bd7373 integrated and updated calendar translations 2011-09-23 20:38:19 +02:00
Jan-Christoph Borchardt
aa4aa40b57 fixed a few calendar words, hack to get shortcode for May translatable 2011-09-23 20:19:39 +02:00
Bart Visscher
e9950defb2 Make event category choice multiselect 2011-09-23 19:40:06 +02:00
Jan-Christoph Borchardt
5559a0dede updated translations 2011-09-23 19:08:02 +02:00
Jakob Sack
73d0caf8a4 Add Sabre_DAV_Browser_Plugin to *DAV-servers to ease debugging 2011-09-23 09:40:01 +02:00
Bart Visscher
aad62919da Small styling fixes 2011-09-20 14:38:16 +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
82c7598861 Remove global vars and use the OC static version. 
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
 2011-09-18 19:37:54 +02:00
Bart Visscher
d5656716f6 Fix calendar active checkbox 2011-09-18 17:13:48 +02:00
Bart Visscher
0660133d2e Fix event error/success json message 2011-09-18 17:13:47 +02:00
Bart Visscher
7c5e389067 deleteUser function must be static 2011-09-18 17:13:47 +02:00
Bart Visscher
22db68816e Remove unused function call 2011-09-17 01:55:05 +02:00
Bart Visscher
079df42103 Disable the Oneday and Fourweeks buttons in calendar interface 2011-09-17 01:55:04 +02:00
Bart Visscher
2a84f7f07c Move most javascript to calendar.js 2011-09-16 17:50:55 +02:00
Bart Visscher
45d42a9654 Move validateEventForm function and fix success handling 2011-09-16 17:06:57 +02:00
Bart Visscher
73d3dc91fd Handle multi open of choosecalendar dialog 2011-09-16 14:11:22 +02:00
Bart Visscher
0fde26c86c Close event new/edit dialog when clicking outside the dialog 2011-09-16 14:02:21 +02:00
Bart Visscher
2353f02d9a Fixes for Calendar app 2011-09-16 00:21:51 +02:00
Bart Visscher
15559d3e88 First implementation of edit event 2011-09-16 00:21:19 +02:00
Bart Visscher
b413dcfa7c Fix conversion of VTODO and VJOURNAL items 2011-09-16 00:19:43 +02:00
Bart Visscher
388b14604a Move Calendar Object code to its own class OC_Calendar_Object 2011-09-16 00:19:43 +02:00
Jakob Sack
4d7ed0f2f5 Add documentation to calendar.php 2011-09-15 22:45:58 +02:00
Bart Visscher
b6c69e580a Move php code out of part.eventform 2011-09-14 23:36:23 +02:00
Bart Visscher
cb9a67906d Move event form field to part.eventform template 2011-09-14 23:36:23 +02:00
Bart Visscher
68758f9b2c Rename calendar javascript functions into Calendar.UI namespace 2011-09-14 23:36:22 +02:00
Bart Visscher
7c9f1007d5 Fix initial visibility of database settings in setup 2011-09-14 23:36:22 +02:00
Florian Jacob
9a5530a48f Correct deleting events over CalDAV 
A quick patch that corrects not being able to delete
calendar events. (misnamed variable). Thanks to Robert J. Clark.
 2011-09-12 19:50:07 +02:00
Jan-Christoph Borchardt
de729d8d8b renamed last CW to Week 2011-09-11 21:50:13 +02:00
Bart Visscher
cd44dff5af Better feedback for saving calendar and openid settings 2011-09-11 20:38:52 +02:00
Bart Visscher
3234597703 Correct copyright notices 2011-09-11 17:25:02 +02:00
Georg Ehrke
e9df292b62 commented out broken code in add event function 2011-09-11 16:49:08 +02:00
Georg Ehrke
647fab07c7 fixes in german language 2011-09-10 12:26:01 +02:00
Bart Visscher
97fc236760 Fix a warning and an error 2011-09-10 11:58:08 +02:00
Georg Ehrke
1afeb5cd12 bug fixes in calendar lib 2011-09-10 10:52:35 +02:00
Bart Visscher
cbb36829e6 Small update Calendars dialog 2011-09-09 22:28:34 +02:00
Georg Ehrke
80f5942868 translatable categories and other translations added 2011-09-09 20:39:38 +02:00
Georg Ehrke
f031e308cd show caldav url in choose calendar dialog 2011-09-09 18:44:33 +02:00
Bart Visscher
74f6dd5d5a Add creating calendars with the web interface 2011-09-08 12:29:29 +02:00
Bart Visscher
f3e98878da Implement calendar list view 2011-09-07 15:13:26 +02:00
Bart Visscher
dabf10f99c Use js Date for holding dates in the whole calendar app 2011-09-07 09:49:23 +02:00
Bart Visscher
fbde66a56c Eliminate most global calendar js vars 2011-09-07 09:49:23 +02:00
Bart Visscher
0df98b9a78 Remove generate_ prefix from vars 2011-09-07 09:49:23 +02:00
Bart Visscher
9b14c276e3 Store date for click in jQuery.data('date_info') 2011-09-07 09:49:23 +02:00
Bart Visscher
abb6a15aa4 Change generateDates to use js Date for calculations 2011-09-07 09:49:22 +02:00
Jan-Christoph Borchardt
75383a8308 small wording changes 2011-09-04 18:13:53 +02:00
Bart Visscher
cfb932b073 Add simple popup to event 
There is not a lot of infomation to display, yet.
 2011-09-03 22:15:24 +02:00
Bart Visscher
3130234640 Remove execute permissions from source files 2011-09-03 22:15:23 +02:00
Bart Visscher
2e2bdb449f Update calendar event label creation 2011-09-03 22:15:23 +02:00
Bart Visscher
afb07d3e39 Use css class for view selection radio buttons hilighting 2011-09-02 23:51:18 +02:00
Bart Visscher
208852abf2 Fix event creation date in oneweekview 2011-09-02 23:50:51 +02:00
Bart Visscher
d33a5ea5d4 Use css classes to find elements, reduces the html size 2011-09-02 23:28:35 +02:00
Bart Visscher
6155c758be Cleanup javascript in calendar template 2011-09-02 23:04:02 +02:00
Georg Ehrke
6eff001ebb another bugfix in new design of calendar 2011-09-02 21:29:59 +02:00
Georg Ehrke
e89d622c3a bug fixes in new design of calendar 2011-09-02 15:49:03 +02:00
Georg Ehrke
8cdd9ab81b export function and style fixes in calendar 2011-09-02 12:55:56 +02:00
Bart Visscher
62cca8264f Refactor calendar loadEvents and updateView use 2011-09-01 23:27:00 +02:00
Bart Visscher
804af7f189 Move generate_dates function to Class/Object 2011-09-01 23:23:57 +02:00
Bart Visscher
b7e9e7e777 Simplify forward_day and backward_day 2011-09-01 22:29:57 +02:00
Bart Visscher
e765e7e9e8 Changing the active state of the calendar reloads the events. 
Change from Georg Ehrke
 2011-09-01 22:00:14 +02:00
Bart Visscher
1bb754299a Change calendar js rendering to class/object 2011-09-01 22:00:14 +02:00
Bart Visscher
3d2b4b03af Convert plain javascript to jQuery for readability 2011-09-01 22:00:13 +02:00
Georg Ehrke
0c07312ad8 add some categories in calendar 2011-09-01 18:35:32 +02:00
Jakob Sack
6fa9be73f8 calendar_calendars.components needs to be longer, adjustments in info.xml 2011-09-01 17:27:12 +02:00
Georg Ehrke
8cbe66b5c1 bug fixes at new event form (categorie and calendar) 2011-09-01 16:54:25 +02:00
Bart Visscher
a7496b1c9d Create function getnumberofdays to get a list of month lengths 2011-08-31 21:24:08 +02:00
Bart Visscher
b0ce1ded97 Move date functions to class structure 2011-08-31 21:24:08 +02:00
Georg Ehrke
361861295f reload page after add event successfully 2011-08-31 20:41:18 +02:00
Georg Ehrke
5678d78d54 new changes (e.g. show events) by Bart Visscher 2011-08-31 20:20:46 +02:00
Georg Ehrke
9a60313c3b commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar 2011-08-31 17:29:38 +02:00
Georg Ehrke
6ad64c6f8a Timezone bug fixed 2011-08-29 13:41:19 +02:00
Georg Ehrke
947216942a Merge branch 'calendar' of git.kde.org:owncloud into calendar 2011-08-28 20:16:40 +02:00
Georg Ehrke
ca08ccb61c first add event function in calendar app 2011-08-28 20:13:40 +02:00
Jakob Sack
112eccfe33 Support for etags in calendar 2011-08-24 10:19:48 +02:00
Jakob Sack
c87cee6b1f Add VJOURNAL to objects that are allowed by default 2011-08-23 22:10:08 +02:00
Jakob Sack
778404fb29 VTODO and VJOURNAL exist as well 2011-08-23 22:07:40 +02:00
Jakob Sack
84761b1518 CalDAV seems to work now 2011-08-23 21:42:15 +02:00
Georg Ehrke
cdf0d010eb today hightlight in calendar app (fourweeksview and onemonthview) 2011-08-23 20:30:11 +02:00
Georg Ehrke
bf68cd8ba4 better multiple language support, first integration of new calendar class 2011-08-23 18:02:36 +02:00
Georg Ehrke
b2fddc408c /appinfo/app.php bug fixed 2011-08-22 20:09:33 +02:00
Jakob Sack
fbb63f11e4 Some more work on CalDAV integration 2011-08-22 16:59:16 +02:00
Georg Ehrke
09c8cd17cc remove reset button (again) 2011-08-20 22:50:43 +02:00
Georg Ehrke
3cb07254e5 allday bug fixed 2011-08-20 16:52:03 +02:00
Georg Ehrke
fc4d31547b spanish language pack 2011-08-20 16:02:44 +02:00
Georg Ehrke
8e32cfbf15 bug/style fixes, multiple language support, german language pack 2011-08-20 15:19:43 +02:00
Jan-Christoph Borchardt
b3f6eb2224 removed unneeded and dangerous reset button 2011-08-19 23:15:27 +02:00
Georg Ehrke
d1daca5029 a lot of new functions (e.g. add event form), style fixes, bug fixes 2011-08-19 20:33:48 +02:00
Georg Ehrke
a61dde9b52 old files deleted 2011-08-12 14:39:24 +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