jennylee 103daf3650 Merge branch 'master' of bitbucket.org:jennydmz/processmaker ...

Conflicts:
	workflow/engine/js/stagesmap/core/stagesmap.js
	workflow/engine/xmlform/tracker/tracker_Configuration.xml

2014-06-05 09:55:43 -04:00

..

bin

…

classes

Correcion a realizar upgrade de PM

2014-06-03 11:21:25 -04:00

config

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

content

Updating .po and .sql files (requested by Erik)

2014-05-22 15:29:49 -04:00

controllers

little tweaks to show pmui and mafe versions on system information section

2014-05-29 17:17:15 -04:00

data

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

includes

…

js

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

2014-06-05 09:55:43 -04:00

lib

…

menus

…

methods

Merge remote branch 'upstream/master'

2014-06-02 16:20:20 -04:00

plugins

…

skinEngine

Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00

src

Adicion de validacion en el nombre del CASE SCHEDULER

2014-06-04 14:31:37 -04:00

templates

BUG 15074 Section DESIGNER message 'One item should be selected in order to execute the action.' is not displayed when not selected any row. SOLVED

2014-06-04 14:14:54 -04:00

test

…

xmlform

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

2014-06-05 09:55:43 -04:00

gulliver-win.bat

…

PmBootstrap.php

…