Commit Graph

213 Commits

Author SHA1 Message Date
Frank Karlitschek 43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek 4fe90f62f4 port checkAppEnabled 2012-05-02 19:08:37 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek 254b8b9506 porting of OC_User to public API complete.
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek 5bf69237b2 ported isLoggedIn 2012-05-01 18:46:15 +02:00
Frank Karlitschek d0554bef06 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Georg Ehrke 8a3d41c043 fix a PHP Notice 2012-04-30 21:46:33 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke 4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Georg Ehrke 0918fc7d91 fix merge conflicts 2012-04-21 23:21:50 +02:00
Georg Ehrke e29ae46609 fix merge conflicts 2012-04-21 22:12:31 +02:00
Georg Ehrke de71842888 implement shared calendar activation on server side 2012-04-18 11:50:12 +02:00
Georg Ehrke 69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Georg Ehrke 77cefdedb8 Merge branch 'master' into sabredav_1.6 2012-04-15 22:28:11 +02:00
Georg Ehrke e292b1fcdb fix merge conflicts 2012-04-15 12:43:07 +02:00
Robin Appelman b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Georg Ehrke e256ac8791 fix unsharing of events 2012-04-13 21:49:24 -04:00
Georg Ehrke 1e0364baa8 check permission check in share function 2012-04-13 17:16:28 -04:00
Georg Ehrke 77a9e343aa Merge branch 'master' into sabredav_1.6 2012-04-13 16:42:10 -04:00
Georg Ehrke afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Georg Ehrke 854eaff34f hide share tab in shared events 2012-04-13 16:20:19 -04:00
Bart Visscher 7cf7d5c3dd Calendar: Also set repeat options when editing a non repeating event 2012-04-13 21:13:58 +02:00
Bart Visscher 28e0d64ede Calendar: Fix saving of Categories in an event 2012-04-13 21:13:58 +02:00
Bart Visscher f9b7ed3a1f Calendar: Implement rescan of Categories 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
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 9294a95438 fix view of single shared events 2012-04-07 22:54:38 -04:00
Georg Ehrke 960553f9c4 fix path and class name 2012-04-07 22:45:44 -04:00
Georg Ehrke 4d884c3849 clean up events.php of calendar 2012-04-07 22:39:37 -04:00
Georg Ehrke eef9a1e7ed add access check to ajax files 2012-04-07 22:37:26 -04:00
Georg Ehrke 72a43b3929 revert 0fd8b1a044 2012-04-02 08:32:27 -04:00
Georg Ehrke 0fd8b1a044 fix events.php for rewritten OC_Caledar_App class 2012-03-31 16:16:34 -04:00
Georg Ehrke 1f8cf2d8f2 fix name of constants 2012-03-31 13:37:44 +02:00
Georg Ehrke 90286353e2 Merge branch 'master' into sabredav_1.6 2012-03-29 23:20:03 +02:00
Georg Ehrke d15959d573 Merge branch 'master' into calendar_sharing 2012-03-29 23:19:31 +02:00
Georg Ehrke 08b4f996d3 add backslash r to the newline var 2012-03-28 17:06:16 +02:00
Georg Ehrke 71b32f7ad4 add read only 'form' for shared events 2012-03-26 15:24:43 +02:00
Georg Ehrke ac0c5ba6da Merge branch 'master' into sabredav_1.6 2012-03-25 14:02:40 +02:00
Georg Ehrke 19c101a660 fix merge conflicts 2012-03-25 14:02:02 +02:00
Georg Ehrke 0e11cc9f6f fix previous made bug and fix oc bug - oc-139 2012-03-23 17:27:52 +01:00
Georg Ehrke ac8362e34a check if the title of an event is null - bugfix for oc-139 2012-03-23 17:09:51 +01:00
Georg Ehrke 33b06c4484 Merge branch 'master' into sabredav_1.6 2012-03-19 08:33:36 +01:00
Georg Ehrke f2dcab50b5 fix merge conflicts 2012-03-03 15:06:51 +01:00
Georg Ehrke 4c45483ad3 make calendar compatible with php 5.2 - works for me with PHP 5.2.12 2012-03-03 14:30:52 +01:00
Bart Visscher f914cd0144 Implement showing Birthdays of contacts in the calendar 2012-03-01 21:00:22 +01:00
Bart Visscher fe3bcb5fe2 Calendar: fix bug in creating DTEND from DTSTART 2012-03-01 21:00:22 +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
Frank Karlitschek ab96fa67c8 first part of the abstraction work of the apps folder. more to come 2012-02-26 18:26:41 +01:00
Georg Ehrke 89865cb8a0 stop using 3rdparty services for timezone detection 2012-02-26 13:45:51 +01:00
Georg Ehrke bfb67286c8 fix merge conflicts 2012-02-25 16:54:27 +01:00
Georg Ehrke 1d1dfcbc1a replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime 2012-02-24 22:20:40 +01:00
Georg Ehrke b1fb325d48 rename updatecalendar to update 2012-02-23 22:07:31 +01:00
Georg Ehrke 8cd1027214 better var name in changeview.php 2012-02-23 22:00:46 +01:00
Georg Ehrke b7de1850a0 add moved files to clean up ajax folder 2012-02-23 21:58:39 +01:00
Georg Ehrke e188b96596 remove old ajax files 2012-02-23 21:58:01 +01:00
Frank Karlitschek a62e109e8c make the location of the 3rdparty folder flexible.
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
Georg Ehrke cff0ac2bf9 better permission check in resize.php 2012-02-22 10:42:33 +01:00
Bart Visscher 86d2927c02 Calendar: Correct calendarcolor format for ical color property 2012-02-21 20:10:40 +01:00
Georg Ehrke 236d2aa5b8 rename updatecalendar to update 2012-02-21 19:42:48 +01:00
Georg Ehrke e227a65f66 Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing 2012-02-21 19:36:42 +01:00
Georg Ehrke ec7ed3c882 add rw and r to events.php 2012-02-20 11:35:19 +01:00
Georg Ehrke 1cf7fc261f better var name in changeview.php 2012-02-20 11:26:43 +01:00
Georg Ehrke 8dff0fb58d add moved files to clean up ajax folder 2012-02-20 11:26:22 +01:00
Georg Ehrke ceb0016bdc remove old ajax files 2012-02-20 11:25:42 +01:00
Bart Visscher 539fd7240c Calendar: optimize sending calendar events, also enabled caching of result 2012-02-17 22:09:31 +01:00
Bart Visscher a33b757b19 Calendar: Add default repeat values when editing a non-repeating event 2012-02-17 22:09:22 +01:00
Georg Ehrke 011bc1e764 fix unsharing of groups 2012-02-17 21:19:04 +01:00
Henning Becker 62da0bae43 Handle event exceptions in calendar app. Execeptions to recurring events are not shown anymore. 2012-02-17 14:32:02 +01:00
Georg Ehrke 73038156cc check userrights in events.php 2012-02-12 10:40:57 +01:00
Georg Ehrke db23ec5c1c show shared calendars 2012-02-11 14:02:51 +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 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 f870f9efcf validate parameters in changeview.php 2012-02-02 12:18:29 +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 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
Georg Ehrke 868cf46290 improve import function 2012-01-14 14:22:30 +01:00
Georg Ehrke cb445deb5f fix login check in ajax files 2012-01-05 21:02:11 +01:00
Georg Ehrke edc9a150aa fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination 2012-01-05 17:49:09 +01:00
Georg Ehrke a88cc91ad9 fix end for repeating events 2012-01-05 17:05:30 +01:00
Georg Ehrke e6739d230e add function to detect always the timezone 2012-01-02 11:35:50 +01:00
Georg Ehrke ffa835c56f fix the default setting for yearly repeating events 2011-12-26 19:59:15 +01:00
Georg Ehrke 9eef57faed make repeating events editable 2011-12-25 23:19:49 +01:00
Georg Ehrke 8ee53708ae use pre-decrement instead of post-decrement 2011-12-25 15:07:53 +01:00
Georg Ehrke 5e6fa608eb use OC_JSON::checkLoggedIn() in all ajax files 2011-12-22 16:31:01 +01:00
Georg Ehrke 469e983a02 fix merge conflicts 2011-12-21 22:16:46 +01:00
Bart Visscher 4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Georg Ehrke 56f12cbfb1 delete unused files 2011-12-10 17:54:42 +01:00
Georg Ehrke add48b2657 optimize timezone detection 2011-12-09 14:35:59 +01:00
Bart Visscher c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +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