[eGroupWare-svn] r55892 - in /branches/14.2/calendar: ./ inc/ lang/

Author: nathangray
Date: Wed Apr 27 17:45:41 2016
New Revision: 55892

URL: http://svn.stylite.de/viewvc/egroupware?rev=55892&view=rev
Log:
Log recurrence end date into history

Modified:
    branches/14.2/calendar/   (props changed)
    branches/14.2/calendar/inc/class.calendar_egw_record.inc.php
    branches/14.2/calendar/inc/class.calendar_tracking.inc.php
    branches/14.2/calendar/inc/class.calendar_uiforms.inc.php
    branches/14.2/calendar/lang/egw_en.lang

Propchange: branches/14.2/calendar/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 17:45:41 2016
@@ -1,2 +1,2 @@
 /branches/Stylite-EPL-11.1/calendar:51445
-/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577,53620,53668,53703,53724-53725,53742,53752,53755,53757,53759,53781-53782,53833,53836,53870,53892,53894,53900,53910,53950,53989,54152,54154,54201,54225,54263,54273,54275,54287,54335,54367,54376,54557-54558,54691,54741,54754,54887,55051,55344,55526
+/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577,53620,53668,53703,53724-53725,53742,53752,53755,53757,53759,53781-53782,53833,53836,53870,53892,53894,53900,53910,53950,53989,54152,54154,54201,54225,54263,54273,54275,54287,54335,54367,54376,54557-54558,54691,54741,54754,54887,55051,55344,55526,55859

Modified: branches/14.2/calendar/inc/class.calendar_egw_record.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_egw_record.inc.php?rev=55892&r1=55891&r2=55892&view=diff
==============================================================================
--- branches/14.2/calendar/inc/class.calendar_egw_record.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_egw_record.inc.php Wed Apr 27 17:45:41 2016
@@ -26,6 +26,7 @@
 		'select-cat'    => array('category'),
 		'select-account'=> array('owner','creator', 'modifier'),
 		'date-time'     => array('modified', 'created','start','end','recur_date'),
+		'date'			=> array('recur_enddate'),
 		'select-bool'	=> array('public', 'non_blocking'),
 		'select'	=> array('priority'),
 	);

Modified: branches/14.2/calendar/inc/class.calendar_tracking.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_tracking.inc.php?rev=55892&r1=55891&r2=55892&view=diff
==============================================================================
--- branches/14.2/calendar/inc/class.calendar_tracking.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_tracking.inc.php Wed Apr 27 17:45:41 2016
@@ -55,6 +55,7 @@
 		'non_blocking'	=>	'non_blocking',
 		'special'	=>	'special',
 		'recurrence'	=>	'recurrence',
+		'recur_enddate'	=>	'recur_enddate',
 		'tz_id'		=>	'tz_id',
 
 		'start'		=>	'start',
@@ -83,6 +84,7 @@
 		'non_blocking'	=>	'non blocking',
 		'special'	=>	'special',
 		'recurrence'=>	'recurrence',
+		'recur_enddate'	=>	'recurrence enddate',
 		'tz_id'		=>	'timezone',
 
 		'start'		=>	'start',

Modified: branches/14.2/calendar/inc/class.calendar_uiforms.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_uiforms.inc.php?rev=55892&r1=55891&r2=55892&view=diff
==============================================================================
--- branches/14.2/calendar/inc/class.calendar_uiforms.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_uiforms.inc.php Wed Apr 27 17:45:41 2016
@@ -2635,6 +2635,7 @@
 				'start'		   => 'date-time',
 				'end'		   => 'date-time',
 				'deleted'      => 'date-time',
+				'recur_enddate'=> 'date',
 
 				'tz_id'        => 'select-timezone',
 

Modified: branches/14.2/calendar/lang/egw_en.lang
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/lang/egw_en.lang?rev=55892&r1=55891&r2=55892&view=diff
==============================================================================
--- branches/14.2/calendar/lang/egw_en.lang (original)
+++ branches/14.2/calendar/lang/egw_en.lang Wed Apr 27 17:45:41 2016
@@ -415,6 +415,7 @@
 recover	calendar	en	Recover
 recovered	calendar	en	Recovered.
 recurrence	calendar	en	Recurrence
+recurrence enddate	calendar	en	Recurrence end date
 recurring event	calendar	en	Recurring event
 reject	calendar	en	Reject
 rejected	calendar	en	Rejected


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z