Marco Antonio Nina Mena 12e4732f6d Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

2015-04-01 09:19:25 -04:00

..

bin

Resolving conflicts

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

classes

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

2015-04-01 09:19:25 -04:00

config

Resolving conflicts

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

content

Updating translation.en file for PM 3.0 RC2

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

controllers

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

2015-04-01 09:19:25 -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

dashboardprocy console.log for throw correction

2015-03-30 16:42:56 -04:00

lib

…

menus

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

2015-04-01 09:19:25 -04:00

methods

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

2015-04-01 09:19:25 -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

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

2015-04-01 09:19:25 -04:00

templates

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

2015-04-01 09:19:25 -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

…