Paula V. Quispe 4f56ab4f81 I solve the conflicts

2015-04-22 08:47:01 -04:00

..

bin

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

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

classes

I solved issues [April 18]

2015-04-21 13:42:09 -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 .sql and .en files for release PM3.0 RC3

2015-04-07 18:02:00 -04:00

controllers

I solve the conflicts

2015-04-22 08:47:01 -04:00

data

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

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

includes

I reviewed the XSS - MEDIUM in files

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

js

Removing unnecessary files

2015-04-08 10:51:49 -04:00

lib

…

menus

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

2015-04-08 15:50:04 -04:00

methods

I solved issues with Cryptographic Issues [April 18]

2015-04-21 12:03:52 -04:00

plugins

…

skinEngine

update login v2

2015-04-17 14:19:03 -04:00

src

PM-2301-IMPROVEMENT

2015-04-17 14:08:13 -04:00

templates

I solved issues with Cryptographic Issues [April 18]

2015-04-21 12:03:52 -04:00

test

PM-1340-74-1593-1511

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

xmlform

Merged in jonathanquispe/processmaker/PM2074 (pull request #1944)

2015-04-18 10:25:22 -04:00

gulliver-win.bat

…

PmBootstrap.php

…