hjonathan 0b6530904e resolve conflicts

2017-07-25 16:20:30 -04:00

..

bin

Merged in bugfix/HOR-3275 (pull request #5682)

2017-05-25 17:05:42 +00:00

classes

Merged in bugfix/HOR-3527 (pull request #5805)

2017-07-24 19:12:56 +00:00

config

HOR-3321

2017-05-31 15:56:32 -04:00

content

Put security fixes to develop branch

2017-06-14 11:14:23 -04:00

controllers

Merged in bugfix/HOR-3298 (pull request #5778)

2017-07-24 16:27:14 +00:00

data

Put security fixes to develop branch

2017-06-14 11:14:23 -04:00

includes

HOR-1738 "Change folder permissions in ProcessMaker" SOLVED

2016-08-30 13:03:35 -04:00

js

FBI-1845: [Zendesk 4786] Click event of button field with submit form method is affecting submit buttons

2017-06-01 13:03:22 -04:00

lib

…

menus

HOR-3184

2017-05-08 11:11:16 -04:00

methods

resolve conflicts

2017-07-25 16:20:30 -04:00

plugins

HOR-1738 "Change folder permissions in ProcessMaker" SOLVED

2016-08-30 13:03:35 -04:00

skinEngine

Merged in bugfix/FBI-1655 (pull request #5611)

2017-05-04 12:37:57 +00:00

src

Merged in feature/HOR-3560 (pull request #5812)

2017-07-24 19:13:40 +00:00

templates

Merged in bugfix/HOR-3374 (pull request #5750)

2017-07-06 17:50:38 +00:00

xmlform

HOR-2909 improvement

2017-05-19 09:06:35 -04:00

gulliver-win.bat

HOR-1738 "Change folder permissions in ProcessMaker" SOLVED

2016-08-30 13:03:35 -04:00

PmBootstrap.php

HOR-1089

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