Brayan Osmar Pereyra Suxo ada444fc2e Correcion de conflictos

2014-01-23 15:11:26 -04:00

..

bin

IMPROVEMENT for the new option '+force' in the cron file

2014-01-10 11:26:08 -04:00

classes

Commit for PUT /project/{prj_uid}, 2nd commit, still not functional

2014-01-17 13:37:15 -04:00

config

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

2014-01-15 11:14:59 -04:00

content

Updating .po and .sql files for release 2.5.2

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

controllers

Endpoint: POST /project is ready

2013-12-17 11:14:36 -04:00

data

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

2014-01-15 11:14:59 -04:00

includes

…

js

Codemirror IMPROVEMENT

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

lib

…

menus

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

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

methods

Litle fix, adding user agent on curl call, for access token exchenge script.

2014-01-15 19:56:44 -04:00

plugins

…

skinEngine

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

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

src

Correcion de conflictos

2014-01-23 15:11:26 -04:00

templates

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

2014-01-15 11:14:59 -04:00

test

…

xmlform

BUG-13788 SOLVED Cuando se realiza cambios en el contenido de la ventana de edición de triggers y posteriormente se minimiza la ventana, al hacer click nuevamente sobre el botón de edición que invoco a la ventana, la fuente de código modificado se pierde, volviéndose a cargar el fuente original.

2014-01-07 14:35:54 -04:00

gulliver-win.bat

…

PmBootstrap.php

…