Erik Amaru Ortiz 2398200adf Merge branch 'master' of github.com:colosa/processmaker ...

Conflicts:
	workflow/engine/classes/class.plugin.php
	workflow/engine/classes/class.pluginRegistry.php

2013-12-03 18:23:12 -04:00

..

bin

BUG 0000 "Safe upgrade for JavaScript files" SOLVED

2013-04-12 16:48:23 -04:00

core

More Updates for Oauth support

2013-10-10 17:03:56 -04:00

includes

Adding missing smarty plugin translate implementation

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

js

Codemirror IMPROVEMENT

2013-11-29 14:50:01 -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 'master' of github.com:colosa/processmaker

2013-12-03 18:23:12 -04:00

templates

last updating on api controller dispatching

2013-08-30 11:31:59 -04:00

thirdparty

Removing unused libs

2013-08-21 11:50:35 -04:00