Erik Amaru Ortiz b4d32fcb58 Merge branch 'performance' ...

Conflicts:
	workflow/public_html/sysGeneric.php

2014-03-12 18:33:22 -04:00

..

bin

Refactoring Bpmn/Workflow handling layer (3rd commit)

2014-02-03 19:37:50 -04:00

core

More performance changes

2014-03-11 18:05:55 -04:00

includes

Adding missing smarty plugin translate implementation

2013-05-15 15:40:07 -04:00

js

Rename maborak concat funtion in Object.prototype to concatMaborak to avoid name conflicts

2014-02-26 15:42:12 -04:00

methods

BUG 12738 "SQL doesn't work in GRID - Text-Area..." SOLVED

2013-10-24 17:00:32 -04:00

system

Merge branch 'performance'

2014-03-12 18:33:22 -04:00

templates

Updating Controller Exception View Rendering

2014-02-28 09:37:29 -04:00

thirdparty

BUG FIX - ORM PROPEL had a litle bug, when selecting tables that have foreign keys

2013-12-05 20:35:55 -04:00