Commit Graph

20262 Commits

Author SHA1 Message Date
Gustavo Cruz
9d87026faf Merged in mcuiza/processmaker/MT-10 (pull request #3919)
import
2016-03-23 15:13:47 -04:00
mcuiza
5964c6beb4 import 2016-03-23 15:05:54 -04:00
Julio Cesar Laura Avendaño
f24844c182 Merged in qronald/processmaker/HOR-537 (pull request #3911)
HOR-537
2016-03-23 14:56:30 -04:00
Gustavo Adolfo Cruz Laura
7ea69a3f8b Add trigger data to workflow-data attribute. 2016-03-23 14:39:27 -04:00
Gustavo Cruz
1c72a62174 Merged in paulis/processmaker/MT-12-B (pull request #3917)
MT-12
2016-03-23 14:31:38 -04:00
Paula V. Quispe
81c8043306 MT-12
MT-12
2016-03-23 14:29:43 -04:00
Ronald Q
45e5cddf19 HOR-541 (Notifications) El nombre del .pem debe ser dinámico en los archivos que ejecutan las notificaciones
fix in mobile.ini

fix un comment
2016-03-23 14:10:37 -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
alex_santos
98e55c6e1b OM-357 2016-03-23 13:09:03 -04:00
Ronald Q
1195c30918 HOR-537 (MultiTimeZone) El flag de multi time zone no cambia en base a la licencia ingresada
fix in name workspace sys_sys
2016-03-23 12:24:52 -04:00
Gustavo Cruz
d492d5bea8 Merged in zeitmaster/processmaker/MT-10 (pull request #3913)
Mt 10
2016-03-23 11:57:37 -04:00
Gustavo Adolfo Cruz Laura
1efad969bf removing unnecesary files 2016-03-23 11:56:04 -04:00
Gustavo Adolfo Cruz Laura
dcb74614e2 Fix version metadata. 2016-03-23 11:55:41 -04:00
Julio Cesar Laura Avendaño
f248a39cae Merged in victorsl/processmaker/HOR-509-3018 (pull request #3903)
HOR-509
2016-03-23 10:38:35 -04:00
Julio Cesar Laura Avendaño
5a04f30eaf Merged in victorsl/processmaker/HOR-433-3018-B (pull request #3852)
HOR-433
2016-03-23 10:16:02 -04:00
dheeyi
d3a211a627 Merge remote-tracking branch 'upstream/MT-10' into MT-28 2016-03-23 08:49:55 -04:00
Julio Cesar Laura Avendaño
15b1e204fc Merged in julceslau/processmaker/3.0.1.8 (pull request #3910)
Update label ID_MSG_AJAX_FAILURE
2016-03-22 19:33:04 -04:00
Julio Cesar Laura Avendaño
8fca5818f8 Update label ID_MSG_AJAX_FAILURE 2016-03-22 19:32:20 -04:00
Gustavo Cruz
a4ca4d0b35 Merged in zeitmaster/processmaker/MT-10 (pull request #3907)
Adding replace flag to import migration methods
2016-03-22 18:38:45 -04:00
Julio Cesar Laura Avendaño
c4b2bd39ff Merged in richardnoel/processmaker/OM-381 (pull request #3895)
OM-381
2016-03-22 18:25:59 -04:00
Gustavo Adolfo Cruz Laura
b0dfedb5ca Merge MT-10 wth latest commits. 2016-03-22 18:22:27 -04:00
davidcallizaya
a5d034934b HOR-502 Groups>assigning users to groups in Windows only assigns a single user
+ Se propago el error al UI y se registra en el log de errores.
2016-03-22 18:20:06 -04:00
Julio Cesar Laura Avendaño
34b2d876ae Merged in qronald/processmaker/HOR-435 (pull request #3839)
HOR-435
2016-03-22 17:56:37 -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
d10e3a4e29 MT-28
MT-28

MT-28
2016-03-22 17:29:31 -04:00
dheeyi
6ce6c7fa45 MT-28 2016-03-22 17:28:13 -04:00
Ronald Q
22691a06b0 HOR-435 It's necesary to close the session, if we close processmaker and open again HOME and DESIGNER are blocked
fix in frames

implementation of the template html and css

fix in file css

remove file

add link

fix in status code

fix in

remove confirm

fix in edege
2016-03-22 17:28:05 -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
Dante Loayza
9b5ab694f3 Merged in jennydmz/processmaker/BY-166 (pull request #3891)
Adding require of the G class to validate the use of json_decode().
2016-03-22 16:53:41 -04:00
Jenny Murillo
d798d01f69 Adding validation when getting the index of the process. 2016-03-22 16:35:57 -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 Cruz
3d645dcce4 Merged in zeitmaster/processmaker/MT-10 (pull request #3905)
Adding support for replace and merge items.
2016-03-22 16:23:34 -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
Victor Saisa Lopez
6470adda9b HOR-509 "Departaments> Al dar click en todos para asignar..." SOLVED
Issue:
    Departaments> Al dar click en todos para asignar usuarios en Departamentos tarda demasiado y sale un error
Cause:
    El codigo en la seccion "assignedUsers" y "availableUsers" en departments_Ajax.php no son optimos
Solution:
    - Se implemento el metodo \ProcessMaker\BusinessModel\Department::getUsers() (Back-End)
    - Se agrego el pager a los grids en ADMIN>Users>Departments>Users (Front-End)
2016-03-22 16:10:18 -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
Gustavo Cruz
9a87be404d Merged in dheeyi/processmaker/MT-28 (pull request #3898)
MT-28 Adding methods update
2016-03-22 14:58:43 -04:00
dheeyi
a73f6f487c MT-28 Adding methods update 2016-03-22 14:55:47 -04:00
Julio Cesar Laura Avendaño
e719e8ee82 Merged in cmdeguzman/cdgz-processmaker/HOR-281 (pull request #3793)
HOR-281
2016-03-22 14:42:42 -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