Commit Graph

327 Commits

Author SHA1 Message Date
Georg Ehrke cdf1cf82ba merge 64a617b2a1 into master 2012-02-07 22:49:23 +01:00
Georg Ehrke ab31a890b6 use strip_tags for calendar names 2012-02-02 21:23:41 +01:00
Georg Ehrke bfa69c3e59 add a label calendar to the settings page - bugfix for oc-157 2012-02-02 18:37:06 +01:00
Georg Ehrke 92b8f32386 Calendar: Bugfix: better input validation 2012-02-02 15:01:05 +01:00
Georg Ehrke 30f1de71a6 remove debug file 2012-01-29 16:08:09 +01:00
Georg Ehrke 928e9b121b fix version-compare in calendars app.php 2012-01-29 10:59:15 +01:00
Robin Appelman ad4e305c96 update translations 2012-01-27 00:59:24 +01:00
Robin Appelman 830cf87697 use the correct hooks to remove contact/calendars of remvoed users 2012-01-26 19:05:46 +01:00
Robin Appelman 6fccf12299 update translations 2012-01-24 00:42:08 +01:00
Robin Appelman cdfb252ced Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-24 00:24:09 +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
Robin Appelman 7ea2923fa8 translation updates 2012-01-20 18:53:45 +01:00
Bart Visscher ccad24a925 [Calendar] Use class for active view button 2012-01-19 21:00:19 +01:00
Bart Visscher 838766add0 OC-23: [Calendar] Double vertical scrollbar in week view 2012-01-19 20:50:22 +01:00
Georg Ehrke ce13b3b7cd fix double new calendar button - bugfix for oc 59 2012-01-19 12:27:16 +01:00
Georg Ehrke 69ca0ae177 move loading icon to the top bar 2012-01-17 19:48:29 +01:00
Georg Ehrke 1f95231801 use button for new calendar 2012-01-17 19:09:11 +01:00
Georg Ehrke 6e86b34586 Merge branch 'master' into calendar 2012-01-17 15:57:29 +01:00
Georg Ehrke 91016e37d4 fix ocbug 34 2012-01-17 15:38:32 +01:00
Georg Ehrke 42b1c75a66 fix ocbug 24 2012-01-17 15:18:01 +01:00
Georg Ehrke 2179437726 use timepicker to force users to use HH:MM 2012-01-16 20:22:54 +01:00
Robin Appelman 965ea96439 update translations 2012-01-16 17:34:53 +01:00
Georg Ehrke c81beab96d Merge branch 'master' into calendar 2012-01-15 18:33:46 +01:00
Georg Ehrke 3364502f00 use svg icon for calendar 2012-01-15 18:29:44 +01:00
Robin Appelman 7cd809b286 update translations 2012-01-15 15:12:58 +01:00
Georg Ehrke ec3955b158 change description of the changed colors (calendar) 2012-01-15 10:58:39 +01:00
Georg Ehrke cf1023567b change calendar colors 2012-01-15 10:52:07 +01:00
Georg Ehrke 360778e520 use backslash n instead of a real new line 2012-01-15 00:56:11 +01:00
Georg Ehrke 43f7b2fd2d fix newline problem in calendar 2012-01-15 00:45:27 +01:00
Georg Ehrke 87b46decfa added bart to the authors in info.xml 2012-01-15 00:30:04 +01:00
Georg Ehrke b1433119cc highlight the current view 2012-01-15 00:06:26 +01:00
Georg Ehrke 868cf46290 improve import function 2012-01-14 14:22:30 +01:00
Georg Ehrke f9c4975a45 improve import form for calendar 2012-01-13 13:57:46 +01:00
Georg Ehrke 28e15fd487 Merge branch 'calendar' 2012-01-12 22:07:23 +01:00
Georg Ehrke cd8f54ade2 update js of calendar import 2012-01-12 22:06:53 +01:00
Georg Ehrke 9bcd367873 Merge branch 'master' into calendar 2012-01-12 21:44:56 +01:00
Georg Ehrke 0b45d19ea0 change app icon 2012-01-12 16:50:49 +01:00
Robin Appelman d92b083c1d fix old calendar name and color not being preserved when editing a calendar 2012-01-11 01:53:25 +01:00
Robin Appelman f67e5d18e7 update translations 2012-01-11 01:06:59 +01:00
Georg Ehrke c3cda81577 update calendar pot file 2012-01-07 18:30:32 +01:00
Georg Ehrke 67a8ae084a fix search function 2012-01-07 14:31:47 +01:00
Georg Ehrke f18e866a1e improve search function 2012-01-06 14:36:24 +01:00
Georg Ehrke cb445deb5f fix login check in ajax files 2012-01-05 21:02:11 +01:00
Georg Ehrke 486694c2ec fix js for repeating events 2012-01-05 20:54:44 +01:00
Georg Ehrke a01a3d412c fix autodetection for the week of the month 2012-01-05 17:53:13 +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 d3a0c7354c fix repeat rule for every weekday 2012-01-05 17:09:01 +01:00
Georg Ehrke a88cc91ad9 fix end for repeating events 2012-01-05 17:05:30 +01:00
Georg Ehrke 5ccd26959f remove unused js 2012-01-02 11:39:23 +01:00
Georg Ehrke e6739d230e add function to detect always the timezone 2012-01-02 11:35:50 +01:00
Georg Ehrke 3bb11db943 Merge branch 'master' into calendar 2011-12-29 19:16:33 +01:00
Bart Visscher 3e2e5196d2 Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php
2011-12-27 22:18:01 +01:00
Bart Visscher 5fd595c0bf Calendar: add loading indicator 2011-12-27 21:50:31 +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 ff346ad135 Calendar: small for loop fix 2011-12-18 23:10:43 +01:00
Bart Visscher 4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Thomas Tanghus 39430c837f Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-11 16:29:53 +01:00
Georg Ehrke 56f12cbfb1 delete unused files 2011-12-10 17:54:42 +01:00
Georg Ehrke 33caa64cce check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs 2011-12-10 15:11:41 +01:00
Georg Ehrke b7c754cb32 Merge branch 'master' into calendar 2011-12-10 15:03:33 +01:00
Bart Visscher 1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Thomas Tanghus 7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
2011-12-09 15:25:26 +01:00
Georg Ehrke bd68cee8cf add resettimezone file for testing timezone detection 2011-12-09 14:36:43 +01:00
Georg Ehrke add48b2657 optimize timezone detection 2011-12-09 14:35:59 +01:00
Georg Ehrke 2103c331a0 Merge branch 'master' into calendar 2011-12-08 14:03:14 +01:00
Bart Visscher c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Thomas Tanghus 2b48b733a3 Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup 2011-12-04 20:42:30 +01:00
Georg Ehrke 361d4ac13b fix merge conflicts 2011-12-03 17:25:17 +01:00
Thomas Tanghus 58d1a3516a Removed some debug statements.
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
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