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

14029 Commits

Author SHA1 Message Date
artica c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez 26577095d7 Merge branch 'ent-7193-submenu-ocultado-en-arbol-de-discovery' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3939
 2021-03-25 14:08:35 +00:00
marcos b8a72f0583 fixed visual error 2021-03-25 14:42:34 +01:00
marcos b7f845a64d fixed visual error 2021-03-25 14:27:41 +01:00
fbsanchez 7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
Daniel Rodriguez 1d374fca46 Merge branch 'ent-2561-llamadas-api-para-modulos-de-politicas' into 'develop' 
minor changes

See merge request artica/pandorafms!3779
 2021-03-25 09:57:53 +00:00
Daniel Rodriguez f99e4763e2 Merge branch 'ent-7197-estilos-log-viewer' into 'develop' 
Fix some documentary issues

Closes pandora_enterprise#7197

See merge request artica/pandorafms!3948
 2021-03-25 09:53:41 +00:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
artica 1934c04388 Auto-updated build strings. 2021-03-25 01:00:21 +01:00
fbsanchez f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
fbsanchez 12767683dc minor fixes 2021-03-24 16:25:27 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
fbsanchez d312f764ed Hack to use old functions from PandoraDB 2021-03-24 13:43:14 +01:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
marcos eaed8aa09a fixed visual error 2021-03-24 13:10:29 +01:00
Daniel Rodriguez 9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop' 
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
 2021-03-24 11:57:47 +00:00
Jose Gonzalez af98637680 Fix some documentary issues 2021-03-24 12:45:25 +01:00
Daniel Rodriguez ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop' 
Command center

See merge request artica/pandorafms!3887
 2021-03-24 11:43:52 +00:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2021-03-24 09:55:31 +01:00
artica 00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
Daniel Rodriguez 2597c2c7fc Merge branch 'ent-7188-bug-visual-en-tactical-view-metaconsola' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3940
 2021-03-23 15:56:02 +00:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop' 
add tooltip service name

See merge request artica/pandorafms!3783
 2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
José González 6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2021-03-23 12:00:45 +00:00
Daniel Rodriguez 0a31f7f165 Merge branch 'ent-7185-snmp-browser-ventana-de-info-de-OID-descuadrada' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3942
 2021-03-23 09:29:39 +00:00
Daniel Rodriguez f92c75639a Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop' 
Removed extra verbosity

See merge request artica/pandorafms!3899
 2021-03-23 09:29:05 +00:00
artica b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
Daniel Rodriguez 67c0968864 Merge branch 'ent-7190-bug-icono-wux-en.vista-de-modulos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3941
 2021-03-22 16:59:57 +00:00
marcos 51ea2d569d fixed visual error 2021-03-22 17:02:30 +01:00
marcos 69fe389afc fixed visual error 2021-03-22 16:42:19 +01:00
marcos adadd40399 fixed visual error 2021-03-22 16:34:29 +01:00
marcos b6c02bd95c fixed visual error 2021-03-22 15:21:09 +01:00
daniel b258f409b9 Mode ghost for disabled modules and agents 2021-03-22 14:10:14 +00:00
Daniel Rodriguez 390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop' 
fixed visuals errors black theme

See merge request artica/pandorafms!3937
 2021-03-22 12:48:39 +00:00
Daniel Rodriguez 8f33c767b7 Merge branch 'ent-7132-bug-en-vista-agents-alerts' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3911
 2021-03-22 12:46:58 +00:00
Daniel Rodriguez 8db123d364 Merge branch 'ent-7180-spinner-de-snmp-browere-ha-desaparecido' into 'develop' 
fixed spinner bug

See merge request artica/pandorafms!3933
 2021-03-22 12:46:02 +00:00
Daniel Rodriguez a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop' 
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
 2021-03-22 12:39:59 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
artica 49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica 2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica 3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
marcos ebf912437b fixed error with sort function 2021-03-18 18:05:53 +01:00
Daniel Rodriguez da4c5a1c28 Merge branch 'ent-7167-meta-varios-botones-y-ventanas-descuadradas' into 'develop' 
fixed visual errors

See merge request artica/pandorafms!3925
 2021-03-18 17:05:50 +00:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
Daniel Barbero Martin 6d6b9fe5b9 fixed visuals errors black theme 2021-03-18 17:32:21 +01:00
Daniel Rodriguez 8eb06d8adc Merge branch 'ent-6753-consistencia-en-el-selector-de-grupos' into 'develop' 
group selector updates for report, required

See merge request artica/pandorafms!3763
 2021-03-18 16:05:16 +00:00