Dante Loayza 1ba81d4fa5 Merged master into dashboards2

2015-04-20 11:17:35 -04:00

..

bin

Merged in victorsl/processmaker/PM-1903 (pull request #1827)

2015-04-06 23:37:45 -04:00

classes

Merged master into dashboards2

2015-04-20 11:17:35 -04:00

config

PM-2320 "Add DEL_RISK_DATE field in tables Delegation..." SOLVED

2015-04-15 14:52:15 -04:00

content

Updating .po .sql and .en files for release PM3.0 RC3

2015-04-07 18:02:00 -04:00

controllers

Merged in cochalo/processmaker/PM-2256 (pull request #1924)

2015-04-16 08:37:08 -04:00

data

confflict correction in insert part 2

2015-04-20 11:16:45 -04:00

includes

…

js

styles corrections

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

lib

…

menus

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

2015-04-08 15:50:04 -04:00

methods

Merged master into dashboards2

2015-04-20 11:17:35 -04:00

plugins

…

skinEngine

update login v2

2015-04-17 14:19:03 -04:00

src

Merged master into dashboards2

2015-04-20 11:17:35 -04:00

templates

Merged master into dashboards2

2015-04-20 11:17:35 -04:00

test

…

xmlform

Merged in jonathanquispe/processmaker/PM2074 (pull request #1944)

2015-04-18 10:25:22 -04:00

gulliver-win.bat

…

PmBootstrap.php

…