Commit Graph

7434 Commits

Author SHA1 Message Date
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
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
Brayan Osmar Pereyra Suxo
3d16b45bcb Correcion de parametros en cambio de pos en STEPS 2014-02-24 10:26:01 -04:00
Brayan Osmar Pereyra Suxo
b25b4b8ac8 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-24 10:03:01 -04:00
Victor Saisa Lopez
3140cca6ae Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-24 09:05:00 -04:00
Erik Amaru Ortiz
b619c754a4 Adding "Cross Domain AJAX" requests support for API Dispatcher 2014-02-21 19:28:16 -04:00
Erik Amaru Ortiz
aa9cedf803 Update for BPMN Gateways to Routes handling for BpmnWorkflow adapter 2014-02-21 19:27:15 -04:00
erik ao
37736fb9df Merged in cochalo/processmaker (pull request #222)
Adicion de behat para step reordenamiento
2014-02-21 18:23:47 -04:00
erik ao
4997f28ce6 Merged in darojas/processmaker (pull request #223)
Se adiciona validacion para download en FILESMANAGER. Se mejora BEHAT para upload PMUSER y FILESMANAGER
2014-02-21 18:23:21 -04:00
erik ao
6e9127db1c Merged in wnestor/processmaker (pull request #224)
Se agrego otro escenario donde se verifica la duplicidad en los post de los features
2014-02-21 18:21:27 -04:00
Wendy Nestor
7f2f3fba3b Se agrego otro escenario donde se verifica la duplicidad en los post de los features 2014-02-21 17:03:28 -04:00
Freddy Daniel Rojas Valda
a4ec875bbc Se mejora BEHAT para upload PMUSER y FILESMANAGER 2014-02-21 16:32:46 -04:00
Freddy Daniel Rojas Valda
473d76f3f5 Se mejora BEHAT para upload PMUSER y FILESMANAGER 2014-02-21 16:31:52 -04:00
Freddy Daniel Rojas Valda
c148f4c336 Se adiciona validacion para download en FILESMANAGER 2014-02-21 16:10:09 -04:00
Brayan Osmar Pereyra Suxo
c47c335744 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-21 15:22:42 -04:00
Brayan Osmar Pereyra Suxo
cb6ed54212 Adicion de behat para step reordenamiento 2014-02-21 14:40:30 -04:00
Victor Saisa Lopez
3db97c756f Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-21 11:56:51 -04:00
erik ao
aaecff64a6 Merged in cochalo/processmaker (pull request #220)
Actualizacion de steps y reordenamiento
2014-02-21 10:44:50 -04:00
erik ao
96df5b8f32 Merged in darojas/processmaker (pull request #221)
Se modifica json de respuest en FILES MANAGER quitando pro_uid
2014-02-21 10:44:05 -04:00
Freddy Daniel Rojas Valda
eeb5894aa9 Se modifica json de respuest en FILES MANAGER quitando pro_uid 2014-02-21 10:37:15 -04:00
Brayan Osmar Pereyra Suxo
eb4347e36c Actualizacion de steps y reordenamiento 2014-02-21 10:27:18 -04:00
Victor Saisa Lopez
5d78fa61fb Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-21 10:18:22 -04:00
Freddy Daniel Rojas Valda
e486635ebd Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-21 10:13:32 -04:00
erik ao
f4648f3a67 Merged in victorsl/processmaker (pull request #219)
ProcessMaker-MA "Trigger Wizard (endpoints)"
2014-02-21 10:07:00 -04:00
erik ao
1f8dde6d4a Merged in darojas/processmaker (pull request #217)
Se modifica paginado en ASSIGNEE y ASSIGNEE ADHOC. Se concluye upload y se modifican end points FILESMANAGER. Se cambia BEHAT en FILESMANAGER. Se incluye upload de fotos para USER
2014-02-21 10:06:22 -04:00
Brayan Osmar Pereyra Suxo
71d2fb889e Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-21 09:26:23 -04:00