Ronald Q abebd2f2fb up conflict

2016-04-28 08:18:46 -04:00

..

bin

HOR-844

2016-04-27 14:30:04 -04:00

classes

Merged in gproly/processmaker/HOR-846 (pull request #4159)

2016-04-27 19:18:40 -04:00

config

MT-90: Improvements CLI tool: Upgrade cases-lists and cases-list-counters.

2016-04-08 19:25:45 -04:00

content

MT-140 Selective Import/Export Feature: Export Process Definition

2016-04-21 12:12:48 -04:00

controllers

Merged in mcuiza/processmaker/HOR-823 (pull request #4135)

2016-04-22 12:42:06 -04:00

data

MT-140 Selective Import/Export Feature: Export Process Definition

2016-04-21 12:12:48 -04:00

includes

…

js

OM-619:[grid-web-FIREFOX ] Cuando la grilla no tiene filas, se queda con el loading y no continua con el proceso

2016-04-27 14:16:16 -04:00

lib

…

menus

…

methods

Merged in gproly/processmaker/HOR-846 (pull request #4159)

2016-04-27 19:18:40 -04:00

plugins

…

skinEngine

HOR-808

2016-04-20 12:17:27 -04:00

src

up conflict

2016-04-28 08:18:46 -04:00

templates

HOR-850 "Admin -> Users -> Edit User -> Replaced By..." SOLVED

2016-04-26 15:17:18 -04:00

test

…

xmlform

OM-607: Session Block: Cuando se pierde session en alguna de las opciones de Admin>Settings, se bloquea processmaker completamente

2016-04-26 12:28:32 -04:00

gulliver-win.bat

…

PmBootstrap.php

…