Commit Graph

14726 Commits

Author SHA1 Message Date
Paula V. Quispe
cc57d3573c I solved a issue when you upload a logo 2015-03-27 15:40:15 -04:00
dheeyi
da2ab0a431 PM-1987 Designer > Output Document: Espacio innecesario al editar un Output Document
Causa : Definida asi en su construccion.
Solucion : Redefinir atributo style de esa propiedad.
2015-03-27 15:22:15 -04:00
Julio Cesar Laura Avendaño
24888248d2 Merged in cochalo/processmaker/PM-2008 (pull request #1812)
Se adicion la correccion para PARALELOS y SUBPROCESS
2015-03-27 15:02:48 -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
307d440485 Merged in mcuiza/processmaker/class-inputfilter (pull request #1807)
Cambios en class.inputfilter.php
2015-03-27 12:53:50 -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
Quenta Ronald
5794c09749 Merged colosa/processmaker into master 2015-03-27 12:07:25 -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
william barra
ebfc789f31 Merged colosa/processmaker into master 2015-03-27 10:43:11 -04:00
dheeyi
121215fb6c Merge branch 'master' of bitbucket.org:dheeyi/processmaker 2015-03-27 10:43:09 -04:00
dheeyi
491d33dace Merge remote branch 'upstream/master' 2015-03-27 10:41:59 -04:00
marcelo.cuiza
5d1b73e300 Cambios en class.inputfilter.php 2015-03-27 10:22:22 -04:00
Julio Cesar Laura Avendaño
8804ad5ae2 Merged in cochalo/processmaker/PM-1983 (pull request #1806)
Correccion de conflictos
2015-03-27 09:39:15 -04:00
Richard Yujra
9eedb4be34 Merged colosa/processmaker into master 2015-03-27 09:38:58 -04:00
dheeyi
49823e2974 Merge remote branch 'upstream/master' 2015-03-27 09:09:49 -04:00
Brayan Pereyra
088b442feb Correccion de conflictos 2015-03-27 08:55:59 -04:00
Julio Cesar Laura Avendaño
09e658e4ec Merged in julceslau/processmaker (pull request #1805)
Merging changes made by Brayan related to counters
2015-03-27 00:00:56 -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
Dante Loayza
4bdc2258a1 Merged in jennydmz/processmaker/dash2Conf (pull request #1799)
Resolving conflicts
2015-03-26 18:21:00 -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
91b2bb4c4e 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 17:49:46 -04:00
marcelo.cuiza
8865ece523 veracode issues 2015-03-26 17:44:53 -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
Julio Cesar Laura Avendaño
b4ddcac6ae Merged in cochalo/processmaker/CONSOLIDATED (pull request #1793)
Correccion de CONSOLIDATED
2015-03-26 17:31:05 -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
Richard Yujra
32cd146348 Merged colosa/processmaker into master 2015-03-26 10:18:18 -04:00
dheeyi
252d3548d4 Merge remote branch 'upstream/master' 2015-03-26 09:05:22 -04:00
Quenta Ronald
676ad5030b Merged colosa/processmaker into master 2015-03-26 08:20:13 -04:00
Julio Cesar Laura Avendaño
c2d32d4f59 Merged in julceslau/processmaker (pull request #1787)
Adding marks for batch routing error in community version
2015-03-25 22:33:52 -04:00
Julio Cesar Laura
b45ebd0caf Adding marks for batch routing error in community version 2015-03-25 22:30:02 -04:00