Brayan Pereyra 088b442feb Correccion de conflictos

2015-03-27 08:55:59 -04:00

..

bin

I solved the notices in cliMafe and added XSS

2015-03-18 08:55:53 -04:00

classes

Correccion de conflictos

2015-03-27 08:55:59 -04:00

config

PM-947

2015-03-23 22:22:10 -04:00

content

Updating translation.en file for PM 3.0 RC2

2015-03-24 15:15:47 -04:00

controllers

Adding marks for batch routing error in community version

2015-03-25 22:30:02 -04:00

data

Updating .po and .sql for PM 3.0 RC2

2015-03-24 14:57:06 -04:00

includes

I reviewed the XSS - MEDIUM in files

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

js

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

2015-03-25 16:24:09 -04:00

lib

…

menus

Correccion de CONSOLIDATED

2015-03-26 15:03:24 -04:00

methods

Merge branch 'CONSOLIDATED' of bitbucket.org:cochalo/processmaker into CONSOLIDATED

2015-03-25 18:21:08 -04:00

plugins

…

skinEngine

Correccion de CONSOLIDATED

2015-03-26 15:03:24 -04:00

src

Correccion COMMUNITY

2015-03-26 16:25:20 -04:00

templates

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

2015-03-25 16:24:09 -04:00

test

…

xmlform

Merged in cochalo/processmaker/CONSOLIDATED (pull request #1768)

2015-03-25 21:55:31 -04:00

gulliver-win.bat

…

PmBootstrap.php

…