Bart Visscher
|
b12ed88794
|
Calendar: remove double html encoding
|
2012-08-03 16:18:33 +02:00 |
Jenkins for ownCloud
|
36ccaf51ed
|
[tx-robot] updated from transifex
|
2012-07-31 22:57:24 +02:00 |
|
Jenkins for ownCloud
|
3430dcd367
|
[tx-robot] updated from transifex
|
2012-07-30 02:05:41 +02:00 |
|
Jenkins for ownCloud
|
18f6552a08
|
[tx-robot] updated from transifex
|
2012-07-29 02:06:29 +02:00 |
|
Jenkins for ownCloud
|
fa4052d6f1
|
[tx-robot] updated from transifex
|
2012-07-28 02:05:38 +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 |
|
Jenkins for ownCloud
|
0a9c33e151
|
[tx-robot] updated from transifex
|
2012-07-27 02:04:26 +02:00 |
|
Georg Ehrke
|
f7155b4276
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:46:03 +02:00 |
|
Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
|
Jenkins for ownCloud
|
42c22bee36
|
[tx-robot] updated from transifex
|
2012-07-26 08:03:10 +02:00 |
|
Jenkins for ownCloud
|
37bccf54f2
|
[tx-robot] updated from transifex
|
2012-07-25 22:15:24 +02:00 |
|
Georg Ehrke
|
f9d3388854
|
Merge branch 'master' into calendar_import
|
2012-07-21 17:37:10 +02:00 |
|
Georg Ehrke
|
57207ddb82
|
some style fixes for calendar
|
2012-07-21 17:09:10 +02:00 |
|
Bart Visscher
|
060b8865a4
|
DRY for getting calendar timezone setting
|
2012-07-21 00:45:30 +02:00 |
Lukas Reschke
|
c04aa8d6a9
|
Add CSRF checks
|
2012-07-20 15:45:17 +02:00 |
Thomas Tanghus
|
06ff6c6d7d
|
Added CSRF checks to Calendar. Expect some error messages - and report them ;)
|
2012-07-17 11:46:01 +02:00 |
|
Thomas Tanghus
|
258df5eea2
|
Added hook for postCreateUser. Probably fix for oc-1265.
|
2012-07-17 03:04:04 +02:00 |
|
Georg Ehrke
|
47566b0c42
|
stop using of OC_L10N::tA
|
2012-07-16 20:26:14 +02:00 |
|
Georg Ehrke
|
d49b789348
|
Merge branch 'master' into calendar_import
|
2012-07-15 16:56:38 +02:00 |
Robin Appelman
|
b45d3ced79
|
fix remote and public.php
|
2012-07-13 22:44:35 +02:00 |
|
Georg Ehrke
|
5575493900
|
Merge branch 'master' into calendar_import
|
2012-07-11 10:47:30 +02:00 |
|
Thomas Tanghus
|
3424785db0
|
Implemented Sabre iCalendar Export Plugin.
|
2012-07-08 16:58:17 +02:00 |
|
Georg Ehrke
|
f875240b47
|
comment out some code
|
2012-07-06 11:23:20 +02:00 |
|
Georg Ehrke
|
a4c2893128
|
some more work on calendar import - new import is (nearly) done
|
2012-07-04 21:14:40 +02:00 |
|
Georg Ehrke
|
657eef354a
|
Merge branch 'master' into calendar_import
|
2012-07-04 13:03:30 +02:00 |
|
Georg Ehrke
|
393eefa5d2
|
replace some direct links with OC.imagePath
|
2012-07-03 23:44:47 +02:00 |
|
Georg Ehrke
|
c036700c54
|
some more work on calendar import
|
2012-07-03 22:33:24 +02:00 |
|
Georg Ehrke
|
b6cff93254
|
fix spelling fail in code
|
2012-07-03 16:47:46 +02:00 |
|
Georg Ehrke
|
0b3ed2b048
|
Merge branch 'master' into calendar_import
|
2012-07-03 16:39:09 +02:00 |
|
Georg Ehrke
|
ca2b1f7863
|
fix encoding fail in calendar app - bugfix for oc-1194
|
2012-07-03 13:55:48 +02:00 |
|
Georg Ehrke
|
29a9559fa9
|
some work on calendar import dialog
|
2012-07-03 13:43:18 +02:00 |
|
Georg Ehrke
|
e89a0949c4
|
remove some whitespace
|
2012-07-01 23:32:21 +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 |