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

32877 Commits

Author SHA1 Message Date
Pablo Aragon 38a05d2a79 Events meta 2023-02-28 09:50:42 +01:00
Jose Gonzalez ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
Jonathan d1ace9d560 SNMP filters mesage empty 2023-02-28 08:29:29 +01:00
daniel 6642f2e6d3 fixed styles 2023-02-28 08:06:53 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
 2023-02-28 07:32:43 +01:00
artica 23e333f58d Auto-updated build strings. 2023-02-28 01:00:26 +01:00
daniel f3d7aa9e30 fixed styles 2023-02-27 18:39:10 +01:00
daniel 76b2c8743b Merge remote-tracking branch 'origin/ent-9987-mejoras-de-la-vista-de-inventario' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2023-02-27 18:25:45 +01:00
daniel f38adff73a fixed styles 2023-02-27 18:05:51 +01:00
Diego Muñoz-Reja 0f635c8206 Merge branch 'ent-10127-14800-anadir-id_nodo-a-llamada-api-validate_events' into 'develop' 
Ent 10127 14800 anadir id nodo a llamada api validate events

See merge request artica/pandorafms!5479
 2023-02-27 16:53:01 +00:00
alejandro.campos@artica.es 930879b295 updated underscore 2023-02-27 17:26:58 +01:00
Jose Gonzalez 973444014a Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:37:17 +01:00
Jose Gonzalez 5df442e83e Network maps improve 2023-02-27 16:37:00 +01:00
Jonathan 1d930dccc7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:34:02 +01:00
Jonathan dcdf0a5188 SNMP and reporting visual changes 2023-02-27 16:33:54 +01:00
Jose Gonzalez 526bff976c Improve functionality 2023-02-27 16:33:46 +01:00
Daniel Cebrian 3259795a0b #10559 control delete task list if not exist id 2023-02-27 16:15:34 +01:00
Matias Didier 47ec49280c Merge branch 'ent-10335-15016-edicion-comunidad-snmp-desdes-operaciones-masivas' into 'develop' 
Ent 10335 15016 edicion comunidad snmp desdes operaciones masivas

See merge request artica/pandorafms!5520
 2023-02-27 14:39:49 +00:00
Daniel Cebrian c8096d73b2 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 14:58:25 +01:00
Pablo Aragon 32cf508633 10457-System audit log 2023-02-27 14:38:39 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +01:00
Daniel Cebrian 2c7d00a664 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 13:34:41 +01:00
Daniel Cebrian 5d4c61f8c4 #10253 added notify enforcement in metaconsole 2023-02-27 13:26:32 +01:00
Jonathan 87f17890f9 SNMP visual changes 2023-02-27 12:13:38 +01:00
Matias Didier 86b7e278ad Merge branch 'ent-10493-reinicio-de-la-paginacion-al-interactuar-con-un-elemento' into 'develop' 
Ent 10493 reinicio de la paginacion al interactuar con un elemento

See merge request artica/pandorafms!5556
 2023-02-27 11:08:42 +00:00
Calvo fcd9a93f68 Fix code style 2023-02-27 10:53:59 +01:00
Jonathan fe8d15855c Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 10:31:54 +01:00
Jonathan 74c0dbb39f SNMP black theme 2023-02-27 10:31:50 +01:00
Pablo Aragon 936c9bcafb 10454-Events 2023-02-27 10:12:42 +01:00
Jose Gonzalez 9acc4aeec4 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 10:09:53 +01:00
Jose Gonzalez cba3ba8452 Fixed resource registration 2023-02-27 10:09:34 +01:00
Pablo Aragon e024658520 10454-Events 2023-02-27 09:57:17 +01:00
Jose Gonzalez 6f16c45285 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 09:55:59 +01:00
Jose Gonzalez 9972b14ccd Resource Exportation view 2023-02-27 09:55:31 +01:00
daniel 35241e0d38 restyling 2023-02-27 09:55:29 +01:00
Rafael Ameijeiras 7262e2f710 Merge branch 'ent-10280-quitar-opciones-de-windows-en-la-ayuda-del-pandoraserver' into 'develop' 
Removed Win32 service from pandora_server

See merge request artica/pandorafms!5565
 2023-02-27 08:52:43 +00:00
Rafael Ameijeiras 2e7020176a Merge branch 'ent-10273-cambios-plugin-google-sheet' into 'develop' 
update google sheet plugin

See merge request artica/pandorafms!5474
 2023-02-27 08:52:07 +00:00
Rafael Ameijeiras b649d13d3f Merge branch 'ent-10337-GUARDIA-Problema-con-el-db-interface-de-meta' into 'develop' 
fixed node connection

See merge request artica/pandorafms!5517
 2023-02-27 08:51:19 +00:00
Matias Didier 1d30123d53 Merge branch 'ent-10259-control-de-configuracion-en-tagent_acess' into 'develop' 
Ent 10259 control de configuracion en tagent acess

See merge request artica/pandorafms!5504
 2023-02-27 08:45:00 +00:00
Jonathan 8fa88a564d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 09:42:00 +01:00
Jonathan 9ed46e3b52 SNMP fix view 2023-02-27 09:41:39 +01:00
Daniel Maya 586b6e5883 #9662 fixed menu 2023-02-27 09:39:34 +01:00
daniel 2b9bef1660 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 08:01:15 +01:00
artica 491958a105 Auto-updated build strings. 2023-02-27 01:00:21 +01:00
artica ce5b0abda6 Auto-updated build strings. 2023-02-26 01:00:21 +01:00
artica e38504d3df Auto-updated build strings. 2023-02-25 01:00:27 +01:00
Calvo 96a5dd9991 Fix minor bug 2023-02-24 15:15:06 +01:00
Calvo 9294253675 Fix regex to extract version and oum 2023-02-24 15:12:18 +01:00
Jose Gonzalez 6c97fd16a2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 14:34:52 +01:00
Jose Gonzalez 4e2af1d5f2 Fixes 2023-02-24 14:34:32 +01:00