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

23198 Commits

Author SHA1 Message Date
artica b71752ea03 Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop 2019-12-16 11:23:06 +01:00
Daniel Rodriguez 11beedc773 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-3' into 'develop' 
Fixed errors

See merge request artica/pandorafms!2962
 2019-12-16 11:20:37 +01:00
Alejandro Fraguas 37020bd572 Merge branch 'ent-4903-list_ACL_IPs_for_API' into 'develop' 
Fix bug when updating ACL IP list

See merge request artica/pandorafms!2961
 2019-12-16 11:19:10 +01:00
fbsanchez d370fa560a DEBIAN console updated with gotty binary file 2019-12-16 10:51:24 +01:00
fbsanchez e43d8914aa RPMBUILD console updated with gotty binary file 2019-12-16 10:46:37 +01:00
artica f7b0372e53 Auto-updated build strings. 2019-12-16 00:01:07 +01:00
artica 20f3583fc5 Auto-updated build strings. 2019-12-15 00:01:06 +01:00
artica ebe0ba25c8 Auto-updated build strings. 2019-12-14 00:01:09 +01:00
Daniel Barbero a203da5a26 Fixed errors 2019-12-13 16:01:24 +01:00
alejandro-campos d30c2c9b3b Fix bug when updating ACL IP list 2019-12-13 14:17:25 +01:00
fbsanchez a558152cb2 minor fix 2019-12-13 13:20:44 +01:00
fbsanchez ad6ea431bf minor fix, hide quickshell settings while disabled 2019-12-13 13:13:09 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
fbsanchez 5f32bfdb64 Datatype fix - ws engine 2019-12-13 11:58:12 +01:00
Daniel Rodriguez 13ac0a6229 Merge branch 'ent-5082-setup-visual-styles-reports' into 'develop' 
Grouped report items on styles conf. Fixed font bug

See merge request artica/pandorafms!2953
 2019-12-13 11:51:56 +01:00
fbsanchez 3b5ebd0bf7 Better quickshell integration and fixes 2019-12-13 11:46:44 +01:00
Daniel Rodriguez 350dbaf832 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-2' into 'develop' 
Fix gauge pdf reports

See merge request artica/pandorafms!2958
 2019-12-13 11:28:30 +01:00
Alejandro Fraguas 810ad03c65 Merge branch '4290-Opciones-Adicionales-Templates-Alertas-Idiomas' into 'develop' 
Possible solution to avoid issues with JS and apostrophe of other languages strings

See merge request artica/pandorafms!2932
 2019-12-13 10:50:37 +01:00
Daniel Barbero 603b4e71eb Fix gauge pdf reports 2019-12-13 09:06:54 +01:00
artica 37c5acf4d1 Auto-updated build strings. 2019-12-13 00:01:12 +01:00
Daniel Rodriguez b3c55db8fd Merge branch 'ent-4931-Bug-al-crear-informe-con-SLA-Wizard-en-META' into 'develop' 
Ent 4931 bug al crear informe con sla wizard en meta

See merge request artica/pandorafms!2873
 2019-12-12 18:14:00 +01:00
Daniel Rodriguez 8f041368b4 Merge branch 'ent-4737-revision-completa-de-informes-modo-basico-en-meta' into 'develop' 
Fixed minor bugs in metaconsole reports

See merge request artica/pandorafms!2877
 2019-12-12 18:12:42 +01:00
Manuel Montes a2162948b4 Fixed minor bugs in metaconsole reports 2019-12-12 18:12:42 +01:00
vgilc 3d3ff46d12 Merge branch 'ent-5088-Cabecera-de-informes-en-html' into 'develop' 
Ent 5088 cabecera de informes en html

See merge request artica/pandorafms!2956
 2019-12-12 17:58:53 +01:00
vgilc 0a7f24192e Merge branch 'ent-5110-formulario-de-modulos-remotos-erroneo' into 'develop' 
Fixed bug in module creation view

See merge request artica/pandorafms!2954
 2019-12-12 17:07:35 +01:00
Daniel Rodriguez 3223e0a8e1 Merge branch 'ent-4865-8983-modulos-snmp-v3-politicas' into 'develop' 
Fixed snmp input

See merge request artica/pandorafms!2914
 2019-12-12 17:01:12 +01:00
Daniel Rodriguez 4d34a5028e Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs' into 'develop' 
base64 images pdf

See merge request artica/pandorafms!2955
 2019-12-12 16:36:46 +01:00
alejandro-campos b998ec3c44 visual changes in html report headers 2019-12-12 14:58:42 +01:00
alejandro-campos 7f79a50c33 visual changes in html report headers 2019-12-12 14:55:27 +01:00
Jose Gonzalez 81dcf4713f Modified arab phrase for solve the issue 2019-12-12 14:19:09 +01:00
Daniel Barbero 415a54fb55 base64 images pdf 2019-12-12 14:01:11 +01:00
manuel 2504a3dc09 Fixed bug in module creation view 2019-12-12 13:50:35 +01:00
Daniel Rodriguez ab1c6e17ca Merge branch 'ent-4508-desajustes-y-bug-en-open' into 'develop' 
fixed minnor error

See merge request artica/pandorafms!2929
 2019-12-12 11:03:22 +01:00
Daniel Rodriguez 1bc246742d Merge branch 'ent-4858-Faltan-controles-a-la-hora-de-crear-items-en-los-informes' into 'develop' 
Added controls on report items

See merge request artica/pandorafms!2863
 2019-12-12 09:11:15 +01:00
Manuel Montes 7ea61b7424 Added controls on report items 2019-12-12 09:11:15 +01:00
Daniel Rodriguez 01db6dd3b2 Merge branch 'ent-5094-selector-fechas-informes-html' into 'develop' 
Added margin to date selector elements in reporting viewer

See merge request artica/pandorafms!2945
 2019-12-12 09:10:35 +01:00
artica dd49f0c91c Auto-updated build strings. 2019-12-12 00:01:11 +01:00
Luis Calvo a364af3b2d Grouped report items on styles conf. Fixed font bug 2019-12-11 18:32:49 +01:00
vgilc 0d16bc3188 Merge branch '4605-Bug-Wizard-SNMP' into 'develop' 
Modified type of module when use SNMP Agent Wizard

See merge request artica/pandorafms!2947
 2019-12-11 16:24:29 +01:00
Daniel Rodriguez 13d8c69737 Merge branch 'ent-4327-Vista-Hourly-SLA-Weekly-SLA-en-PDF' into 'develop' 
Fix Landscape reports

See merge request artica/pandorafms!2937
 2019-12-11 15:07:38 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
fbsanchez bb093482a7 Fix: ws session extraction 2019-12-11 13:04:45 +01:00
Daniel Rodriguez 6bdfe87bc0 Merge branch 'ent-4877-Grupos-secundarios-en-eventos' into 'develop' 
Added secondary groups in event details

See merge request artica/pandorafms!2915
 2019-12-11 12:35:27 +01:00
Daniel Maya bb4fce07a1 Added secondary groups in event details 2019-12-11 12:35:27 +01:00
Alejandro Fraguas 9a21710cd5 Merge branch 'ent-5054-Vista-de-Netflow-live-view-descojonada' into 'develop' 
Ent 5054 vista de netflow live view descojonada

See merge request artica/pandorafms!2928
 2019-12-11 11:37:02 +01:00
artica 772b26ffcb Auto-updated build strings. 2019-12-11 00:01:11 +01:00
Daniel Rodriguez 1350ef951b Merge branch '5079-Otra-vez-las-comillas-dobles-en-comentarios' into 'develop' 
Code reset and solved other issues with comments

See merge request artica/pandorafms!2943
 2019-12-10 17:21:48 +01:00
Daniel Rodriguez 35298d754a Merge branch 'ent-4984-netflow-vulnerability' into 'develop' 
Fixed netflow command injection vulnerability

See merge request artica/pandorafms!2933
 2019-12-10 16:43:29 +01:00
Alejandro Fraguas d033b7d95a Merge branch 'ent-4948-posibilidad-de-añadir-fecha-hora-en-los-availability-graph' into 'develop' 
Added datetime in availability graph

See merge request artica/pandorafms!2917
 2019-12-10 16:34:33 +01:00
Jose Gonzalez 62de2fe396 Modified type of module when use SNMP Agent Wizard 2019-12-10 15:37:04 +01:00