Commit Graph

1502 Commits (ac8f753e4a683317ef44d22b7ffc12b77ec95eef)

Author SHA1 Message Date
Georg Ehrke ac8f753e4a Merge branch 'my-feature-branch' of github.com:visitha/calendar into visitha-my-feature-branch 2013-10-03 11:58:31 +02:00
Steffen Lindner 2efca8ed71 Fix indent, please 2013-10-02 20:38:03 +02:00
Steffen Lindner 6231c2b1bc Fix indent 2013-10-02 20:37:53 +02:00
Steffen Lindner 17cd9b0c0e Make event sharing more robust - Helps Fix #142 2013-10-02 20:37:34 +02:00
Jenkins for ownCloud 6916dae3e6 [tx-robot] updated from transifex 2013-10-02 10:05:36 -04:00
Georg Ehrke b3cb6039f4 Merge pull request #160 from owncloud/oc_appframework
Port OC_VCategories to OCP\ITags and add CalDAV birthday calendar
2013-10-01 10:21:33 -07:00
Jenkins for ownCloud 566c13e632 [tx-robot] updated from transifex 2013-09-30 10:02:24 -04:00
Jenkins for ownCloud b8799bd466 [tx-robot] updated from transifex 2013-09-29 00:01:06 -04:00
Georg Ehrke a4109ba969 improve readability of calendar settings 2013-09-28 14:06:54 +02:00
Georg Ehrke f357543040 Don't change timezone of datetime-objects with datetype local 2013-09-27 17:24:52 +02:00
Georg Ehrke f52e378f34 fix deleting event and fix php notices 2013-09-27 17:24:52 +02:00
Georg Ehrke e310740896 use own loading.gif, loading.gif is to big in core now 2013-09-27 17:24:52 +02:00
Georg Ehrke 6c1a29b232 make it possible to set saturday as first day of the week 2013-09-27 17:24:52 +02:00
Georg Ehrke e896444103 Revert "fix: get rid of undeclared timezones in caldav ics files"
This reverts commit 6f0ec0acf3.

Conflicts:
	lib/object.php
2013-09-27 17:24:51 +02:00
Georg Ehrke 11078883b9 Merge pull request #153 from ariellp/patch-1
Fix of #860: Code shown instead of HTML entity when opening timepicker
2013-09-27 08:16:31 -07:00
Jenkins for ownCloud eb15872064 [tx-robot] updated from transifex 2013-09-26 23:59:09 -04:00
Thomas Tanghus c10e2ddec8 Used wrong variable 2013-09-26 11:50:44 +02:00
Thomas Tanghus 8f540a1120 Fix birthday generation and add CalDAV birthdays. 2013-09-25 23:14:57 +02:00
Thomas Tanghus 2a322c63bd Check for CATEGORIES before using it 2013-09-25 18:47:22 +02:00
Ariel dc4bdab777 Fix of #860: Code shown instead of HTML entity when opening timepicker 2013-09-24 15:37:52 -03:00
Jenkins for ownCloud 6d05bcba0b [tx-robot] updated from transifex 2013-09-24 12:55:19 -04:00
Jenkins for ownCloud f62de1cdc0 [tx-robot] updated from transifex 2013-09-22 12:49:02 -04:00
Jenkins for ownCloud c0a24ca270 [tx-robot] updated from transifex 2013-09-20 09:51:05 -04:00
Jenkins for ownCloud 8efc80058d [tx-robot] updated from transifex 2013-09-18 11:44:35 -04:00
Jenkins for ownCloud bbdb75a195 [tx-robot] updated from transifex 2013-09-16 11:31:07 -04:00
Thomas Tanghus 871581a759 Change the most obvious OC_ methods to OCP\ 2013-09-16 01:37:30 +02:00
Jenkins for ownCloud 5a05068c60 [tx-robot] updated from transifex 2013-09-13 21:44:40 -04:00
Jenkins for ownCloud b27686f406 [tx-robot] updated from transifex 2013-09-11 06:44:44 -04:00
Jenkins for ownCloud bcfb329719 [tx-robot] updated from transifex 2013-09-10 10:38:37 -04:00
Jenkins for ownCloud 139ba9333e [tx-robot] updated from transifex 2013-09-08 21:35:25 -04:00
Thomas Tanghus a7a288a8c7 Add missing js/jquery.multi-autocomplete.js 2013-09-07 15:44:11 +02:00
Jenkins for ownCloud 21fe1c1062 [tx-robot] updated from transifex 2013-09-07 04:38:43 -04:00
Jenkins for ownCloud 01cbfb3e51 [tx-robot] updated from transifex 2013-09-05 07:33:54 -04:00
Jenkins for ownCloud 019fd55827 [tx-robot] updated from transifex 2013-09-03 07:30:27 -04:00
Jenkins for ownCloud 564d4047cd [tx-robot] updated from transifex 2013-09-01 13:26:33 -04:00
Jenkins for ownCloud e6c37e8f01 [tx-robot] updated from transifex 2013-08-30 09:29:19 -04:00
Jenkins for ownCloud 8a5171965c [tx-robot] updated from transifex 2013-08-28 06:20:02 -04:00
Jenkins for ownCloud 7d7e8ac958 [tx-robot] updated from transifex 2013-08-27 10:31:38 -04:00
Jenkins for ownCloud 995a1a7b4b [tx-robot] updated from transifex 2013-08-25 19:16:02 -04:00
Jenkins for ownCloud 383ff2d397 [tx-robot] updated from transifex 2013-08-23 20:13:34 -04:00
Georg Ehrke 6c3fa8b4fa Merge pull request #121 from owncloud/fix-upgrade
Use the doctrine code to rename the tables
2013-08-23 05:03:06 -07:00
petemcfarlane 3e422ee32b Update object.php - Solves issue #124 2013-08-23 08:43:34 +01:00
Jenkins for ownCloud 3ec8472757 [tx-robot] updated from transifex 2013-08-22 10:35:49 -04:00
Jenkins for ownCloud 8c1f559ce2 [tx-robot] updated from transifex 2013-08-21 08:08:56 -04:00
Jenkins for ownCloud 7d3c0b7b95 [tx-robot] updated from transifex 2013-08-19 15:04:56 -04:00
Bart Visscher fedf79f1f3 Use the doctrine code to rename the tables 2013-08-17 18:04:42 +02:00
Jenkins for ownCloud c9d10290bd [tx-robot] updated from transifex 2013-08-13 09:09:26 -04:00
Georg Ehrke 83b7e2669d Merge pull request #97 from dupondje/master
Change background color
2013-08-13 01:10:40 -07:00
Georg Ehrke f609d940ba make scrolling slower 2013-08-12 12:59:11 +02:00
Georg Ehrke 0e2bc1a67c disable scrolling in week view 2013-08-12 12:51:21 +02:00