Georg Ehrke
|
8cff0d997f
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:48:00 +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 |
Michael Gapczynski
|
30b58f5677
|
Merge branch 'master' into share_api
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
|
2012-07-25 17:08:18 -04:00 |
Michael Gapczynski
|
4d17ed2f71
|
Make file actions permissions aware
|
2012-07-25 16:33:08 -04:00 |
Jenkins for ownCloud
|
37bccf54f2
|
[tx-robot] updated from transifex
|
2012-07-25 22:15:24 +02:00 |
Georg Ehrke
|
9b0870bb91
|
add some calendar sharing hooks in stable4 - bugfix for oc-1325
|
2012-07-25 17:02: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
|
38271ded75
|
Added CSRF checks
|
2012-07-20 20:12:36 +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
|
f4a8c233cf
|
Added hook for postCreateUser. Probably fix for oc-1265.
Conflicts:
apps/calendar/appinfo/app.php
|
2012-07-17 10:35:46 +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
|
d4e2cb6e62
|
fix encoding fail in calendar app - bugfix for oc-1194
|
2012-07-16 19:53:19 +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 |
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 |
Robin Appelman
|
75af5778a4
|
pass progresskey the correct way during calender import
|
2012-06-29 00:49:37 +02:00 |
Georg Ehrke
|
91d92aed02
|
fix for previous commit
|
2012-06-28 19:13:43 +02:00 |
Georg Ehrke
|
4b3af1f73b
|
use OC_Calendar_Export for publicly shared calendars
|
2012-06-28 19:12:50 +02:00 |
Georg Ehrke
|
930bbeabd4
|
Calendar Export: replace spaces with dashes in the name of the calendar / event
|
2012-06-28 19:04:14 +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
|
ae00f40b97
|
add OC_Calendar_Object::createUID()
|
2012-06-26 15:21:41 +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
|
a12557ca4d
|
another fix for oc-1044
|
2012-06-24 09:42:14 +02:00 |
Georg Ehrke
|
ca5de26bac
|
another fix for oc-1044
|
2012-06-24 09:41:37 +02:00 |
Georg Ehrke
|
0939b1b0ab
|
Merge branch 'master' into calendar_export
|
2012-06-22 21:36:51 +02:00 |
Bjoern Schiessle
|
65c14e21ce
|
date don't change correctly in the view list (bug #973) fixed
|
2012-06-22 11:32:57 +02:00 |
Bjoern Schiessle
|
8c28aec664
|
date don't change correctly in the view list (bug #973) fixed
|
2012-06-22 11:30:40 +02:00 |
Bart Visscher
|
fd23c286ef
|
Calendar: Fix caldav url encoding
|
2012-06-21 23:30:04 +02:00 |
Bart Visscher
|
4a22f4ca78
|
Calendar: convert choosecalendar.rowfields template from plain php to html+php
|
2012-06-21 23:30:04 +02:00 |
Bart Visscher
|
1d07b9e291
|
Calendar: Missing userid in allCalendars call
|
2012-06-21 23:30:04 +02:00 |
Bart Visscher
|
c047fdafdb
|
Calendar: Fix missing template parameter 'shared' for new and update calendar
|
2012-06-21 23:30:04 +02:00 |
Thomas Tanghus
|
d72b85684f
|
Only search for VEVENTs.
|
2012-06-21 20:53:50 +02:00 |
Brice Maron
|
a5938e4e37
|
Merge branch 'master' into multi_app_dir
|
2012-06-21 20:19:31 +00:00 |
Thomas Tanghus
|
b17bf59ced
|
Only search for VEVENTs.
|
2012-06-21 20:51:23 +02:00 |
Brice Maron
|
e5c56b2433
|
Merge branch 'master' into multi_app_dir
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
|
2012-06-21 17:15:35 +00:00 |
Georg Ehrke
|
49d9eb7acf
|
fix calendar
|
2012-06-21 16:24:05 +02:00 |
Georg Ehrke
|
096f5598b4
|
fix calendar
|
2012-06-21 16:23:13 +02:00 |
Georg Ehrke
|
288c5e7581
|
fix a PHP Notice
|
2012-06-21 15:20:53 +02:00 |
Georg Ehrke
|
f5740a6f92
|
fix a PHP Notice
|
2012-06-21 15:20:15 +02:00 |
Georg Ehrke
|
37ed3b5bd2
|
make edit event form work with DateTime Property UTC
|
2012-06-21 11:35:58 +02:00 |
Georg Ehrke
|
1db2539223
|
make edit event form work with DateTime Property UTC
|
2012-06-21 11:35:20 +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
|
8e427d80d3
|
use sanitizeHTML() function
|
2012-06-20 17:00:55 +02:00 |
Bjoern Schiessle
|
5a2c93ec2d
|
use sanitizeHTML() function
|
2012-06-20 15:11:14 +02:00 |
Bart Visscher
|
311c2bc0d3
|
Calendar: Write-close session to enable parallel events.php requests
|
2012-06-19 23:18:26 +02:00 |
Georg Ehrke
|
5ce0097b6f
|
Calendar: only run ->expand if the event is repeating
|
2012-06-19 13:30:45 +02:00 |
Georg Ehrke
|
2b2da6fe35
|
Calendar: js fix
|
2012-06-19 13:26:55 +02:00 |
Georg Ehrke
|
c8c105df33
|
Calendar: fix modifying of end DateTime object
|
2012-06-19 13:04:11 +02:00 |
Georg Ehrke
|
13aad8f06d
|
some little fixes for repeating events caching
|
2012-06-18 15:58:01 +02:00 |
Georg Ehrke
|
beed6e0f0e
|
Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
This reverts commit e3b58f6783 .
|
2012-06-18 14:47:58 +02:00 |