Commit Graph

7484 Commits

Author SHA1 Message Date
Freddy Daniel Rojas Valda
614d2bdec0 Se corrige bug en TASK para ASSIGNEE. 2014-02-27 12:03:26 -04:00
erik ao
8c125981cd Merged in darojas/processmaker (pull request #246)
Se corrige code style para CASESCHEDULER, FILESMANAGER, TASK, USER.
2014-02-26 17:38:32 -04:00
Erik Amaru Ortiz
a368fa0066 Adding flow listener to save route conditions into workflow project from bpmn flows 2014-02-26 17:38:07 -04:00
erik ao
4a9474cd69 Merged in cochalo/processmaker (pull request #247)
Arreglo de serialize en TRIGGERS
2014-02-26 17:33:25 -04:00
Brayan Osmar Pereyra Suxo
cea3bff659 Arreglo de serialize en TRIGGERS 2014-02-26 17:27:43 -04:00
erik ao
00a08b58ce Merged in wnestor/processmaker (pull request #243)
Culminacion del behat pm user y  modificacion del behat basico de step
2014-02-26 17:14:16 -04:00
erik ao
1a14cc463d Merged in herbertsg/processmaker (pull request #244)
Rename maborak concat function in Object.prototype to concatMaborak to avoid name conflicts
2014-02-26 16:29:33 -04:00
Freddy Daniel Rojas Valda
4c49fd96eb Se corrige code style para CASESCHEDULER, FILESMANAGER, TASK, USER. 2014-02-26 16:22:23 -04:00
erik ao
7c91aacf8a Merged in cochalo/processmaker (pull request #245)
Correcion de serializado de tri_param en TRIGGERS
2014-02-26 16:15:51 -04:00
Brayan Osmar Pereyra Suxo
5a91b70020 Correcion de serializado de tri_param en TRIGGERS 2014-02-26 16:11:37 -04:00
Wendy Nestor
08bfe4c0c1 Modificacion del feature en el behat basico de step 2014-02-26 16:07:52 -04:00
herbert
eb5e2c254e Rename maborak concat funtion in Object.prototype to concatMaborak to avoid name conflicts 2014-02-26 15:42:12 -04:00
Wendy Nestor
5aa9ebf71e Culminacion del behat pm user 2014-02-26 15:24:22 -04:00
erik ao
106e4d770b Merged in darojas/processmaker (pull request #242)
Se actualiza get en FILESMANAGER.
2014-02-26 13:10:07 -04:00
Freddy Daniel Rojas Valda
3bd35da26b Se actualiza get en FILESMANAGER. 2014-02-26 12:59:34 -04:00
erik ao
244aeabd83 Merged in darojas/processmaker (pull request #241)
Se cambia url para download y delete se actualiza BEHAT en FILESMANAGER
2014-02-26 12:56:05 -04:00
Erik Amaru Ortiz
56be79f2ae Updating GET /projects data return, now it is returning all projects bpmn and classic projects
Them can be classified by prj_type: [bpmn|classic]
2014-02-26 12:53:17 -04:00
Freddy Daniel Rojas Valda
5910013012 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-26 12:47:13 -04:00
Freddy Daniel Rojas Valda
05f169d580 Se cambia url para download y delete se actualiza BEHAT en FILESMANAGER. 2014-02-26 12:22:22 -04:00
erik ao
896f9963c7 Merged in victorsl/processmaker (pull request #240)
ProcessMaker-MA "Trigger Wizard (endpoints)"
2014-02-26 12:05:53 -04:00
erik ao
4454e00cd1 Merged in cochalo/processmaker (pull request #239)
Eliminacion de variables no requeridas en ACTIVITY
2014-02-26 12:05:26 -04:00
Victor Saisa Lopez
c25a13ba11 ProcessMaker-MA "Trigger Wizard (endpoints)"
- Se han implementado los siguientes Endpoints:
    GET  /api/1.0/{workspace}/project/{prj_uid}/trigger-wizard/{lib_name}/{fn_name}/{tri_uid}
    POST /api/1.0/{workspace}/project/{prj_uid}/trigger-wizard/{lib_name}/{fn_name}
    PUT  /api/1.0/{workspace}/project/{prj_uid}/trigger-wizard/{lib_name}/{fn_name}/{tri_uid}
2014-02-26 11:58:56 -04:00
Victor Saisa Lopez
262ae332d3 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-26 11:40:16 -04:00
erik ao
0946faf3ae Merged in wnestor/processmaker (pull request #238)
Modificacion a los archivos pm user y cambio de nombre del archivo subprocess
2014-02-26 11:38:47 -04:00
erik ao
bd37e5956a Merged in cochalo/processmaker (pull request #237)
Correcion para POST en step triggers sin step
2014-02-26 11:37:54 -04:00
Brayan Osmar Pereyra Suxo
4cb8a066fd Eliminacion de variables no requeridas en ACTIVITY 2014-02-26 10:22:47 -04:00
Wendy Nestor
8034dd72d7 Modificacion a los archivos pm user y cambio de nombre del archivo subprocess 2014-02-26 09:39:08 -04:00
Wendy Nestor
3170dd3409 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-26 09:35:46 -04:00
Brayan Osmar Pereyra Suxo
0f8f223c69 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-26 09:28:13 -04:00
Victor Saisa Lopez
cc3290329f Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-26 09:12:18 -04:00
Fernando Ontiveros
5e294cb92b adding the update script, use it only in Dev stage 2014-02-26 07:51:37 -05:00
Freddy Daniel Rojas Valda
da67c4a176 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-26 08:51:10 -04:00
Fernando Ontiveros
b5e67cce7c improving build-vendor for production files and set style for tiny 2014-02-26 07:27:07 -04:00
Fernando Ontiveros
fc56ec71b9 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-25 20:39:02 -05:00
Fernando Ontiveros
2351c0417c designer uses the minified version of css 2014-02-25 20:38:51 -05:00
erik ao
e45f198dcd Merged in cochalo/processmaker (pull request #233)
Behat para position triggers en steps y en POST
2014-02-25 21:12:38 -04:00
erik ao
9e319d965b Merged in wnestor/processmaker (pull request #234)
Culminacion del feature pm user y creacion de nuevos archivos
2014-02-25 21:12:00 -04:00
erik ao
63c4e0879e Merged in darojas/processmaker (pull request #235)
Se cambia url para download y se mejora BEHAT en FILESMANAGER.
2014-02-25 21:07:56 -04:00
Victor Saisa Lopez
7b1c330f05 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-25 17:37:08 -04:00
Erik Amaru Ortiz
ce2c490b55 Removing deprecated function on BpmnWorkflow adapter 2014-02-25 16:53:25 -04:00
Victor Saisa Lopez
403d1bc18f Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-25 14:29:57 -04:00
Erik Amaru Ortiz
1dbc02926c Completing Unit Tests to BpmnWorkflow Adapter
- Adding Activity->Gateway Flow handler
- Adding Activity->Gateway ==> Route Listener to Adapter

Now gateways with DIVERGING and CONVERGING directions are interpreted as its respective workflow route types.
2014-02-25 14:23:04 -04:00
Freddy Daniel Rojas Valda
7ccf7f72bb Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-25 14:21:33 -04:00
Erik Amaru Ortiz
887fa6b46a Adding Unit Tests to BpmnWorkflow Adapter
- Adding Activity->Gateway Flow handler
- Adding Activity->Gateway ==> Route Listener to Adapter

Now gateways with DIVERGING and CONVERGING directions are interpreted as its respective workflow route types.
2014-02-25 13:47:59 -04:00
Victor Saisa Lopez
6a7eb191a4 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-25 13:45:49 -04:00
Julio Cesar Laura Avendaño
205f4a461f Merged in julceslau/processmaker (pull request #236)
Fix incorrect object declaration, PHP 5.4.x compatibility
2014-02-25 13:07:07 -04:00
Julio Cesar Laura
b11d8afbe3 Fix incorrect object declaration, PHP 5.4.x compatibility 2014-02-25 13:04:36 -04:00
Fernando Ontiveros
c3ac35fb6b Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-25 11:55:59 -05:00
root
28da209694 working in the build-vendor 2014-02-25 11:54:56 -05:00
Freddy Daniel Rojas Valda
d9fb6db233 Se cambia url para download y se mejor BEHAT en FILESMANAGER. 2014-02-25 12:46:29 -04:00