Commit Graph

9721 Commits

Author SHA1 Message Date
mcuiza
5964c6beb4 import 2016-03-23 15:05:54 -04:00
Gustavo Cruz
ee37b2fee4 Merged in dheeyi/processmaker/MT-28 (pull request #3915)
Mt 28
2016-03-23 13:34:36 -04:00
dheeyi
62851d499e MT-28 manejo de respuestas ajax... para la visulaizacion del listObject 2016-03-23 13:28:28 -04:00
Gustavo Adolfo Cruz Laura
dcb74614e2 Fix version metadata. 2016-03-23 11:55:41 -04:00
Gustavo Adolfo Cruz Laura
b0dfedb5ca Merge MT-10 wth latest commits. 2016-03-22 18:22:27 -04:00
Gustavo Cruz
391957258b Merged in dheeyi/processmaker/MT-28 (pull request #3908)
MT-28
2016-03-22 17:46:46 -04:00
dheeyi
6ce6c7fa45 MT-28 2016-03-22 17:28:13 -04:00
dheeyi
74e5257dde MT-28 2016-03-22 17:05:35 -04:00
Gustavo Adolfo Cruz Laura
ff439dbb91 Adding replace flag to import migration methods 2016-03-22 17:02:32 -04:00
Gustavo Cruz
caa91e4806 Merged in dheeyi/processmaker/MT-28 (pull request #3906)
MT-28
2016-03-22 16:33:59 -04:00
dheeyi
b3fa77ef52 MT-28 2016-03-22 16:32:33 -04:00
Gustavo Adolfo Cruz Laura
33b8e8f0a5 Adding support for replace and merge items. 2016-03-22 16:22:00 -04:00
Gustavo Cruz
aa5524c49d Merged in dheeyi/processmaker/MT-28 (pull request #3904)
MT-28 Adding methods update
2016-03-22 16:17:56 -04:00
dheeyi
67f5627c5b MT-28 Adding methods update 2016-03-22 16:13:41 -04:00
Gustavo Cruz
439833e7bf Merged in paulis/processmaker/MT-12-B (pull request #3902)
MT-12
2016-03-22 16:12:08 -04:00
Paula V. Quispe
e14e95ec73 MT-12 2016-03-22 16:05:03 -04:00
Gustavo Cruz
8067043462 Merged in zeitmaster/processmaker/MT-10 (pull request #3900)
Adding merge support for the Process Definition, Variables, Dynaforms, Input and output documents.
2016-03-22 15:41:01 -04:00
Gustavo Adolfo Cruz Laura
54c52398d3 Adding merge support for the Process Definition, Variables, Dynaforms, Input and output documents. 2016-03-22 15:40:20 -04:00
Gustavo Adolfo Cruz Laura
f6a7d11109 Adding merge support for the Process Definition, Variables, Dynaforms, Input and output documents. 2016-03-22 15:38:11 -04:00
Gustavo Cruz
0cb98a9fc9 Merged in paulis/processmaker/MT-12-B (pull request #3899)
MT-12
2016-03-22 15:26:46 -04:00
Paula V. Quispe
02c0ffb8b0 MT-12 2016-03-22 15:25:12 -04:00
dheeyi
a73f6f487c MT-28 Adding methods update 2016-03-22 14:55:47 -04:00
Gustavo Cruz
fc304841dc Merged in paulis/processmaker/MT-12-B (pull request #3897)
MT-12
2016-03-22 14:23:09 -04:00
Paula V. Quispe
76e06ff9c5 MT-12: solved conflicts 2016-03-22 14:19:59 -04:00
dheeyi
345d71f551 MT-28 Adding all selected objects to export .xml file
MT-28
2016-03-22 13:07:28 -04:00
Gustavo Adolfo Cruz Laura
4c0b592fe8 Assignment Rules fix for a better data import and export isolation. 2016-03-22 11:39:57 -04:00
Gustavo Cruz
623d8e2962 Merged 3.0.1.8 into MT-10 2016-03-22 11:25:04 -04:00
Gustavo Adolfo Cruz Laura
4c45f3eaf6 MT-29: Adding a new set of exception handling classes. 2016-03-22 10:32:20 -04:00
dheeyi
b735ee25ad MT-28 2016-03-21 18:05:02 -04:00
Gustavo Cruz
3f26b11f9a Merged in mcuiza/processmaker/MT-10 (pull request #3888)
Mt 10
2016-03-21 17:25:24 -04:00
mcuiza
1746cef4fe . 2016-03-21 17:06:13 -04:00
mcuiza
49cbd1dd8d export 2016-03-21 17:04:22 -04:00
Paula V. Quispe
c51087bd69 MT-12 2016-03-21 17:00:00 -04:00
dheeyi
f0469125c3 MT-28 2016-03-21 15:55:35 -04:00
Julio Cesar Laura Avendaño
f5c140927e Merged in qronald/processmaker/HOR-521 (pull request #3885)
HOR-521
2016-03-21 15:53:29 -04:00
Julio Cesar Laura Avendaño
ef368d1611 Merged in julceslau/processmaker/HOR-523 (pull request #3883)
HOR-523
2016-03-21 14:31:12 -04:00
dheeyi
f92e37141f MT-10 Export fixes 2016-03-21 13:42:24 -04:00
Ronald Q
bf51acf86e HOR-521 Agregar la fecha de at risk al endpoint light de to do 2016-03-21 13:37:24 -04:00
Julio Cesar Laura Avendaño
76ebf85359 HOR-523 2016-03-21 13:07:11 -04:00
Gustavo Adolfo Cruz Laura
c0a5e03ccd Adding a flag to distinguish between files and templates in the getFilesManager class 2016-03-21 12:34:33 -04:00
Julio Cesar Laura Avendaño
2628191646 Merged in qronald/processmaker/HOR-519 (pull request #3881)
HOR-519
2016-03-21 11:34:16 -04:00
Julio Cesar Laura Avendaño
9a5b4f9881 Merged in qronald/processmaker/HOR-517 (pull request #3878)
HOR-517
2016-03-21 10:05:51 -04:00
Ronald Q
3d234db89b HOR-519 Notice: Undefined index: CURRENT_TASK
delete Notice: Undefined system-tables
2016-03-21 09:45:16 -04:00
Gustavo Adolfo Cruz Laura
b0b07bec9c Adding return structure. 2016-03-21 09:18:33 -04:00
Gustavo Adolfo Cruz Laura
51ab334525 Merge branch 'MT-10' of bitbucket.org:colosa/processmaker into MT-10 2016-03-21 09:15:57 -04:00
Julio Cesar Laura Avendaño
8eaf3ca3bd Merged in caleeli/processmaker/HOR-477 (pull request #3880)
HOR-477
2016-03-21 08:52:30 -04:00
davidcallizaya
3234931bc4 HOR-477 Error al importar proceso y crear como copia del original
c Maintain process title avoid conflicts during process update.
2016-03-20 11:59:19 -04:00
Ronald Q
1c9b412f69 HOR-517 Permitir que el endpoint de creación del uid del file soporte definir APP_DOC_TYPE y DOC_UID 2016-03-20 11:24:51 -04:00
Julio Cesar Laura Avendaño
fa5714280e Merged in julceslau/processmaker/HOR-448 (pull request #3877)
Updating .po and .sql form version 3.0.1.8
2016-03-20 10:47:53 -04:00
Gustavo Adolfo Cruz Laura
31b116042e Add the definition for alternative cases. 2016-03-18 17:56:34 -04:00