jennylee 93700de426 Fixing conflicts

2015-03-27 17:56:11 -04:00

..

bin

Resolving conflicts

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

classes

lasts corrections

2015-03-27 17:25:06 -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

Non conflict files

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

data

mysql schema

2015-03-26 18:58:59 -04:00

includes

I reviewed the XSS - MEDIUM in files

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

js

Non conflict files

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

lib

…

menus

hash license features update

2015-03-26 19:13:46 -04:00

methods

Fixing conflicts

2015-03-27 17:56:11 -04:00

plugins

…

skinEngine

PM-1758 Classic Designer > DYNAFORMS > Condition editor: Al abrir el 'CONDITIONAL EDITOR' dentro de un Dynaform la ventana del navegaor de IE sufre una transformacióausando la desaparicióel menúncipal y la cabecera

2015-03-24 15:48:57 -04:00

src

Resolving conflicts

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

templates

Fixing conflicts

2015-03-27 17:56:11 -04:00

test

PM-1340-74-1593-1511

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

xmlform

Merged in cochalo/processmaker/CONSOLIDATED (pull request #1768)

2015-03-25 21:55:31 -04:00

gulliver-win.bat

…

PmBootstrap.php

…