Georg Ehrke
|
41639f0517
|
fix fail in sql query of isDuplicate method of OC_Calendar_Import
|
2012-08-17 21:29:26 +02:00 |
Bart Visscher
|
b12ed88794
|
Calendar: remove double html encoding
|
2012-08-03 16:18:33 +02:00 |
|
Georg Ehrke
|
bccd372565
|
Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
|
2012-07-27 14:17:55 +02:00 |
|
Georg Ehrke
|
f7155b4276
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:46:03 +02:00 |
|
Georg Ehrke
|
f9d3388854
|
Merge branch 'master' into calendar_import
|
2012-07-21 17:37:10 +02:00 |
|
Bart Visscher
|
060b8865a4
|
DRY for getting calendar timezone setting
|
2012-07-21 00:45:30 +02:00 |
Thomas Tanghus
|
258df5eea2
|
Added hook for postCreateUser. Probably fix for oc-1265.
|
2012-07-17 03:04:04 +02:00 |
|
Georg Ehrke
|
f875240b47
|
comment out some code
|
2012-07-06 11:23:20 +02:00 |
|
Georg Ehrke
|
c036700c54
|
some more work on calendar import
|
2012-07-03 22:33:24 +02:00 |
|
Georg Ehrke
|
803f2c2517
|
some work on calendar import
|
2012-07-01 21:36:09 +02:00 |
|
Georg Ehrke
|
6a060ecd23
|
use light grey instead of white
|
2012-07-01 01:02:54 +02:00 |
|
Georg Ehrke
|
be11f71d27
|
fix doc for OC_Calendar_Calendar::generateTextColor()
|
2012-07-01 00:31:05 +02:00 |
|
Georg Ehrke
|
601237a0c3
|
add algorithm to generate the calendar's text color
|
2012-07-01 00:09:33 +02:00 |
|
Georg Ehrke
|
ce331bd1d3
|
improvements for dropoimport
|
2012-06-30 23:18:41 +02:00 |
|
Georg Ehrke
|
a705b19cd5
|
little fix for import
|
2012-06-30 22:45:12 +02:00 |
|
Georg Ehrke
|
f15941a967
|
improve dropimport
|
2012-06-30 22:26:29 +02:00 |
|
Georg Ehrke
|
4890bbb30d
|
Merge branch 'master' into calendar_import
|
2012-06-30 22:08:36 +02:00 |
|
Georg Ehrke
|
376431fa0d
|
import works now for dropimport
|
2012-06-30 22:08:30 +02:00 |
|
Georg Ehrke
|
fa5b31ac9c
|
fix documentation style
|
2012-06-30 17:09:20 +02:00 |
|
Georg Ehrke
|
8e0addebc3
|
fix some doc
|
2012-06-30 15:39:20 +02:00 |
|
Georg Ehrke
|
34b2486d53
|
some improvements for calendar export
|
2012-06-30 15:23:21 +02:00 |
|
Georg Ehrke
|
390f5cc89f
|
some work on (drop)import)
|
2012-06-30 15:17:29 +02:00 |
|
Georg Ehrke
|
433d15d309
|
Merge branch 'master' into calendar_import
|
2012-06-30 12:50:26 +02:00 |
|
Georg Ehrke
|
6e6f90a8a2
|
fix merge conflicts
|
2012-06-30 12:44:51 +02:00 |
|
Georg Ehrke
|
34d4eb8edd
|
some more work on calendar import class
|
2012-06-30 12:42:36 +02:00 |
|
Georg Ehrke
|
246894243a
|
Merge branch 'master' into calendar_import
|
2012-06-29 21:46:09 +02:00 |
|
Georg Ehrke
|
652a874fa6
|
fix displaying of events
|
2012-06-29 18:13:52 +02:00 |
|
Georg Ehrke
|
3bcf176a53
|
add some hooks to fix calendar sharing
|
2012-06-29 17:27:29 +02:00 |
|
Georg Ehrke
|
bda0026374
|
fix birthday calendar
|
2012-06-29 15:43:18 +02:00 |
|
Georg Ehrke
|
08e707d258
|
some work on OC_Calendar_Import
|
2012-06-29 14:32:07 +02:00 |
|
Georg Ehrke
|
9dd7ca2667
|
some changes and more doc for OC_Calendar_Export class
|
2012-06-28 18:54:13 +02:00 |
|
Georg Ehrke
|
9a4709e68d
|
fix calendar export for Apple iCal - i hate bloody line ends
|
2012-06-28 16:41:00 +02:00 |
|
Georg Ehrke
|
8712754f8c
|
fix style of some doc
|
2012-06-27 22:27:48 +02:00 |
|
Georg Ehrke
|
1f738d8c9f
|
Merge branch 'master' into calendar_export
|
2012-06-27 22:24:12 +02:00 |
|
Georg Ehrke
|
77c66e8cc4
|
move some documentation to the right place
|
2012-06-27 21:05:46 +02:00 |
|
Georg Ehrke
|
25a50f00bd
|
add merge calendar function and add some documentation to OC_Calendar_Calendar
|
2012-06-27 20:56:58 +02:00 |
|
Georg Ehrke
|
90b5cf680f
|
Merge branch 'master' into calendar_export
|
2012-06-27 14:05:11 +02:00 |
|
Georg Ehrke
|
b9ce4e1f40
|
add OC_Calendar_Object::createUID()
|
2012-06-26 15:20:29 +02:00 |
|
Georg Ehrke
|
c7de74c471
|
Merge branch 'master' into calendar_export
|
2012-06-26 14:15:07 +02:00 |
|
Thomas Tanghus
|
df1eca4fa2
|
Also load categories from VJOURNAL.
|
2012-06-24 22:25:32 +02:00 |
|
Georg Ehrke
|
0939b1b0ab
|
Merge branch 'master' into calendar_export
|
2012-06-22 21:36:51 +02:00 |
|
Bart Visscher
|
1d07b9e291
|
Calendar: Missing userid in allCalendars call
|
2012-06-21 23:30:04 +02:00 |
|
Thomas Tanghus
|
b17bf59ced
|
Only search for VEVENTs.
|
2012-06-21 20:51:23 +02:00 |
|
Georg Ehrke
|
f5740a6f92
|
fix a PHP Notice
|
2012-06-21 15:20:15 +02:00 |
|
Georg Ehrke
|
82e8cb23fe
|
Merge branch 'master' into calendar_export
|
2012-06-21 09:08:26 +02:00 |
|
Bart Visscher
|
fedfa4c98e
|
DateTime objects are directly comparable
|
2012-06-20 21:38:56 +02:00 |
|
Georg Ehrke
|
40e7b56783
|
Merge branch 'master' into calendar_export
|
2012-06-20 20:15:07 +02:00 |
|
Georg Ehrke
|
0f13cbb47d
|
Merge branch 'master' into calendar_repeat
|
2012-06-20 20:14:08 +02:00 |
|
Georg Ehrke
|
c1d205cbf5
|
Merge branch 'master' into calendar_export
|
2012-06-20 20:14:03 +02:00 |
Bjoern Schiessle
|
5a2c93ec2d
|
use sanitizeHTML() function
|
2012-06-20 15:11:14 +02:00 |