Ronald Quenta 956a10e792 Merge remote branch 'pm/master'

2015-04-22 08:39:38 -04:00

..

bin

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

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

classes

Merged in paulis/processmaker/PM-WARNING (pull request #1975)

2015-04-21 16:48:43 -04:00

config

PM-2211: I added new column Error_mail in Email's log

2015-04-20 16:24:01 -04:00

content

Updating .po and .sql file for PM3-RC4

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

controllers

I corrected a problem when the workspace exists

2015-04-21 12:16:13 -04:00

data

Add data in upgrade processmaker

2015-04-21 13:17:16 -04:00

includes

I reviewed the XSS - MEDIUM in files

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

js

pie 2d drawing corrections

2015-04-21 10:21:12 -04:00

lib

…

menus

Add css icon strategic dashboard

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

methods

Merged colosa/processmaker into master

2015-04-21 14:02:38 -04:00

plugins

…

skinEngine

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

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

src

Merge remote branch 'pm/master'

2015-04-22 08:39:38 -04:00

templates

Merged in cochalo/processmaker/PERFORMANCE (pull request #1970)

2015-04-21 12:40:25 -04:00

test

PM-1340-74-1593-1511

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

xmlform

Se adicion cambio endPoint de listado por llamada Ajax

2015-04-21 12:16:22 -04:00

gulliver-win.bat

…

PmBootstrap.php

…