Commit Graph

2398 Commits

Author SHA1 Message Date
Julio Cesar Laura
907588ce5f Deleting BOM from class pmSugarFunctions 2015-04-01 15:32:28 -04:00
Julio Cesar Laura
f7da7e016d Deleting BOM froom class Additional tables 2015-04-01 14:11:47 -04:00
Julio Cesar Laura Avendaño
828798a16a Merged in gproly/processmaker/PM-1969 (pull request #1838)
PM-1969-2009
2015-04-01 09:52:54 -04:00
Dante Loayza
db31fbe173 Merged master into dashboards2 2015-04-01 09:08:57 -04:00
Julio Cesar Laura Avendaño
2ef493d4f0 Merged in paulis/processmaker/PM-VERACODE-G (pull request #1836)
I solved issues with Cryptographic Issues
2015-03-31 17:26:19 -04:00
Julio Cesar Laura Avendaño
95c8fd27da Merged in paulis/processmaker/PM-1532 (pull request #1821)
I solved the issue PM-1532 informacion de History dynaform
2015-03-31 16:40:25 -04:00
Roly Rudy Gutierrez Pinto
f02d684259 PM-1969-2009 2015-03-31 16:33:28 -04:00
Paula V. Quispe
0872b7208e I solved the conflicts 2015-03-31 15:42:44 -04:00
Dante Loayza
dc89b7dbe8 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1835)
Improvement file appDelegation
2015-03-31 14:56:35 -04:00
Marco Antonio Nina Mena
13f344a295 -Improvement file appDelegation
- quit line deprecated.
2015-03-31 14:52:36 -04:00
Marco Antonio Nina Mena
8108a33230 Improvement file appDelegation
- quit line deprecated.
2015-03-31 14:50:17 -04:00
Dante Loayza
751c96f82f Merged master into dashboards2 2015-03-31 14:29:38 -04:00
Julio Cesar Laura Avendaño
219619e6e0 Merged in mcuiza/processmaker/PM-1859 (pull request #1788)
PM-1859 - Error al ingresar a las reglas de ruteo de un subproceso
2015-03-31 13:50:47 -04:00
Dante Loayza
6e4b4914bb Merged master into dashboards2 2015-03-31 13:19:03 -04:00
Marco Antonio Nina Mena
68ed954a2e Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-03-31 12:54:59 -04:00
Julio Cesar Laura Avendaño
a2a1ba562d Merged in mcuiza/processmaker/DT-issues-1 (pull request #1796)
veracode issues
2015-03-30 13:34:44 -04:00
danteloayza
87f728a947 excluding files from pull request part 4 2015-03-30 12:07:04 -04:00
Julio Cesar Laura Avendaño
2bcbbd29e7 Merged in paulis/processmaker/PM-VERACODE-15 (pull request #1794)
I solved some issues with Directory traversal
2015-03-30 11:56:28 -04:00
danteloayza
e0577c0007 excluding files from pull request part 3 2015-03-30 11:42:50 -04:00
Julio Cesar Laura Avendaño
f2e8028ed2 Merged in paulis/processmaker/PM-VERACODE-12 (pull request #1772)
I completed Untrusted Initialization
2015-03-30 10:36:38 -04:00
Paula V. Quispe
19ffc1c26f I solved the issue PM-1532 informacion de History dynaform 2015-03-27 17:59:50 -04:00
Brayan Pereyra
bf0ab884a9 Correccion de error en community 2015-03-27 17:26:38 -04:00
jennylee
e39b6bdd54 lasts corrections 2015-03-27 17:25:06 -04:00
jennylee
9325a1ec99 Adding the new changes in AppDelegation.php 2015-03-27 17:10:11 -04:00
Brayan Pereyra
0898b8cc9b Se adicion la correccion para PARALELOS y SUBPROCESS 2015-03-27 14:24:56 -04:00
Julio Cesar Laura Avendaño
6c3a728dc2 Merged in cochalo/processmaker/MOBILE (pull request #1811)
Correccion de contador en APP_CACHE_VIEW
2015-03-27 12:32:48 -04:00
Brayan Pereyra
8d6d4e596d Correccion de contador en APP_CACHE_VIEW 2015-03-27 12:22:30 -04:00
Brayan Pereyra
088b442feb Correccion de conflictos 2015-03-27 08:55:59 -04:00
Julio Cesar Laura
bd3a3c40ba Merging changes made by Brayan related to counters 2015-03-26 23:57:28 -04:00
Julio Cesar Laura Avendaño
6c6e43e458 Merged in cochalo/processmaker/PM-1936 (pull request #1781)
Correccion de contadores en tipos de tareas
2015-03-26 22:10:25 -04:00
jennylee
d08457420a Adding the model of the db 2015-03-26 18:58:43 -04:00
jennylee
f6788b35d5 Resolving conflicts 2015-03-26 18:14:51 -04:00
marcelo.cuiza
7104ece311 veracode issues 2015-03-26 17:41:41 -04:00
danteloayza
cff0e2c6e1 Non conflict files 2015-03-26 17:37:32 -04:00
Paula V. Quispe
c595bd10bf I solved some issues with Directory traversal 2015-03-26 16:14:32 -04:00
Brayan Pereyra
d647de4d69 Correccion de CONSOLIDATED 2015-03-26 15:03:24 -04:00
Paula V. Quispe
f4664ce34c I solved some issues with Directory traversal 2015-03-26 14:55:51 -04:00
marcelo.cuiza
7fe7eadb79 PM-1859
Error al ingresar a las reglas de ruteo de un subproceso

El subproceso debe tener una regla de derivacion previa a ingresar a las opciones de routing rule, de lo contrario se desplegara un mensaje
2015-03-26 12:09:59 -04:00
Paula V. Quispe
055082cec2 I solved Cryptographic Issues 2015-03-26 11:22:37 -04:00
Paula V. Quispe
ef261316b0 I solved issues with Cryptographic Issues 2015-03-26 10:19:43 -04:00
Brayan Pereyra
c801d0d38f Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED 2015-03-25 18:20:07 -04:00
Brayan Pereyra
1096a75fd8 Validacion de licencia 2015-03-25 18:18:57 -04:00
Brayan Pereyra
fde8667a66 Correccion de contadores en tipos de tareas 2015-03-25 17:09:10 -04:00
Brayan Pereyra
36e6f97cc4 Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED 2015-03-25 16:24:09 -04:00
Paula V. Quispe
f402d00446 I solved some issue with Cryptographic Issues 2015-03-25 16:22:18 -04:00
Roly Rudy Gutierrez Pinto
4581a6efc3 PM-947 2015-03-25 15:57:53 -04:00
Paula V. Quispe
581410fbd0 I completed Untrusted Initialization 2015-03-25 11:25:00 -04:00
Brayan Pereyra
34fee16fef Correccion de CONSOLIDATED 2015-03-24 17:42:13 -04:00
Roly Rudy Gutierrez Pinto
996dd83c26 PM-947 2015-03-24 16:15:19 -04:00
Roly Rudy Gutierrez Pinto
8f67bd2b21 PM-947 2015-03-23 22:22:10 -04:00