Dante Loayza cd988a4e2c Merged master into dashboards2

2015-04-01 11:29:29 -04:00

..

bin

Resolving conflicts

2015-03-26 18:14:51 -04:00

classes

Merged master into dashboards2

2015-04-01 11:29:29 -04:00

config

Improvement file appDelegation

2015-03-31 14:50:17 -04:00

content

Updating translation.en file for PM 3.0 RC2

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

controllers

Merged master into dashboards2

2015-04-01 09:08:57 -04:00

data

conflicts resolution

2015-03-30 11:00:04 -04:00

includes

I reviewed the XSS - MEDIUM in files

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

js

Merged master into dashboards2

2015-03-31 14:29:38 -04:00

lib

…

menus

Merged master into dashboards2

2015-03-31 13:19:03 -04:00

methods

Merged master into dashboards2

2015-04-01 09:08:57 -04:00

plugins

…

skinEngine

PM-1959 Cambiar enlace en la pantalla de login de "Colosa,Inc." a "ProcessMaker Inc."

2015-03-27 15:54:23 -04:00

src

Merged in gproly/processmaker/PM-1969 (pull request #1838)

2015-04-01 09:52:54 -04:00

templates

Merged in victorsl/processmaker/PM-2033 (pull request #1837)

2015-04-01 09:55:29 -04:00

test

PM-1340-74-1593-1511

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

xmlform

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

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

gulliver-win.bat

…

PmBootstrap.php

…