Julio Cesar Laura Avendaño ee4cc9629e Merge remote-tracking branch 'upstream/3.1-CONTENT' into 3.1

2016-07-21 16:41:42 -04:00

..

bin

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

classes

Merge remote-tracking branch 'upstream/3.1-CONTENT' into 3.1

2016-07-21 16:41:42 -04:00

config

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -04:00

content

Updating .po file for sprint HOR-13

2016-07-12 08:52:54 -04:00

controllers

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -04:00

data

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

includes

VERACODE: I deleted two files

2015-05-04 15:04:39 -04:00

js

HOR-1002 REDIRECT causa problemas cuando se utiliza un skin personalizado

2016-05-16 10:51:38 -04:00

lib

…

menus

HOR-114

2016-06-15 16:31:38 -04:00

methods

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

plugins

…

skinEngine

HOR-1240-A "Show expiration message to system..." SOLVED

2016-06-13 11:21:44 -04:00

src

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

templates

HOR-788

2016-07-21 12:44:23 -04:00

test

Merged in paulis/processmaker/HOR-1089 (pull request #4345)

2016-06-03 10:12:55 -04:00

xmlform

HOR-1019 "Add option to force the ABE user to login..." SOLVED

2016-05-19 14:52:24 -04:00

gulliver-win.bat

…

PmBootstrap.php

HOR-1089

2016-06-02 11:16:30 -04:00