Dante 645bb86b22 schema confflicts resolution 4

2015-06-17 16:58:43 -04:00

..

bin

Merged in paulis/processmaker/PM-2815-PM (pull request #2313)

2015-06-12 14:42:59 -04:00

classes

Merged master into dashboards2

2015-06-15 17:29:52 -04:00

config

schema confflicts resolution 4

2015-06-17 16:58:43 -04:00

content

…

controllers

Merged master into dashboards2

2015-06-15 17:29:52 -04:00

data

Add field cost and unit cost in tables user reporting and pro reporting

2015-06-03 17:20:00 -04:00

includes

…

js

Integration to TimeSeries Comparison in dashboard view page

2015-06-12 10:24:35 -04:00

lib

…

menus

PM-2938: I correct some issues

2015-06-12 15:27:01 -04:00

methods

Merged master into dashboards2

2015-06-15 17:29:52 -04:00

plugins

…

skinEngine

PM-2672

2015-05-29 12:03:35 -04:00

src

Merged master into dashboards2

2015-06-15 17:29:52 -04:00

templates

Merged master into dashboards2

2015-06-15 17:29:52 -04:00

test

…

xmlform

Merged in paulis/processmaker/PM-2815-PM (pull request #2313)

2015-06-12 14:42:59 -04:00

gulliver-win.bat

…

PmBootstrap.php

…