Commit Graph

7458 Commits

Author SHA1 Message Date
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
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
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
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
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
Freddy Daniel Rojas Valda
6ceb1098f3 Se cambia url para download y se mejor BEHAT en FILESMANAGER. 2014-02-25 12:43:18 -04:00
Brayan Osmar Pereyra Suxo
d7da2d4d2a Correcion para POST en step triggers sin step 2014-02-25 12:35:49 -04:00
Wendy Nestor
f8bf4094ef Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-25 11:19:42 -04:00
Wendy Nestor
d5f9c09f92 Culminacion del feature pm user y creacion de nuevos archivos 2014-02-25 11:15:21 -04:00
Brayan Osmar Pereyra Suxo
b469db5b70 Behat para position triggers en steps y en POST 2014-02-25 11:09:44 -04:00
erik ao
333bfb774e Merged in darojas/processmaker (pull request #232)
Se mejora BEHAT FILESMANAGER y PROCESSSUPERVISOR. Se corrige un error en FILESMANAGER
2014-02-25 10:08:04 -04:00
Freddy Daniel Rojas Valda
0a5f7e2382 Se mejora PROCESSSUPERVISOR. 2014-02-25 09:50:33 -04:00
Freddy Daniel Rojas Valda
8b91cb3ccf Se mejora BEHAT PROCESSSUPERVISOR. 2014-02-25 09:29:08 -04:00
Victor Saisa Lopez
322fae66fc Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-25 09:20:41 -04:00
Freddy Daniel Rojas Valda
d50cd2a2e1 Se mejora BEHAT FILESMANAGER. 2014-02-25 09:17:11 -04:00
Erik Amaru Ortiz
75cf6e3eea Adding logic to remove related objects when a gateway is removed for BpmnWorkflow Adapter
- Now when a gateway is removed all its related flows are removed too
- When a gateway is removed all Composed Workflow Routes are removed too
2014-02-24 19:58:32 -04:00
Erik Amaru Ortiz
7962d40a0f Updating Unit Tests for BpmnWorkflow Adapter, and some Bpmn->Workflow logic 2014-02-24 19:10:45 -04:00
erik ao
c2f92e559a Merged in darojas/processmaker (pull request #230)
Se mejora FILESMANAGER. Se adiciona en el GET el content del documento y se agregan validaciones.
2014-02-24 17:07:09 -04:00
erik ao
6f3e228b3b Merged in wnestor/processmaker (pull request #229)
Conclusion del behat para el feature sub process
2014-02-24 17:06:20 -04:00
erik ao
2e25ddc949 Merged in cochalo/processmaker (pull request #231)
Adicion para el ordenamiento en el PUT para STEP_TRIGGERS
2014-02-24 17:05:19 -04:00
erik ao
c0ca10a165 Merged in cochalo/processmaker (pull request #228)
Adicion para setear position de step al crearlo
2014-02-24 17:03:35 -04:00
Brayan Osmar Pereyra Suxo
df917d4d66 Adicion para el ordenamiento en el PUT para STEP_TRIGGERS 2014-02-24 17:01:36 -04:00
Freddy Daniel Rojas Valda
7898045cf2 Se mejora FILESMANAGER. Se adiciona en el GET el content del documento y se agregan validaciones. 2014-02-24 16:54:55 -04:00
Wendy Nestor
82a8b7cda3 Conclusion del behat para el feature sub process 2014-02-24 16:31:22 -04:00
Brayan Osmar Pereyra Suxo
5943d098f4 Adicion para setear position de step al crearlo 2014-02-24 15:13:31 -04:00
erik ao
6518e35c89 Merged in cochalo/processmaker (pull request #227)
Cambio de metodo en change position en STEPS
2014-02-24 11:48:13 -04:00
Brayan Osmar Pereyra Suxo
eed4d9ff36 Cambio de metodo en change position en STEPS 2014-02-24 11:20:35 -04:00
Erik Amaru Ortiz
239ec33f18 Some fixes on unit tests for Bpmn, BpmnWorkflow classes 2014-02-24 11:17:40 -04:00
erik ao
02ea0ff920 Merged in cochalo/processmaker (pull request #226)
Cambios de parametros en behat para STEPS
2014-02-24 10:52:44 -04:00
Brayan Osmar Pereyra Suxo
eb83f4ae4b Cambios de parametros en behat para STEPS 2014-02-24 10:34:11 -04:00
erik ao
a3156a9b01 Merged in cochalo/processmaker (pull request #225)
Correcion de parametros en cambio de pos en STEPS
2014-02-24 10:32:07 -04:00