Commit Graph

11860 Commits

Author SHA1 Message Date
Gustavo Adolfo Cruz Laura
4c45f3eaf6 MT-29: Adding a new set of exception handling classes. 2016-03-22 10:32:20 -04:00
Jenny Murillo
8b16de2179 Fixing conflicts 2016-03-22 09:39:38 -04:00
Jenny Murillo
7247ff3b16 Fixing conflicts 2016-03-22 09:29:45 -04:00
Jenny Murillo
b0ddc50380 fixing conflicts 2016-03-22 09:21:46 -04:00
Jenny Murillo
5e93d7481c BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail
BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail

BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail

BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail

Adding validation to get the data of the last task in the parent subprocess when the thread is going back from the son threat.

Fixing merge conflicts
2016-03-22 09:16:05 -04:00
Dante
1e5924249c Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail 2016-03-22 09:09:59 -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
Dante Loayza
f0d1d70e17 Merged in marcoAntonioNina/processmaker/BY-231 (pull request #3844)
BY-231
2016-03-21 17:01:36 -04:00
Dante Loayza
e2df959130 Merged in marcoAntonioNina/processmaker/BY-205 (pull request #3845)
BY-205
2016-03-21 17:01:00 -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
Victor Saisa Lopez
49e299fbcc HOR-474 "Asignacion de un rol a usuarios tarda demasiado " SOLVED
Issue:
    Asignacion de un rol a usuarios tarda demasiado
Cause:
    Los metodos Roles::getRoleUsers() y Roles::getAllUsers() no son optimos
Solution:
    - Se a mejorado el metodo \ProcessMaker\BusinessModel\Role\User::getUsers() (Back-End)
    - Se agrego el pager a los grids en ADMIN>Users>Roles>Users (Front-End)

HOR-474 "Asignacion de un rol a usuarios tarda demasiado " SOLVED

Issue:
    Asignacion de un rol a usuarios tarda demasiado
Cause:
    Los metodos Roles::getRoleUsers() y Roles::getAllUsers() no son optimos
Solution:
    - Se a mejorado el metodo \ProcessMaker\BusinessModel\Role\User::getUsers() (Back-End)
    - Se agrego el pager a los grids en ADMIN>Users>Roles>Users (Front-End)

HOR-474 "Asignacion de un rol a usuarios tarda demasiado " SOLVED

Issue:
    Asignacion de un rol a usuarios tarda demasiado
Cause:
    Los metodos Roles::getRoleUsers() y Roles::getAllUsers() no son optimos
Solution:
    - Se a mejorado el metodo \ProcessMaker\BusinessModel\Role\User::getUsers() (Back-End)
    - Se agrego el pager a los grids en ADMIN>Users>Roles>Users (Front-End)
2016-03-21 12:22:54 -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
Julio Cesar Laura Avendaño
2ad8c12ee4 Updating .po and .sql form version 3.0.1.8 2016-03-18 17:53:01 -04:00
dheeyi
a378cb7dc5 MT-28
MT-28
2016-03-18 17:45:26 -04:00
Gustavo Adolfo Cruz Laura
f73b3d67da Adding the PMXPublisher class in order to create the export file. 2016-03-18 17:07:44 -04:00
Paula V. Quispe
f6838af01a MT-26 2016-03-18 16:52:47 -04:00
Julio Cesar Laura Avendaño
c2cc6ea83a Merged in luisfernandosl/processmaker/HOR-494-3018 (pull request #3856)
HOR-494
2016-03-18 16:41:33 -04:00
Julio Cesar Laura Avendaño
3a0d4226ac Updating .po and .sql form version 3.0.1.8 2016-03-18 16:34:36 -04:00
root
d2866454b9 Updating .po and .sql form version 3.0.1.8 2016-03-18 16:24:43 -04:00
mcuiza
3033799edc MT-11: UI for Extjs (export) 2016-03-18 16:08:22 -04:00
Julio Cesar Laura Avendaño
3b26891aa3 Merged in qronald/processmaker/HOR-512 (pull request #3862)
HOR-512
2016-03-18 15:39:09 -04:00
Julio Cesar Laura Avendaño
c1b607b7a9 Merged in gproly/processmaker/HOR-506 (pull request #3857)
HOR-506
2016-03-18 15:38:22 -04:00
Julio Cesar Laura Avendaño
20b443872f Merged in gproly/processmaker/HOR-499 (pull request #3863)
HOR-499
2016-03-18 15:33:35 -04:00
dheeyi
3839063424 MT-28 2016-03-18 15:17:00 -04:00
Gustavo Cruz
0836cdbfb9 Merged in paulis/processmaker/MT-26 (pull request #3866)
MT-26
2016-03-18 14:42:53 -04:00
Paula V. Quispe
bf6eea6c2e MT-26 2016-03-18 14:40:21 -04:00
Gustavo Cruz
35d9162323 Merged 3.0.1.8 into MT-10 2016-03-18 14:30:05 -04:00
Gustavo Cruz
bb06effad9 Merged in zeitmaster/processmaker/MT-10 (pull request #3865)
Adding the PMXGenerator class and some granular definitions.
2016-03-18 14:28:22 -04:00
Gustavo Adolfo Cruz Laura
57f5e9c557 Adding the PMXGenerator class and some granular definitions. 2016-03-18 14:26:29 -04:00
Paula V. Quispe
22d7271610 MT-26 2016-03-18 13:43:26 -04:00
Julio Cesar Laura Avendaño
8400ac2585 Merged in qronald/processmaker/HOR-489 (pull request #3854)
HOR-489
2016-03-18 12:40:03 -04:00