jennylee 4629ff8add Fixing a merge error

2015-04-17 10:48:39 -04:00

..

bin

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

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

classes

Fixing a merge error

2015-04-17 10:48:39 -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

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

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

includes

I reviewed the XSS - MEDIUM in files

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

js

Removing unnecessary files

2015-04-08 10:51:49 -04:00

lib

…

menus

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

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

methods

Merged in victorsl/processmaker/DEL_RISK_DATE (pull request #1929)

2015-04-15 17:48:15 -04:00

plugins

…

skinEngine

update login

2015-04-15 16:11:04 -04:00

src

PM-2112 "Fix: 0016986: REST endpoint PUT /{workspace}/oauth2/token sets.." SOLVED

2015-04-17 10:04:59 -04:00

templates

update login

2015-04-15 16:11:04 -04:00

test

PM-1340-74-1593-1511

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

xmlform

Merged in cochalo/processmaker/PM-2335 (pull request #1936)

2015-04-17 08:45:38 -04:00

gulliver-win.bat

…

PmBootstrap.php

…