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
danteloayza
2ce413beb3
Excluding files part 2
2015-03-30 11:24:57 -04:00
danteloayza
4bfe85a652
Excluding non touched model files
2015-03-30 11:19:39 -04:00
danteloayza
d4ecc6c1a4
conflicts resolution
2015-03-30 11:00:04 -04:00
Brayan Pereyra
276db758d5
PM-2020 Adicion de contador dinamico para Batch Routing
2015-03-30 10:56:16 -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
jennylee
93700de426
Fixing conflicts
2015-03-27 17:56:11 -04:00
Julio Cesar Laura Avendaño
0c51b219ed
Merged in qronald/processmaker (pull request #1817 )
...
change conters in list
2015-03-27 17:44:31 -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
Ronald Quenta
50c5d8c43d
change conters in list
2015-03-27 16:29:59 -04:00
dheeyi
d96fb602dc
PM-1640 Workspace creation field accpets everything including mysql restricted characters like %$
...
Causa : No se tenia validacion en este field input.
Solucion : Se adiciona una validacion en funcion a una expresion regular
2015-03-27 16:09:14 -04:00
dheeyi
743e71bf5d
PM-1959 Cambiar enlace en la pantalla de login de "Colosa,Inc." a "ProcessMaker Inc."
...
Causa : Definida asi.
Solucion : Cambiar texto y enlace de redireccion(www.processmaker.com)
2015-03-27 15:54:23 -04:00
Paula V. Quispe
cc57d3573c
I solved a issue when you upload a logo
2015-03-27 15:40:15 -04:00
Brayan Pereyra
0898b8cc9b
Se adicion la correccion para PARALELOS y SUBPROCESS
2015-03-27 14:24:56 -04:00
marcelo.cuiza
416094fa2a
veracode issues
2015-03-27 12:36:24 -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
dheeyi
55a5112a49
PM-1538 Canjear Token: El tamañámo del campo 'Callback URL' es muy pequeñ recorta las urls largas
...
Causa : Definida asi.
Solucion : Se refinio el maxlength del input (Web Site y Callback URL)
2015-03-27 11:39:02 -04:00
dheeyi
573399fd9d
PM-1959 Cambiar enlace en la pantalla de login de "Colosa,Inc." a "ProcessMaker Inc."
...
Causa : Definida asi.
Solucion : Cambiar texto y enlace de redireccion(www.processmaker.com)
2015-03-27 11:23:08 -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
danteloayza
052ddc3759
hash license features update
2015-03-26 19:13:46 -04:00
Dante Loayza
afa9a896bf
Merged in jennydmz/processmaker/dash2Model (pull request #1803 )
...
Adding the model of the db
2015-03-26 19:01:41 -04:00
danteloayza
e537424a82
mysql schema
2015-03-26 18:58:59 -04:00
jennylee
d08457420a
Adding the model of the db
2015-03-26 18:58:43 -04:00
danteloayza
b4318bb90d
users.js update
2015-03-26 18:46:58 -04:00
jennylee
f6788b35d5
Resolving conflicts
2015-03-26 18:14:51 -04:00
dheeyi
6f8071f38d
PM-1949 Home -> Documents No se pueden mover Folders de una raiz a otra
...
Causa : Eventos ExtJS definidos.
Solucion : Redefinir los eventos ExtJS.
2015-03-26 18:04:18 -04:00
dheeyi
2fb4556305
Merge remote branch 'upstream/master' into PM-1949
2015-03-26 18:04:05 -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
576c83d738
I solved some issues with Directory traversal
2015-03-26 16:31:46 -04:00
Brayan Pereyra
8f23263be3
Correccion COMMUNITY
2015-03-26 16:25:20 -04:00
Paula V. Quispe
c595bd10bf
I solved some issues with Directory traversal
2015-03-26 16:14:32 -04:00
Paula V. Quispe
1bb9f57152
I solved some issues with Directory traversal
2015-03-26 15:47:31 -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
Julio Cesar Laura
b45ebd0caf
Adding marks for batch routing error in community version
2015-03-25 22:30:02 -04:00
Julio Cesar Laura
bc49527fe3
Revert unnecesary change related to marks for community version
2015-03-25 21:59:16 -04:00
Julio Cesar Laura Avendaño
cf0da4d4fa
Merged in cochalo/processmaker/CONSOLIDATED (pull request #1768 )
...
Correccion de CONSOLIDATED
2015-03-25 21:55:31 -04:00
Julio Cesar Laura Avendaño
870ab602f9
Merged in julceslau/processmaker (pull request #1785 )
...
Fix error with marks for community edition
2015-03-25 19:57:03 -04:00
