Erik Amaru Ortiz 7a47472ea1 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	workflow/engine/classes/class.processMap.php
	workflow/engine/classes/model/AdditionalTables.php

2014-04-02 09:34:54 -04:00

..

conditionalShowHide_Ajax.php

…

conditionalShowHide.php

…

datemask.php

…

dynaform_Fields.php

…

dynaforms_Ajax.php

…

dynaforms_AssignVariables.php

…

dynaforms_checkDependentFields.php

…

dynaforms_ChoseType.php

…

dynaforms_Delete.php

…

dynaforms_Edit.php

…

dynaforms_Editor.php

…

dynaforms_FlatEditor.php

…

dynaforms_List.php

…

dynaforms_NewPlugin.php

…

dynaforms_PagedTableAjax.php

…

dynaforms_Preview.php

…

dynaforms_Save_as.php

…

dynaforms_Save.php

…

dynaforms_Saveas.php

…

dynaforms_SaveProperties.php

…

dynaforms_ToolbarAjax.php

…

fields_Ajax.php

Fix incorrect object declaration, PHP 5.4.x compatibility

2014-02-25 13:08:56 -04:00

fields_Delete.php

…

fields_Edit.php

…

fields_List.php

…

fields_Order.php

…

fields_Save.php

…

fieldsGetterAjax.php

…

fieldsHandler.php

…

fieldsHandlerAjax.php

…

fieldsHandlerViewer.php

…

test.php

…