fernando/luos
1
0
Fork 0
Code Releases Activity
23,028 Commits 1 Branch 0 Tags
develop
Commit Graph

23028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Chloe Deguzman
58b80f54a1 HOR-281 No longer assumes mysql for escaping. 2016-03-21 22:25:04 +00:00
Gustavo Cruz
5aba97e638 Merged in dheeyi/processmaker/MT-28 (pull request #3889) 
MT-28
 2016-03-21 18:08:22 -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
Gustavo Cruz
8529e7ae46 Merged in paulis/processmaker/MT-12 (pull request #3887) 
MT-12
 2016-03-21 17:01:46 -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
Gustavo Cruz
9115095251 Merged in dheeyi/processmaker/MT-28 (pull request #3886) 
MT-28
 2016-03-21 16:22:56 -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