Commit Graph

12008 Commits

Author SHA1 Message Date
dheeyi
eff3227429 Merge remote branch 'upstream/master' 2015-04-09 08:43:52 -04:00
Julio Cesar Laura Avendaño
5cce46ccd9 Merged in dashboards2 (pull request #1890)
Deleting redundant fields and fixing KPIs menu item
2015-04-08 16:58:38 -04:00
Dante Loayza
9ff5281c16 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1888)
change of instead "menu KPIs"
2015-04-08 15:50:04 -04:00
Dante Loayza
046e08939e Merged master into dashboards2 2015-04-08 15:48:40 -04:00
Marco Antonio Nina Mena
b7696faba6 change of instead "menu KPIs" 2015-04-08 15:44:27 -04:00
Julio Cesar Laura Avendaño
c59bbc53b6 Merged in paulis/processmaker/PM-VERACODE-16 (pull request #1865)
I solved XSS in Thirdparty files
2015-04-08 14:54:05 -04:00
Julio Cesar Laura Avendaño
98d7ddb774 Merged in mcuiza/processmaker/veracode-cryptographic-issues (pull request #1878)
veracode-cryptographic-issues
2015-04-08 14:53:17 -04:00
Paula V. Quispe
c8c9928f37 I corrected some observations 2015-04-08 14:48:52 -04:00
Julio Cesar Laura Avendaño
bb6945e466 Merged in mcuiza/processmaker/veracode-medium-issues (pull request #1867)
veracode medium issues
2015-04-08 13:45:11 -04:00
Julio Cesar Laura Avendaño
77b0d8d4de Merged in luisfernandosl/processmaker/PM-2121 (pull request #1883)
PM-2121 "Bug en el instalador community del RC3" SOLVED
2015-04-08 11:51:45 -04:00
Luis Fernando Saisa Lopez
80ecfa7561 PM-2121 "Bug en el instalador community del RC3" SOLVED 2015-04-08 11:46:08 -04:00
Dante Loayza
6febb11930 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1881)
Removing unnecessary files
2015-04-08 11:27:31 -04:00
Dante Loayza
57c25e7018 Merged master into dashboards2 2015-04-08 11:22:01 -04:00
Marco Antonio Nina Mena
2e5121c940 Removing unnecessary files 2015-04-08 10:51:49 -04:00
Julio Cesar Laura Avendaño
0b40862053 Merged in paulis/processmaker/PM-2076 (pull request #1870)
I corrected the default label
2015-04-08 10:45:37 -04:00
Marco Antonio Nina Mena
707d8d8b60 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-08 10:00:25 -04:00
Marco Antonio Nina Mena
1c39128e38 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-08 09:34:24 -04:00
Marco Antonio Nina Mena
384b28bc24 Merged colosa/processmaker into master 2015-04-08 11:24:17 -04:00
Marco Antonio Nina Mena
4c5bca6694 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-04-08 09:34:12 -04:00
Marco Antonio Nina Mena
440fda7196 Merged colosa/processmaker into master 2015-04-08 09:18:13 -04:00
dheeyi
75ecaa9fcb Merge remote branch 'upstream/master' 2015-04-08 09:10:30 -04:00
Julio Cesar Laura Avendaño
63567186ba Merged in julceslau/processmaker (pull request #1879)
Updating .po .sql and .en files for release PM3.0 RC3
2015-04-07 18:03:49 -04:00
Julio Cesar Laura
dab5eda502 Updating .po .sql and .en files for release PM3.0 RC3 2015-04-07 18:02:00 -04:00
marcelo.cuiza
1f1ecef4d1 veracode-cryptographic-issues
Validacion de incidencias thirdparty de nivel medium
2015-04-07 17:35:31 -04:00
Julio Cesar Laura Avendaño
328c301e14 Merged in gproly/processmaker/IMPROVEMENT (pull request #1877)
IMPROVEMENT
2015-04-07 17:30:11 -04:00
Roly Rudy Gutierrez Pinto
c31075af07 IMPROVEMENT 2015-04-07 17:28:11 -04:00
Paula V. Quispe
ac56bbd20c I deleted the file buscador.php 2015-04-07 16:53:09 -04:00
Julio Cesar Laura Avendaño
b0cbe08d62 Merged in julceslau/processmaker (pull request #1874)
Fix little error with the verifyfeature method
2015-04-07 16:23:49 -04:00
Julio Cesar Laura
34869783e5 Fix little error with the verifyfeature method 2015-04-07 16:21:51 -04:00
Julio Cesar Laura Avendaño
74d6761521 Merged in luisfernandosl/processmaker/PM-2121 (pull request #1873)
PM-2121 "Bug en el instalador community del RC3" SOLVED
2015-04-07 16:12:38 -04:00
Luis Fernando Saisa Lopez
3f439d8543 PM-2121 "Bug en el instalador community del RC3" SOLVED
> Code Issue:
  Bug en el instalador community del RC3.
> Solution:
  Se cambio el comentario en linea por bloque.
2015-04-07 15:46:37 -04:00
Dante Loayza
f14bf926cc Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1871)
improvement formDashboards ff
2015-04-07 14:57:36 -04:00
Marco Antonio Nina Mena
4a79b7f026 Merged colosa/processmaker into master 2015-04-07 14:21:24 -04:00
Marco Antonio Nina Mena
3269a287af improvement formDashboards ff 2015-04-07 14:17:03 -04:00
Paula V. Quispe
1b6bd2cfa8 I corrected the default label 2015-04-07 11:51:50 -04:00
Julio Cesar Laura Avendaño
46ad717937 Merged in paulis/processmaker/PM-2106 (pull request #1869)
I solved the issue PM-2106
2015-04-07 11:19:02 -04:00
Paula V. Quispe
fe7e0f572e I solved the issue PM-2106 2015-04-07 11:03:54 -04:00
dheeyi
225ece1886 Merge remote branch 'upstream/master' 2015-04-07 08:50:20 -04:00
Julio Cesar Laura Avendaño
6bcf8742d4 Merged in paulis/processmaker/PM-2076 (pull request #1858)
I solved the issue PM-2076 Config PKI in Preferences by user
2015-04-06 23:37:59 -04:00
Julio Cesar Laura Avendaño
5bc4c0cfef Merged in victorsl/processmaker/PM-1903 (pull request #1827)
PM-1903 "0017014: ProcessMaker loses connection..." SOLVED
2015-04-06 23:37:45 -04:00
Julio Cesar Laura Avendaño
e83a7ede85 Merged in richardnoel/processmaker (pull request #1856)
PM-1876 fix height for to html form
2015-04-06 21:42:55 -04:00
Julio Cesar Laura Avendaño
ac3534c811 Merged in dheeyi/processmaker/PM-1640 (pull request #1816)
PM-1640 Workspace creation field accpets everything including mysql restricted characters like %$
2015-04-06 21:41:23 -04:00
Julio Cesar Laura Avendaño
9f0d6754c2 Merged in gproly/processmaker/PM-2075 (pull request #1861)
PM-2075
2015-04-06 21:32:10 -04:00
Julio Cesar Laura Avendaño
3c650c7024 Merged in julceslau/processmaker (pull request #1868)
Adding missing single quote in soap2.php file
2015-04-06 18:11:10 -04:00
Julio Cesar Laura
df669cc844 Adding missing single quote in soap2.php file 2015-04-06 18:09:30 -04:00
marcelo.cuiza
cac0c4e96e veracode medium issues
Directory Transversal, OS Command Injection
2015-04-06 17:43:51 -04:00
Julio Cesar Laura Avendaño
8c5016a7cb Merged in luisfernandosl/processmaker/PM-2073 (pull request #1864)
PM-2073 "Quitar referencia a Colosa en archivos..." SOLVED
2015-04-06 17:41:53 -04:00
Paula V. Quispe
ec26547def I solved XSS in Thirdparty files 2015-04-06 16:54:57 -04:00
Luis Fernando Saisa Lopez
34779fe7de PM-2073 "Quitar referencia a Colosa en archivos..." SOLVED
> Code Issue:
  Quitar referencia a Colosa en archivos de error 404.
> Solution:
  Se a eliminado de los templates error404 y error403 las imagenes y enlaces referentes a processmaker.
2015-04-06 16:46:54 -04:00
Julio Cesar Laura Avendaño
b8b92de72e Merged in julceslau/processmaker (pull request #1863)
Updating .po .sql and .en files for release PM3.0 RC3
2015-04-06 16:36:46 -04:00