tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,872 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

23872 Commits

Author SHA1 Message Date
Daniel Rodriguez 45033625e5 Merge branch 'ent-5112-error-nodos-ficticios-widget-mapa-red' into 'develop' 
Ent 5112 error nodos ficticios widget mapa red

See merge request artica/pandorafms!3030
 2020-02-06 14:32:43 +01:00
Luis 56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
Jose Gonzalez 5b08e71ec6 Solved issue with UTF8 chars in configuration_data field 2020-02-06 13:02:58 +01:00
Daniel Rodriguez 545c0056bc Merge branch 'ent-4700-No-funciona-logrotate-de-pandora-console-log' into 'develop' 
fix bad owner for pandora_console logrotate config file

See merge request artica/pandorafms!3040
 2020-02-06 12:03:57 +01:00
artica 36fdaf3ff7 Auto-updated build strings. 2020-02-06 00:01:11 +01:00
Daniel Barbero Martin 68dd01ba09 fixed errors VC 2020-02-05 18:56:28 +01:00
Daniel Maya ae015fa00f Fixed width in availability graph 2020-02-05 16:40:01 +01:00
Daniel Barbero Martin 902c42b559 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-05 14:05:26 +01:00
Daniel Rodriguez 97adbca5cd Merge branch 'ent-4768-error-macro-agent-address-event-responses' into 'develop' 
Fixed macro agent address empty ip

See merge request artica/pandorafms!2823
 2020-02-05 12:56:13 +01:00
Daniel Rodriguez 1cca736953 Merge branch 'ent-4788-Icono-GIS-en-Setup-desaparecido' into 'develop' 
Ent 4788 icono gis en setup desaparecido

See merge request artica/pandorafms!2843
 2020-02-05 12:35:50 +01:00
Daniel Rodriguez 9617d08df7 Merge branch 'ent-4808-plugin-update-md5' into 'develop' 
New util - update remote config files MD5

See merge request artica/pandorafms!2810
 2020-02-05 12:16:34 +01:00
Alejandro Fraguas ec98d861b2 Merge branch 'ent-4622-Fallo-filtrado-en-listado-acceso-API' into 'develop' 
Fixed bug with API access list - #4622

See merge request artica/pandorafms!2724
 2020-02-05 10:44:42 +01:00
artica 70e5486ce6 Auto-updated build strings. 2020-02-05 00:01:11 +01:00
Daniel Rodriguez 3342b7dd53 Merge branch 'ent-5403-XSS-vistas-por-Nokia-USA' into 'develop' 
Fixed XSS vulnerability

See merge request artica/pandorafms!3041
 2020-02-04 17:30:21 +01:00
Daniel Rodriguez 22649e016f Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop' 
fix html special characters breaking html in modules search

See merge request artica/pandorafms!3046
 2020-02-04 16:56:26 +01:00
alejandro-campos a51c17b512 fix html special characters breaking html in modules search 2020-02-04 16:39:54 +01:00
Daniel Rodriguez 0e9e59efbb Merge branch 'ent-5289-9247-Group-Alert-Report-bug' into 'develop' 
fix bug in group alert report data visualization

See merge request artica/pandorafms!3031
 2020-02-04 13:25:29 +01:00
Daniel Rodriguez e6a5d7986f Merge branch 'ent-5376-Inyecciones-SQL-vistas-por-Nokia-USA' into 'develop' 
Fixed % with sprintf

See merge request artica/pandorafms!3039
 2020-02-04 13:14:55 +01:00
Daniel Rodriguez 8b60daa9ba Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop' 
fix module string data with html special chars breaking html in page

See merge request artica/pandorafms!3042
 2020-02-04 10:10:07 +01:00
artica 3415838700 Auto-updated build strings. 2020-02-04 00:01:10 +01:00
alejandro-campos 674f2a2873 minor fix: data string not being displayed correctly when module unknown 2020-02-03 18:04:52 +01:00
alejandro-campos 3b233eeb90 changed functionality to not show trigger times that are not within the interval 2020-02-03 18:01:28 +01:00
fbsanchez 5da211aae0 ACL edit mode 2020-02-03 17:08:37 +01:00
fbsanchez 72d23e5dfa Module graph paint direct 2020-02-03 16:32:20 +01:00
Alejandro Fraguas 00ab0b9952 Merge branch 'ent-5295-Constantes-de-1año-2-años-y-3-años-no-son-correctas' into 'develop' 
Ent 5295 constantes de 1año 2 años y 3 años no son correctas

See merge request artica/pandorafms!3014
 2020-02-03 16:21:22 +01:00
alejandro-campos d05551f85a fix characters breaking html 2020-02-03 16:17:46 +01:00
Daniel Rodriguez 32cb47fb71 Merge branch 'ent-5251-9432-No-se-pueden-crear-usuarios-con-password-policy-activado' into 'develop' 
Fixed password policy

See merge request artica/pandorafms!3020
 2020-02-03 16:06:43 +01:00
Daniel Rodriguez bdb8d309ad Merge branch 'ent-5359-8945-Logo-y-nombre-de-Pandora-FMS-al-fallar-la-base-de-datos' into 'develop' 
fix to display pandora tab subtitle based on condition and display rebranding...

See merge request artica/pandorafms!3025
 2020-02-03 14:06:38 +01:00
Alejandro Fraguas 6aae378b37 Merge branch 'ent-4533-descuadre-visual-usuarios-metaconsola' into 'develop' 
ajuste visual en tabla user management

See merge request artica/pandorafms!2682
 2020-02-03 13:55:42 +01:00
Alejandro Fraguas 6c93fcfe02 Merge branch 'ent-5361-vulnerabilidad-subir-ficheros' into 'develop' 
adding .htaccess files

See merge request artica/pandorafms!3026
 2020-02-03 12:36:01 +01:00
Alejandro Fraguas 12d8dca70e Merge branch 'ent-5149-9065-Pandora-manage-create-event-poner-saltos-de-linea' into 'develop' 
Added possibility to display comments with line breaks in event detail

See merge request artica/pandorafms!3029
 2020-02-03 10:34:56 +01:00
artica af7d1ea5f9 Auto-updated build strings. 2020-02-03 00:01:08 +01:00
artica 690f6e715d Auto-updated build strings. 2020-02-02 00:01:08 +01:00
artica 3136563bba Auto-updated build strings. 2020-02-01 00:01:09 +01:00
rafael c200f57856 adding .txt restreriction for webchat 2020-01-31 18:45:53 +01:00
alejandro-campos 73f3dfac85 fix module string data with html special chars breaking html in page 2020-01-31 11:53:42 +01:00
artica 7aa9a630d0 Auto-updated build strings. 2020-01-31 00:01:10 +01:00
Daniel Maya bf53eb5a6b Fixed XSS vulnerability 2020-01-30 17:29:07 +01:00
alejandro-campos b79805c363 fix bad owner for pandora_console logrotate config file 2020-01-30 13:08:56 +01:00
Daniel Maya 891c517611 Fixed % with sprintf 2020-01-30 13:02:33 +01:00
artica 1134c041f2 Auto-updated build strings. 2020-01-30 00:01:08 +01:00
Jose Gonzalez 3c5554b985 Deleted stderr for curl testing 2020-01-29 17:32:04 +01:00
fbsanchez 668027e794 Merge remote-tracking branch 'origin/develop' into ent-5333-7076-encoding-iso-8859-15-enc-genera-badxml 2020-01-29 16:31:14 +01:00
fbsanchez c8c2141f83 Added enc_dir to Encoding_Path (ExpatXS) 2020-01-29 16:31:08 +01:00
vgilc f8b12d2fdb Merge branch 'subida-mr-35' into 'develop' 
Next mr

See merge request artica/pandorafms!3036
 2020-01-29 15:55:09 +01:00
Daniel Maya baecac1efb Next mr 2020-01-29 15:51:39 +01:00
Daniel Rodriguez 1d57bb74fd Merge branch 'ent-3843-mala-traduccion-en-ingles-y-castellano-en-configuracion-visual' into 'develop' 
Ent 3843 mala traduccion en ingles y castellano en configuracion visual

See merge request artica/pandorafms!3035
 2020-01-29 14:22:06 +01:00
marcos 0ed4937368 add traductions 2020-01-29 13:48:48 +01:00
Daniel Rodriguez 783331d18b Merge branch 'ent-5381-9482-problemas-windows-server-con-742fix' into 'develop' 
Fix Windows strftime reference

See merge request artica/pandorafms!3032
 2020-01-29 13:20:51 +01:00
Ramon Novoa dac5b6b6b3 Unify file transfer, secondary mode and XML buffer criteria. 
Ref pandora_enterprise#5360
 2020-01-29 13:08:00 +01:00