danteloayza cff0e2c6e1 Non conflict files

2015-03-26 17:37:32 -04:00

..

appFolder

…

authSources

…

cases

Merged in luisfernandosl/processmaker/PM-1834 (pull request #1754)

2015-03-23 21:40:29 -04:00

controls

I reviewed the XSS - MEDIUM in last files

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

dashboard

…

dbConnections

…

departments

Merged in dheeyi/processmaker/PM-1736 (pull request #1707)

2015-03-22 22:26:44 -04:00

dynaforms

…

emailServer

…

enterprise

…

events

…

groups

…

inputdocs

…

install

I reviewed the XSS - MEDIUM in files

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

login

…

mails

…

messages

…

oauth2

I solved the credentials management

2015-03-25 12:27:06 -04:00

outputdocs

…

patterns

…

processCategory

…

processes

CORRECCION CONSOLIDATED

2015-03-24 20:35:25 -04:00

reports

…

reportTables

…

roles

…

services

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

setup

Non conflict files

2015-03-26 17:37:32 -04:00

steps

…

strategicDashboard

Non conflict files

2015-03-26 17:37:32 -04:00

tasks

…

tools

…

tracker

PM-1870 Stage Map esta bloqueado ó no se puede realizar ninguna accion SOLVED

2015-03-23 18:37:13 -04:00

triggers

…

users

Non conflict files

2015-03-26 17:37:32 -04:00