dheeyi e51d2ca2b1 Merge remote branch 'upstream/master' into PM-2104

2015-04-20 17:41:04 -04:00

..

bin

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

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

classes

Merge remote branch 'upstream/master' into PM-2104

2015-04-20 17:41:04 -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 and .sql file for PM3-RC4

2015-04-20 14:39:01 -04:00

controllers

Merge remote branch 'upstream/master' into PM-2104

2015-04-16 13:07:30 -04:00

data

Updating .po and .sql file for PM3-RC4

2015-04-20 14:39:01 -04:00

includes

I reviewed the XSS - MEDIUM in files

2015-03-20 14:24:44 -04:00

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

Merge remote branch 'upstream/master' into PM-2104

2015-04-20 08:47:25 -04:00

src

Merged in dashboards2 (pull request #1955)

2015-04-20 11:46:47 -04:00

templates

Merge remote branch 'upstream/master' into PM-2104

2015-04-20 17:41:04 -04:00

test

PM-1340-74-1593-1511

2015-02-27 18:10:59 -04:00

xmlform

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

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

gulliver-win.bat

…

PmBootstrap.php

…