dheeyi 779fc75c71 Merge remote branch 'upstream/master' into PM-1879

2015-04-28 15:04:10 -04:00

..

bin

Merged in luisfernandosl/processmaker/PM-807 (pull request #2019)

2015-04-27 16:33:15 -04:00

classes

Merged in paulis/processmaker/PM-VERACODE-21 (pull request #1980)

2015-04-27 15:41:32 -04:00

config

schema xml

2015-04-24 13:25:56 -04:00

content

Updating .po and .sql file for PM3-RC4

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

controllers

Merged in paulis/processmaker/PM-VERACODE-21 (pull request #1980)

2015-04-27 15:41:32 -04:00

data

Merged in mcuiza/processmaker/PM-2433 (pull request #1997)

2015-04-24 13:59:52 -04:00

includes

…

js

getting rid of hardcoded strings

2015-04-24 13:17:02 -04:00

lib

…

menus

Add css icon strategic dashboard

2015-04-21 10:02:11 -04:00

methods

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

2015-04-28 13:22:41 -04:00

plugins

…

skinEngine

Merged in luisfernandosl/processmaker/PM-2496 (pull request #2021)

2015-04-27 16:32:48 -04:00

src

PM-2394 Se muestra un "warning php" en "web entry" cuando dynaform esta vacio.

2015-04-27 17:11:19 -04:00

templates

Merged in luisfernandosl/processmaker/PM-2493 (pull request #2023)

2015-04-28 14:06:34 -04:00

test

…

xmlform

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

2015-04-28 13:22:41 -04:00

gulliver-win.bat

…

PmBootstrap.php

…