Brayan Osmar Pereyra Suxo 972e750a54 Correcion de conflicto

2014-02-10 14:57:22 -04:00

..

bin

BUG 13938 Line error_reporting(E_ALL) in cron.php and cron_single.php is generating unnecesary errors SOLVED

2014-01-21 13:02:08 -04:00

classes

Adding Test Units for BpmnEvent, BpmnGateway classes

2014-02-10 13:09:50 -04:00

config

updates for adapter flows -> to -> route

2014-02-07 08:41:11 -04:00

content

Updating .po and .sql files for release 2.5.2

2013-11-28 15:54:38 -04:00

controllers

adding dynamic include for js and css files for designer.html template for debug mode

2014-02-06 18:55:44 -04:00

data

updates for adapter flows -> to -> route

2014-02-07 08:41:11 -04:00

includes

…

js

Codemirror IMPROVEMENT

2013-11-29 14:50:01 -04:00

lib

Fixing additional file permissions before final commit

2012-11-30 10:47:17 -04:00

menus

Updates on Oauth register method and New designer open action on process list

2013-11-06 10:10:36 -04:00

methods

Refactoring Bpmn/Workflow handling layer (2nd commit)

2014-01-31 18:49:57 -04:00

plugins

Changing deprecated json->decode json->encode by Bootstrap functions.

2012-11-29 14:25:06 -04:00

skinEngine

Merge branch 'master' of github.com:colosa/processmaker

2013-11-21 16:38:05 -04:00

src

Correcion de conflicto

2014-02-10 14:57:22 -04:00

templates

Add js TinyMCE in index.html

2014-02-07 15:39:46 -04:00

test

BUG 11830 "Remover la funcion WSDL Web Services..." SOLVED

2013-09-02 09:34:33 -04:00

xmlform

BUG-13892 IMPROVEMENT.

2014-01-17 12:56:40 -04:00

gulliver-win.bat

…

PmBootstrap.php

BUG 0000 "Safe upgrade for JavaScript files" SOLVED

2013-04-12 16:48:23 -04:00