mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,692 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

222 Commits

Author SHA1 Message Date
Georg Ehrke c8c105df33 Calendar: fix modifying of end DateTime object 2012-06-19 13:04:11 +02:00
Georg Ehrke 13aad8f06d some little fixes for repeating events caching 2012-06-18 15:58:01 +02:00
Georg Ehrke beed6e0f0e Revert "Revert "create OC_Calendar_Object::generateStartEndDate function"" 
This reverts commit e3b58f6783.
 2012-06-18 14:47:58 +02:00
Georg Ehrke e3b58f6783 Revert "create OC_Calendar_Object::generateStartEndDate function" 
This reverts commit aa7ce480f4.
 2012-06-18 14:47:09 +02:00
Georg Ehrke aa7ce480f4 create OC_Calendar_Object::generateStartEndDate function 2012-06-15 12:11:22 +02:00
Georg Ehrke 4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Georg Ehrke 22a33b509f use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod 2012-06-15 11:39:19 +02:00
Georg Ehrke e4529301ff change some function names in OC_Calendar_Repeat 2012-06-15 11:34:21 +02:00
Georg Ehrke 5c10683432 use easier parseable date to init datetime 2012-06-15 11:29:16 +02:00
Georg Ehrke 6f20d51646 fix generateEventOutput for calendar hook 2012-06-15 11:25:29 +02:00
Georg Ehrke 0dd4ea5a4f Merge branch 'master' into calendar_export 2012-06-15 10:41:06 +02:00
Thomas Tanghus f6aa366857 Make sure there is a calendar after delete. 2012-06-15 02:10:55 +02:00
Thomas Tanghus ad32c20300 Agree on argument type (cleaned this time). 2012-06-15 01:51:26 +02:00
Thomas Tanghus 6d43e6565e Revert "Agree on argument type." 
This reverts commit 0f6b1be0e6.
 2012-06-15 00:53:13 +02:00
Thomas Tanghus 0f6b1be0e6 Agree on argument type. 2012-06-15 00:50:42 +02:00
Thomas Tanghus 1e76a530ea No need to find calendar twice. 2012-06-15 00:28:12 +02:00
Georg Ehrke 6bd80d6457 show username of the body who shares in the summary 2012-06-13 22:07:23 +02:00
Georg Ehrke c24752dc1d Merge branch 'master' into calendar_export 2012-06-13 21:38:33 +02:00
Georg Ehrke 08a3a4f185 fix a bug in OC_Calendar_Repeat 2012-06-11 21:43:24 +02:00
Lukas Reschke 68f819ee20 Removed double sanitization 2012-06-11 19:47:42 +02:00
Georg Ehrke 09e744b793 connect OC_Calendar_repeat to events.php 2012-06-11 17:25:03 +02:00
Georg Ehrke 009c4c9045 add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public 2012-06-11 17:15:50 +02:00
Georg Ehrke 2dd84373c1 fix bug in OC_Calendar_Repeat 2012-06-11 17:13:20 +02:00
Georg Ehrke 32b366585d some fixes for repeating events caching 2012-06-11 15:36:48 +02:00
Georg Ehrke 5cb9d82b45 modify hooks in OC_Calendar_Calendar 2012-06-11 15:16:59 +02:00
Georg Ehrke eb3605aa63 modify hooks in OC_Calendar_Object 2012-06-11 15:15:13 +02:00
Georg Ehrke 01bd048bb3 remove insert id 2012-06-11 15:01:48 +02:00
Georg Ehrke 40459c8c66 some work on repeating events caching - basic class should work now :) 2012-06-11 15:00:51 +02:00
Georg Ehrke ece1162949 use native sabredav functions to generate repeating events 2012-06-11 10:55:26 +02:00
Georg Ehrke ef1b04619d fix merge conflicts 2012-06-10 18:38:01 +02:00
Georg Ehrke bdb76d4873 Merge branch 'master' into calendar_export 2012-06-10 18:37:16 +02:00
Georg Ehrke cfb9c764ca fix creation of monthly repeated events 2012-06-09 15:15:00 +02:00
Georg Ehrke a9b561430a add hooks for events 2012-06-09 12:30:09 +02:00
Georg Ehrke 7ed30649bb add hooks for calendars 2012-06-09 12:18:25 +02:00
Georg Ehrke cac995ee9f some more work on repeating events caching 2012-06-09 11:49:25 +02:00
Georg Ehrke ac74d87e3e some work on repeating events caching 2012-06-08 22:22:16 +02:00
Georg Ehrke 2fa19ce9a0 Merge branch 'master' into calendar_repeat 2012-06-06 10:12:11 +02:00
Georg Ehrke d8d558377c Merge branch 'master' into calendar_export 2012-06-06 10:11:34 +02:00
Bjoern Schiessle dcc5b5ca0a xss vulnerability fixed 2012-06-05 10:37:22 +02:00
Georg Ehrke 6560f1d894 don't change events timezone and remove the DTSTART value tag 2012-06-04 12:28:05 +02:00
Georg Ehrke c2a51d1f48 proper export for calendar app - doesn't work with apple ical yet - even though a ics validator says it's valid 2012-06-03 14:54:53 +02:00
Georg Ehrke 7a8e322679 some work for repeating events caching 2012-06-01 11:30:54 +02:00
Georg Ehrke 29b17672b4 a bit of work for repeating events caching 2012-05-29 19:46:17 +02:00
Georg Ehrke a56f2dbce7 Merge branch 'master' into calendar_repeat 2012-05-29 13:16:08 +02:00
Brice Maron 22cd0f1cda Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:41:39 +00:00
Georg Ehrke 7d49bf7f6e some changes in calendar repeat class 2012-05-18 11:48:18 +02:00
Georg Ehrke f7366de673 Merge branch 'master' into calendar_repeat 2012-05-17 22:17:23 +02:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Georg Ehrke ddf0903ace add post user delete hook for calendar sharing 2012-05-13 20:03:52 +02:00
Georg Ehrke dfef36ba2f some changes for calendar repeat class 2012-05-12 23:16:11 +02:00
Georg Ehrke b1cae9651e add functions get cached events in a specific time period 2012-05-12 23:00:21 +02:00
Georg Ehrke dc34ed5a12 Merge branch 'master' into calendar_repeat 2012-05-12 22:55:35 +02:00
Brice Maron ffe5ef2268 Correct calendar loading when calendar are from hooks. fix oc-619 2012-05-10 19:36:30 +00:00
Brice Maron 9dbc6b5158 Correct wrong DB quotes for calendar share functions 2012-05-06 15:41:14 +00:00
Georg Ehrke f75a7c084f add class for repeating events 2012-05-01 16:16:12 +02:00
Bart Visscher d854e4a144 Calendar: fix return of insert id 2012-05-05 22:32:55 +02:00
Bart Visscher 2facf509cc Merge branch 'tasks' for Tasks app 2012-05-05 18:26:13 +02:00
Frank Karlitschek 9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Bart Visscher 1e47156226 Merge branch 'master' into tasks 2012-05-04 17:04:11 +02:00
Bart Visscher 07ff1e723a Calendar: Fix repeating events 2012-05-03 23:33:44 +02:00
Bart Visscher 077ea94f71 Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud 
Conflicts:
	apps/calendar/ajax/events.php
 2012-05-03 23:18:43 +02:00
Frank Karlitschek 97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek 43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek 351740601a port oc_response 2012-05-03 10:46:27 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek 2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Georg Ehrke 0918fc7d91 fix merge conflicts 2012-04-21 23:21:50 +02:00
Georg Ehrke de71842888 implement shared calendar activation on server side 2012-04-18 11:50:12 +02:00
Georg Ehrke 77cefdedb8 Merge branch 'master' into sabredav_1.6 2012-04-15 22:28:11 +02:00
Georg Ehrke dc18e65b46 fix merge conflicts 2012-04-15 22:26:55 +02:00
Jakob Sack 9b1d6246a9 Remove useless, unmaintained dav.php 2012-04-15 16:50:44 +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
Bart Visscher 029e1aced7 Tasks: Update to use new categories interface 2012-04-14 14:55:37 +02:00
Robin Appelman 3babb8c22c improve flexibility of search providers a bit 2012-04-14 11:29:54 +02:00
Georg Ehrke ea3499a712 fix class name 2012-04-13 17:26:34 -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
Bart Visscher 4c52007996 Calendar: Update category list when updating/adding event 2012-04-13 21:13:58 +02:00
Bart Visscher 471e735b0c Calendar: Document active parameter in allCalendars 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 a7908ba76b fix bugs in share class 2012-04-12 22:11:48 -04:00
Bart Visscher 9165b5c28e Use the same category input and management as the contacts app 2012-04-12 23:10:49 +02:00
Bart Visscher b2011bd0a0 Remove unused function getCategoryOptions from OC_Calendar_Object 2012-04-12 23:10:49 +02:00
Georg Ehrke 0f16935763 fix bugs and optimize OC_Calendar_Object Class 2012-04-11 10:21:45 -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 eaa649cfb2 fix bug in share lib of calendar 2012-04-10 11:18:02 -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 e940152bce fix bugs in share lib of calendar 2012-04-07 22:39:02 -04:00
Georg Ehrke e18c0d54f6 add output functions and access function to app.php of calendar 2012-04-07 22:35:29 -04:00
Georg Ehrke ca2c7001c4 remove unused code in OC_Calendar_App class 2012-03-31 16:15:04 -04:00
Georg Ehrke 70237f7ecc rewrite OC_Calendar_APP class 2012-03-31 16:13:04 -04:00
Georg Ehrke 10fc51dc92 add public sharing fir calendars and events - add function in Share class 2012-03-31 16:12:27 -04:00
Georg Ehrke 179bf15daf fix group sql generator in calendar's share lib 2012-03-26 15:30:04 +02:00
Georg Ehrke 71b32f7ad4 add read only 'form' for shared events 2012-03-26 15:24:43 +02:00