Commit Graph

9429 Commits

Author SHA1 Message Date
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
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
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
Daniel Rojas
9cd5e1a3a4 Se quita la validacion para evn_name en BpmnWorkflow. Siendo este campo no se requerido. 2014-07-22 16:00:41 -04:00
Erik Amaru Ortiz
66d5ca7f66 Merged in darojas/processmaker (pull request #614)
Se modifica el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields
2014-07-22 15:08:47 -04:00
eriknyk
7ad638b98d Improvements, adding error raising to handle break the build if something fails 2014-07-22 15:06:57 -04:00
Brayan Osmar Pereyra Suxo
d2fcabbbc0 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-22 14:40:21 -04:00
Victor Saisa Lopez
c607ad6893 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-22 09:07:18 -04:00
Fernando Ontiveros
e8403738f7 Merged in gproly/processmaker (pull request #616)
Submit implementation
2014-07-21 17:54:25 -04:00
Roly Rudy Gutierrez Pinto
23edb3ef78 Submit implementation 2014-07-21 17:52:30 -04:00
Daniel Rojas
408ca5f870 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-21 16:55:50 -04:00
Brayan Osmar Pereyra Suxo
f3f508965e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-21 16:49:49 -04:00
Fernando Ontiveros
0bbbbaf4e0 Merged in gproly/processmaker (pull request #615)
FormDesigner implements view Desktop, Tablet, Smartphone.
2014-07-21 16:10:51 -04:00
Daniel Rojas
b1abbc247c Se modifica validacion en el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-21 15:46:42 -04:00
Roly Rudy Gutierrez Pinto
34f10a5c56 FormDesigner implements view Desktop, Tablet, Smartphone. 2014-07-21 15:37:35 -04:00
Daniel Rojas
173dc36469 Se modifica validacion en el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-21 15:23:23 -04:00
Daniel Rojas
c3540be38f Se modifica el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-21 15:13:06 -04:00
Victor Saisa Lopez
e64786addb Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-21 09:33:26 -04:00
Erik Amaru Ortiz
f020a295a4 Merged in darojas/processmaker (pull request #612)
Se adiciona el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields - refactored
2014-07-18 17:30:45 -04:00
Daniel Rojas
1ca96d4ea9 Se adiciona el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-18 17:26:10 -04:00
Julio Cesar Laura Avendaño
d2215088f2 Merged in gproly/processmaker (pull request #613)
Change Template
2014-07-18 17:08:29 -04:00
Roly Rudy Gutierrez Pinto
fb9de306b2 FormDesigner change 2014-07-18 17:04:05 -04:00
Daniel Rojas
f137ccb766 Se adiciona el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-18 16:58:27 -04:00
eriknyk
d0210e96b3 adding Bpmn Participant handling support 2014-07-18 16:52:18 -04:00
eriknyk
c927a56b02 adding BpmnData handling support, to Project->diagram object 2014-07-18 12:57:52 -04:00
Daniel Rojas
1d38c1d51d Se adiciona el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields 2014-07-18 11:51:40 -04:00
Erik Amaru Ortiz
1f4ded7897 Merged in darojas/processmaker (pull request #609)
Fix Bug 15443: Se lista varias veces el mismo grupo y la opción "USERS" muestra grupos en la ventana “ASSIGN USERS AND GROUPS AS SUPERVISORS”. Se quita validacion para var_default en process_variables
2014-07-18 11:47:39 -04:00
Fernando Ontiveros
d537e295b2 Merged in gproly/processmaker (pull request #610)
Running Cases: add Pmdynaform
2014-07-18 10:17:27 -04:00
Victor Saisa Lopez
abea5cc871 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-07-17 16:26:48 -04:00
Roly Rudy Gutierrez Pinto
c4d7d6c3a4 Runing Cases: add Pmdynaform 2014-07-17 15:51:06 -04:00