fernando/luos
1
0
Fork 0
Code Releases Activity
18,243 Commits 1 Branch 0 Tags
246d92a145ec00a9f28801cd26361e6c7e05ab45
Commit Graph

18243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paula V. Quispe
76e06ff9c5 MT-12: solved conflicts 2016-03-22 14:19:59 -04:00
Jenny Murillo
9b83bfc00b Solving problem with the index in subprocess Sincronous 2016-03-22 14:07:09 -04:00
richardnoel
412d121c7b OM-[PMDynaform] Crear un componente flashMessage 2016-03-22 13:45:15 -04:00
Gustavo Cruz
ac8101c0a0 Merged in dheeyi/processmaker/MT-28 (pull request #3894) 
MT-28
 2016-03-22 13:29:19 -04:00
dheeyi
345d71f551 MT-28 Adding all selected objects to export .xml file 
MT-28
 2016-03-22 13:07:28 -04:00
Julio Cesar Laura Avendaño
a88b2a2edc Merged in qronald/processmaker/HOR-521 (pull request #3893) 
HOR-521-A
 2016-03-22 12:46:16 -04:00
Julio Cesar Laura Avendaño
28f1791aea Merged in victorsl/processmaker/HOR-474-3018 (pull request #3872) 
HOR-474
 2016-03-22 12:45:20 -04:00
Ronald Q
8a49a366ac fix in risk date 2016-03-22 11:55:24 -04:00
Gustavo Cruz
b0eaac8bdb Merged in zeitmaster/processmaker/MT-10 (pull request #3892) 
Assignment Rules fix for a better data import and export isolation.
 2016-03-22 11:42:09 -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
Jenny Murillo
633ede7b26 Adding require of the G class to validate the use of json_decode(). 2016-03-22 10:43:35 -04:00
Gustavo Cruz
9c6615c374 Merged in zeitmaster/processmaker/MT-10 (pull request #3890) 
MT-29: Adding a new set of exception handling classes.
 2016-03-22 10:35:21 -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
Dante Loayza
6f3cf91edf Merged in jennydmz/processmaker/BY-195 (pull request #3834) 
BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail
 2016-03-22 10:01:29 -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