Commit Graph

738 Commits (d7e742c32d734c35ad8411a566f9af04bf0fc76e)

Author SHA1 Message Date
Georg Ehrke d7e742c32d move calendar settings from personal settings to in app settings 2012-08-09 12:37:26 +02:00
Bart Visscher ca912ddff6 Change hardcoded urls to use linkTo function 2012-08-06 18:51:41 +02:00
Bart Visscher 8fb27126e5 Calendar: remove double html encoding 2012-08-03 16:18:33 +02:00
Jenkins for ownCloud 305a990942 [tx-robot] updated from transifex 2012-07-31 22:57:24 +02:00
Jenkins for ownCloud a1b80e3859 [tx-robot] updated from transifex 2012-07-30 02:05:41 +02:00
Jenkins for ownCloud af3c6efaba [tx-robot] updated from transifex 2012-07-29 02:06:29 +02:00
Jenkins for ownCloud 902d75d5a2 [tx-robot] updated from transifex 2012-07-28 02:05:38 +02:00
Georg Ehrke f4a2fb20bd Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76 2012-07-27 14:17:55 +02:00
Jenkins for ownCloud acccc9f0c3 [tx-robot] updated from transifex 2012-07-27 02:04:26 +02:00
Georg Ehrke 0500e0455d convert through caldav transmitted rgba calendarcolor to rgb 2012-07-26 14:46:03 +02:00
Jenkins for ownCloud cd9ec101c2 [tx-robot] updated from transifex 2012-07-26 08:04:12 +02:00
Jenkins for ownCloud 60e8e40a60 [tx-robot] updated from transifex 2012-07-26 08:03:10 +02:00
Jenkins for ownCloud 889e780a51 [tx-robot] updated from transifex 2012-07-25 22:15:24 +02:00
Georg Ehrke 0e49f07fe1 Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
Georg Ehrke 01eab4408b some style fixes for calendar 2012-07-21 17:09:10 +02:00
Bart Visscher 2d860fb276 DRY for getting calendar timezone setting 2012-07-21 00:45:30 +02:00
Lukas Reschke b6eaf6e583 Add CSRF checks 2012-07-20 15:45:17 +02:00
Thomas Tanghus 90c3b2b79f Added CSRF checks to Calendar. Expect some error messages - and report them ;) 2012-07-17 11:46:01 +02:00
Thomas Tanghus 82ce1c7d49 Added hook for postCreateUser. Probably fix for oc-1265. 2012-07-17 03:04:04 +02:00
Georg Ehrke d65fcd2c32 stop using of OC_L10N::tA 2012-07-16 20:26:14 +02:00
Georg Ehrke 9a8fb256ec Merge branch 'master' into calendar_import 2012-07-15 16:56:38 +02:00
Robin Appelman 0b6db11635 fix remote and public.php 2012-07-13 22:44:35 +02:00
Georg Ehrke 35c3ba231f Merge branch 'master' into calendar_import 2012-07-11 10:47:30 +02:00
Thomas Tanghus 4466583697 Implemented Sabre iCalendar Export Plugin. 2012-07-08 16:58:17 +02:00
Georg Ehrke a89d0da8cf comment out some code 2012-07-06 11:23:20 +02:00
Georg Ehrke 8c9376c614 some more work on calendar import - new import is (nearly) done 2012-07-04 21:14:40 +02:00
Georg Ehrke 3a85ecd5f8 Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Georg Ehrke b6933007ec replace some direct links with OC.imagePath 2012-07-03 23:44:47 +02:00
Georg Ehrke 95b018d00b some more work on calendar import 2012-07-03 22:33:24 +02:00
Georg Ehrke 392c771f1f fix spelling fail in code 2012-07-03 16:47:46 +02:00
Georg Ehrke f0c59ccebb Merge branch 'master' into calendar_import 2012-07-03 16:39:09 +02:00
Georg Ehrke f8eb48f272 fix encoding fail in calendar app - bugfix for oc-1194 2012-07-03 13:55:48 +02:00
Georg Ehrke b361988ea6 some work on calendar import dialog 2012-07-03 13:43:18 +02:00
Georg Ehrke fd50097452 remove some whitespace 2012-07-01 23:32:21 +02:00
Georg Ehrke 70488fe5d1 some work on calendar import 2012-07-01 21:36:09 +02:00
Georg Ehrke 06b30d3970 use light grey instead of white 2012-07-01 01:02:54 +02:00
Georg Ehrke 89ecd24d8f fix doc for OC_Calendar_Calendar::generateTextColor() 2012-07-01 00:31:05 +02:00
Georg Ehrke 1443b47096 add algorithm to generate the calendar's text color 2012-07-01 00:09:33 +02:00
Georg Ehrke c515265b23 improvements for dropoimport 2012-06-30 23:18:41 +02:00
Georg Ehrke 96d24ff7f6 little fix for import 2012-06-30 22:45:12 +02:00
Georg Ehrke b1f5979ae6 improve dropimport 2012-06-30 22:26:29 +02:00
Georg Ehrke 67e12cfdea Merge branch 'master' into calendar_import 2012-06-30 22:08:36 +02:00
Georg Ehrke 4c605efa78 import works now for dropimport 2012-06-30 22:08:30 +02:00
Georg Ehrke c350f5c542 fix documentation style 2012-06-30 17:09:20 +02:00
Georg Ehrke 95d42e4544 fix some doc 2012-06-30 15:39:20 +02:00
Georg Ehrke 24e24d4d2b some improvements for calendar export 2012-06-30 15:23:21 +02:00
Georg Ehrke c578ddecbc some work on (drop)import) 2012-06-30 15:17:29 +02:00
Georg Ehrke 0ff3939b46 Merge branch 'master' into calendar_import 2012-06-30 12:50:26 +02:00
Georg Ehrke dbc1cf524e fix merge conflicts 2012-06-30 12:44:51 +02:00
Georg Ehrke 39b3e5031a some more work on calendar import class 2012-06-30 12:42:36 +02:00