Commit Graph

9456 Commits

Author SHA1 Message Date
Erik Amaru Ortiz
7973504fe8 Merged in wnestor/processmaker (pull request #636)
Arreglos en los escenarios del behat cases list
2014-08-04 15:55:31 -04:00
Wendy Nestor
7421cb9e28 Arreglos en los escenarios del behat cases list 2014-08-04 15:39:59 -04:00
Wendy Nestor
a30d74efd5 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-08-04 12:37:02 -04:00
Erik Amaru Ortiz
9a5e327f5d Merged in victorsl/processmaker (pull request #628)
ProcessMaker-BE "No se borran las condiciones cuando un Gateway se actualiza su tipo a PARALLEL (Bug)"
2014-08-04 12:22:25 -04:00
Wendy Nestor
e2c9e6571e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-08-04 09:43:56 -04:00
Erik Amaru Ortiz
4937ca2541 Merged in wnestor/processmaker (pull request #632)
Arreglos en los features file manager y project resources y adicion de una funcion en RestContext
2014-08-04 09:37:54 -04:00
Erik Amaru Ortiz
abfdb95e36 Merged in darojas/processmaker (pull request #633)
Se aumenta validacion en delete y se agrega el encode en var_accepted_values.
2014-08-04 09:37:09 -04:00
Wendy Nestor
b1ec4545d7 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-08-04 09:14:26 -04:00
Julio Cesar Laura Avendaño
a657c4723e Merged in gproly/processmaker (pull request #634)
Refactor methods
2014-08-01 17:00:23 -04:00
Roly Rudy Gutierrez Pinto
f24f1a65d2 Refactor methods 2014-08-01 13:06:51 -04:00
Daniel Rojas
0fc7584165 Se aumenta validacion en delete y se agrega el encode en var_accepted_values. 2014-08-01 10:25:33 -04:00
Wendy Nestor
9268019870 Arreglos en los features file manager y project resources y adicion de una funcion en RestContext 2014-08-01 08:48:38 -04:00
Julio Cesar Laura Avendaño
946ce051c1 Merged in gproly/processmaker (pull request #631)
PMDynaform implements mode readonly
2014-07-31 13:19:02 -04:00
Roly Rudy Gutierrez Pinto
5810c73838 PMDynaform implements mode readonly 2014-07-31 13:00:14 -04:00
Victor Saisa Lopez
25e4e52ffe ProcessMaker-BE "No se borran las condiciones cuando un Gateway se actualiza su tipo a PARALLEL (Bug)"
- No se borran las condiciones cuando un Gateway se actualiza su tipo a PARALLEL
- Solucion, Al actualizar el tipo de un Gateway a PARALLEL se
  borran las condiciones
2014-07-30 16:48:19 -04:00
Fernando Ontiveros
37f74fd9e9 Merged in darojas/processmaker (pull request #627)
Se corrige Bug: Grupos inactivos son visualizados en la lista de grupos disponibles AdHoc
2014-07-30 09:23:22 -04:00
Fernando Ontiveros
0feb5b94bc Merged in victorsl/processmaker (pull request #621)
ProcessMaker-BE "Process ----> Generate BPMN (Endpoint)"
2014-07-30 09:21:30 -04:00
Victor Saisa Lopez
225de1d7fc ProcessMaker-BE "Process ----> Generate BPMN (Endpoint)"
- Se ha implementado el siguiente Endpoint:
    POST /api/1.0/{workspace}/project/generate-bpmn
2014-07-29 16:31:19 -04:00
Victor Saisa Lopez
c887b5549d ProcessMaker-BE "Process ----> Generate BPMN (Endpoint)"
- Se ha implementado el siguiente Endpoint:
    POST /api/1.0/{workspace}/project/generate-bpmn
2014-07-29 16:10:58 -04:00
Daniel Rojas
9905a7e997 Se corrige Bug: Grupos inactivos son visualizados en la lista de grupos disponibles AdHoc 2014-07-29 12:58:03 -04:00
Victor Saisa Lopez
03d5caee3e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-29 12:33:25 -04:00
Fernando Ontiveros
28366c62d7 Merged in gproly/processmaker (pull request #626)
change pmdynafor implementatio
2014-07-29 11:06:22 -04:00
Daniel Rojas
3f648c2dc4 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-29 10:59:29 -04:00
Erik Amaru Ortiz
244b1958d3 Merged in darojas/processmaker (pull request #624)
Se corrige warning en process_supervisor
2014-07-29 09:38:30 -04:00
Victor Saisa Lopez
09c0de49f7 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-29 08:50:11 -04:00
Erik Amaru Ortiz
6dac1307aa Merged in wnestor/processmaker (pull request #625)
Modificacion en feature step, adhoc y adicion de nuevos escenarios en el feature project y project import export
2014-07-28 16:03:04 -04:00
Daniel Rojas
ff0024385a Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-28 13:04:48 -04:00
Roly Rudy Gutierrez Pinto
4df55f8b26 change pmdynafor implementatio 2014-07-28 12:15:47 -04:00
Wendy Nestor
464bd07af8 Modificacion en feature step, adhoc y adicion de nuevos escenarios en el feature project y project import export 2014-07-28 10:48:37 -04:00
Daniel Rojas
fede69d76e Se corrige warning en process_supervisor 2014-07-28 10:15:25 -04:00
Victor Saisa Lopez
55d7a7a075 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-28 08:44:11 -04:00
Erik Amaru Ortiz
5487aa27c0 Merged in darojas/processmaker (pull request #623)
Se cambia var_accepted_values a LongVarchar en VARIABLES
2014-07-25 16:42:07 -04:00
Daniel Rojas
e7e345e014 Se cambia var_accepted_values a LongVarchar en VARIABLES 2014-07-25 16:26:39 -04:00
Victor Saisa Lopez
7a6462e588 Merge branch 'master' of bitbucket.org:colosa/processmaker
Conflicts:
	workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
2014-07-25 11:56:22 -04:00
eriknyk
07f6c824d5 Fix little error, on asignationof '[participants]' 2014-07-25 11:46:03 -04:00
eriknyk
624a2d4ff1 Fix for warning while create projects without a diagram element like evets, etc 2014-07-25 11:39:47 -04:00
Victor Saisa Lopez
f1edbc7e87 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-25 11:23:11 -04:00
eriknyk
e1ef3d58ce solving remove project problem 2014-07-25 10:50:20 -04:00
Victor Saisa Lopez
5b4b571f0f ProcessMaker-BE "Proceso -----> Generar BPMN (Endpoint)"
- Se ha implementado el siguiente Endpoint:
    POST /api/1.0/{workspace}/project/process/{pro_uid}/generate-bpmn
2014-07-24 17:18:48 -04:00
Victor Saisa Lopez
31e9f0e198 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-24 09:05:07 -04:00
Julio Cesar Laura Avendaño
78514df709 Merged in gproly/processmaker (pull request #619)
solved the problem of incompatibility between TemplatePower.php and BackBone
2014-07-23 12:21:07 -04:00
Roly Rudy Gutierrez Pinto
2a3e8e79cc solved the problem of incompatibility between TemplatePower.php and BackBone 2014-07-23 11:23:29 -04:00
Victor Saisa Lopez
bd64b13582 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-23 09:20:48 -04:00
eriknyk
89338a7759 Improvement on Rakefile, now a commit log file is generated for each PM libinto /workflow/public_html/lib directory 2014-07-22 19:19:56 -04:00
Erik Amaru Ortiz
c7bfec65fc Merged in cochalo/processmaker (pull request #618)
Adicion en importacion
2014-07-22 17:26:49 -04:00
Erik Amaru Ortiz
dff690408e Merged in darojas/processmaker (pull request #617)
Se quita la validacion para evn_name en BpmnWorkflow. Este campo no sera requerido. Cambios en Behat
2014-07-22 17:08:59 -04:00
Brayan Osmar Pereyra Suxo
e472b6846d Adicion en importacion 2014-07-22 16:57:24 -04:00
Victor Saisa Lopez
1276258457 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-22 16:25:04 -04:00
Brayan Osmar Pereyra Suxo
23e1529459 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-22 16:12:41 -04:00
Daniel Rojas
621dfed30a Se quita el tests para la validacion para evn_name en project. 2014-07-22 16:06:58 -04:00