Dante 710297dfc4 Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 ...

Conflicts:
	workflow/engine/templates/strategicDashboard/formDashboard.js

2015-04-27 16:20:52 -04:00

..

bin

Merged in victorsl/processmaker/PM-2409 (pull request #2004)

2015-04-27 13:47:44 -04:00

classes

Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2008)

2015-04-27 15:33:50 -04:00

config

schema xml

2015-04-24 13:25:56 -04:00

content

…

controllers

getting rid of hardcoded strings

2015-04-24 13:17:02 -04:00

data

Merged in mcuiza/processmaker/PM-2433 (pull request #1997)

2015-04-24 13:59:52 -04:00

includes

…

js

NDD-54, NDD-46, NDD-53

2015-04-27 16:15:06 -04:00

lib

…

menus

…

methods

Merged in victorsl/processmaker/PM-2430 (pull request #2000)

2015-04-27 13:47:11 -04:00

plugins

…

skinEngine

PM-2346 resolved

2015-04-27 10:07:16 -04:00

src

Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2008)

2015-04-27 15:33:50 -04:00

templates

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

2015-04-27 16:20:52 -04:00

test

…

xmlform

Merged in dheeyi/processmaker/PM-2206 (pull request #2001)

2015-04-27 13:52:09 -04:00

gulliver-win.bat

…

PmBootstrap.php

…