Paula Quispe 381bf03d1f Update from 3.2 and solve conflicts

2017-03-01 10:51:38 -04:00

..

bin

Code Style

2017-02-10 17:14:20 -04:00

classes

Update from 3.2 and solve conflicts

2017-03-01 10:51:38 -04:00

config

HOR-2457

2016-12-23 16:05:41 -04:00

content

HOR-2789 Audit Log translation

2017-02-24 11:13:23 -04:00

controllers

HOR-2773 we need to use G::is_https() for get the protocol

2017-02-23 15:14:44 -04:00

data

HOR-2789 Audit Log translation

2017-02-24 11:13:23 -04:00

includes

…

js

FBI-1435: Falta parametro para que funcione el RTL en PM

2017-01-02 06:26:35 -05:00

lib

…

menus

…

methods

Merged in feature/HOR-2635 (pull request #5471)

2017-02-24 23:10:56 +00:00

plugins

…

skinEngine

HOR-2773 we need to use G::is_https() for get the protocol

2017-02-23 15:14:44 -04:00

src

Update from 3.2 and solve conflicts

2017-03-01 10:51:38 -04:00

templates

Merged in feature/HOR-2706 (pull request #5462)

2017-02-24 19:12:55 +00:00

test

…

xmlform

Merged in paulis/processmaker/HOR-2114 (pull request #5231)

2016-12-06 21:42:04 +00:00

gulliver-win.bat

…

PmBootstrap.php

…