Commit Graph

14726 Commits

Author SHA1 Message Date
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
jonathan quispe
de6302489b Merged colosa/processmaker into master 2015-04-07 09:29:35 -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
Julio Cesar Laura
9714480173 Updating .po .sql and .en files for release PM3.0 RC3 2015-04-06 16:34:32 -04:00
Marco Antonio Nina Mena
4d92b07318 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-06 15:37:25 -04:00
Marco Antonio Nina Mena
30f5503f71 Merge remote branch 'upstream/dashboards2' into dashboards2 2015-04-06 15:36:44 -04:00
Julio Cesar Laura Avendaño
03d62ac0cc Merged in dashboards2 (pull request #1862)
Adjusts to schema
2015-04-06 15:31:41 -04:00
Roly Rudy Gutierrez Pinto
830ca0a5f5 PM-2075 2015-04-06 14:46:20 -04:00
Marco Antonio Nina Mena
4a8fc1edf5 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-04-06 14:13:01 -04:00
Marco Antonio Nina Mena
ee85f66cde Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-04-06 14:12:07 -04:00
Julio Cesar Laura Avendaño
189e1ed0ba Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #1860)
Improvement schema
2015-04-06 13:52:08 -04:00
Marco Antonio Nina Mena
f1bd280f8b Merged colosa/processmaker into master 2015-04-06 13:36:50 -04:00
Marco Antonio Nina Mena
8169a02fbf Improvement sql 2015-04-06 13:34:30 -04:00
Marco Antonio Nina Mena
813736433f Merge remote branch 'upstream/dashboards2' into dashboards2 2015-04-06 11:53:37 -04:00
dheeyi
845023ea5c Merge branch 'master' of bitbucket.org:dheeyi/processmaker 2015-04-06 11:47:23 -04:00
dheeyi
184e79f201 Merge remote branch 'upstream/master' 2015-04-06 11:47:06 -04:00
Paula V. Quispe
0d7da82d23 I added some marcas 2015-04-06 11:45:30 -04:00
william barra
0aa014b143 Merged colosa/processmaker into master 2015-04-06 11:45:23 -04:00
Paula V. Quispe
c3aade6ec3 I solved the issue PM-2076 Config PKI in Preferences by user 2015-04-06 11:35:09 -04:00
dheeyi
b35a0ef489 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(Regex).
2015-04-06 11:26:51 -04:00
Marco Antonio Nina Mena
56604f3d4b Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-04-06 11:12:34 -04:00
Dante Loayza
8904d8680d Merged master into dashboards2 2015-04-06 11:07:28 -04:00
Dante
b133724a4c indicators with id 1020 and 1040 support on the view 2015-04-06 11:06:58 -04:00
Dante Loayza
37cd89dcfc Merged dashboards2 into master 2015-04-06 10:57:48 -04:00
Dante
120100d665 adding all indicators formulae 2015-04-06 10:57:01 -04:00
Roly Rudy Gutierrez Pinto
0361e65236 Merge remote-tracking branch 'upstream/master' 2015-04-06 10:24:47 -04:00
Roly Rudy Gutierrez Pinto
e851d3b0b7 IMPROVEMENT 2015-04-06 10:23:47 -04:00
Dante
b1635a3f48 PDO - host without port correction 2015-04-06 10:22:43 -04:00
Julio Cesar Laura Avendaño
c7b6afab90 Merged in cochalo/processmaker/PM-642 (pull request #1857)
PM-642 Directorio shared ya viene creado y con permisos
2015-04-06 10:20:36 -04:00
Brayan Pereyra
8daa489e8e PM-642 Directorio shared ya viene creado y con permisos 2015-04-06 09:54:29 -04:00
Marco Antonio Nina Mena
bcea544dcc Merge remote-tracking branch 'upstream/master' into dashboards2 2015-04-06 09:46:16 -04:00
dheeyi
3d45f95458 Merge remote branch 'upstream/master' into PM-1640 2015-04-06 09:32:56 -04:00
Julio Cesar Laura Avendaño
1b6d7205f8 Merged in dashboards2 (pull request #1854)
Dashboards bugs and improvements
2015-04-06 09:23:22 -04:00
Marco Antonio Nina Mena
a99ff1c9b7 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-04-06 09:23:11 -04:00
dheeyi
23852b79de Merge remote branch 'upstream/master' 2015-04-06 08:46:24 -04:00