Victor Saisa Lopez 3f957f2a93 Merge branch 'master' of bitbucket.org:colosa/processmaker ...

Conflicts:
	workflow/engine/src/ProcessMaker/BusinessModel/Variable.php

2014-07-01 10:00:27 -04:00

..

bin

Merge remote branch 'upstream/master'

2014-06-26 16:51:24 -04:00

classes

Fix Dynaform en el campo dyn_version

2014-07-01 09:36:57 -04:00

config

Se agrega el campo DYN_VERSION a la tabla DYNAFORM

2014-06-27 17:00:34 -04:00

content

Updating .po and .sql files with new labels required by backend team

2014-06-11 10:27:06 -04:00

controllers

Merge branch 'master' of github.com:colosa/processmaker

2014-06-30 17:40:01 -04:00

data

Se agrega la tabla PROCESS_VARIABLES

2014-06-26 09:53:21 -04:00

includes

…

js

Merge remote branch 'upstream/master'

2014-06-26 16:51:24 -04:00

lib

…

menus

BUG_14693 Some functionalities inside the BPMN designer are not working.

2014-04-29 13:14:11 -04:00

methods

Merge remote branch 'upstream/master'

2014-06-26 16:51:24 -04:00

plugins

…

skinEngine

updating neoclasic stylesheet, adding left padding to pm main logo

2014-06-30 17:38:48 -04:00

src

Merge branch 'master' of bitbucket.org:colosa/processmaker

2014-07-01 10:00:27 -04:00

templates

Minor changes in 'Get Started' screen

2014-06-27 15:47:26 -04:00

test

…

xmlform

Merge remote branch 'upstream/master'

2014-06-26 16:51:24 -04:00

gulliver-win.bat

…

PmBootstrap.php

…