Dante Loayza
|
c0867cfc35
|
Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1834)
Improvement label
|
2015-03-31 13:43:27 -04:00 |
|
Marco Antonio Nina Mena
|
9c19de4285
|
Improvement label
|
2015-03-31 13:39:28 -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
|
8b41041c02
|
Merged in paulis/processmaker/PM-UPLOADLOGO (pull request #1814)
I solved a issue when you upload a logo
|
2015-03-31 11:47:46 -04:00 |
|
Dante Loayza
|
d02cda3f6a
|
Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1832)
Improvement formDashboards
|
2015-03-30 17:58:48 -04:00 |
|
Marco Antonio Nina Mena
|
a981a2842d
|
Improvement formDashboards
|
2015-03-30 17:57:16 -04:00 |
|
Dante
|
21e0f0089d
|
dashboardprocy console.log for throw correction
|
2015-03-30 16:42:56 -04:00 |
|
Dante
|
cdfcb13a04
|
deleting/commenting console.log in code
|
2015-03-30 16:32:28 -04:00 |
|
Julio Cesar Laura Avendaño
|
a9dd2a45d7
|
Merged in paulis/processmaker/PM-2010 (pull request #1828)
I updated images by Processmaker
|
2015-03-30 15:55:41 -04:00 |
|
Paula V. Quispe
|
baaa6230f4
|
I updated images
|
2015-03-30 15:23:56 -04:00 |
|
Paula V. Quispe
|
97c3d9e4d6
|
I updated images
|
2015-03-30 14:54:44 -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 |
|
Julio Cesar Laura Avendaño
|
2d82b97f55
|
Merged in dheeyi/processmaker/PM-1538 (pull request #1810)
PM-1538 Canjear Token: El tamaño máximo del campo 'Callback URL' es muy pequeño y recorta las urls largas
|
2015-03-30 13:22:40 -04:00 |
|
Julio Cesar Laura Avendaño
|
f5bf659918
|
Merged in dheeyi/processmaker/PM-1959 (pull request #1808)
PM-1959 Cambiar enlace en la pantalla de login de "Colosa,Inc." a "ProcessMaker Inc."
|
2015-03-30 13:21:32 -04:00 |
|
Julio Cesar Laura Avendaño
|
794e0d102d
|
Merged in dheeyi/processmaker/PM-1949 (pull request #1798)
PM-1949 Home -> Documents No se pueden mover Folders de una raiz a otra
|
2015-03-30 13:18:34 -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 |
|
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 |
|
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
|
b129fff7a7
|
I updated images about Processmaker
|
2015-03-30 10:00:34 -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
|
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 |
|