Commit Graph

11634 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
julceslauhub
53d21142f1 Merge pull request #2286 from julceslauhub/master
Fix incorrect object declaration, PHP 5.4.x compatibility
2014-02-25 15:10:09 -02:00
Julio Cesar Laura
5f8e4d541c Fix incorrect object declaration, PHP 5.4.x compatibility 2014-02-25 13:08:56 -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
Marco Antonio Nina
471d2301c9 Merge remote branch 'upstream/master' 2014-02-25 08:38:19 -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
Marco Antonio Nina
ad1da144e3 Merge remote branch 'upstream/master' 2014-02-24 17:44:32 -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
julceslauhub
308ae6ab5e Merge pull request #2285 from norahmollo/BUG-14140
BUG-14140 Al pasar el formulario con "Next Step" nos muestra el mensaje ...
2014-02-24 14:22:16 -02:00
norahmollo
d21162303f BUG-14140 Al pasar el formulario con "Next Step" nos muestra el mensaje Do you want to save changes?
Al pasar al siguiente paso con la opcion "Next Step" no debe mostrar el mesnaje de Do you want to save changes? cuando no se hicieron cambios.
2014-02-24 12:12:53 -04:00
Marco Antonio Nina
027a7900a9 Merge remote branch 'upstream/master' 2014-02-24 12:03:06 -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
julceslauhub
c7c0e17967 Merge pull request #2284 from norahmollo/BUG-14031
BUG-14031 Add ProcessMaker fields attribute identifier in generated HTML
2014-02-24 12:08:58 -02:00
Brayan Osmar Pereyra Suxo
b25b4b8ac8 Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-24 10:03:01 -04:00
norahmollo
b32bc093c2 BUG-14031 Add ProcessMaker fields attribute identifier in generated HTML
Some fields doesn't have pm:fieldtype attribute. Class xmlform modified, it has been added NSFieldType function for render fields.
2014-02-24 09:38:24 -04:00
Victor Saisa Lopez
3140cca6ae Merge branch 'master' of bitbucket.org:colosa/processmaker 2014-02-24 09:05:00 -04:00
Marco Antonio Nina
11b72d07a6 Merge remote branch 'upstream/master' 2014-02-24 08:32:38 -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