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

26519 Commits

Author SHA1 Message Date
slerena 62ae32335d Updated default values in config for heigh in report graphs (to 250px), and days delete for non-init agents (set to 7, was 0). 2023-03-03 10:08:34 +00:00
Jonathan e5cbe07a86 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 10:12:28 +01:00
Jonathan 8d31603e44 Custom Graphs visual changes 2023-03-03 10:12:24 +01:00
Daniel Rodriguez cce6e2d222 Merge branch 'ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole' into 'develop' 
Core: Fix and optimized lag calculaton. Console: optimized and unified queries with server

See merge request artica/pandorafms!5555
 2023-03-03 08:32:34 +00:00
Daniel Maya ccb0d69edd #10518 Added new menu 2023-03-03 09:15:51 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
artica 1f046e9446 Auto-updated build strings. 2023-03-03 01:00:24 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Jimmy Olano 2d9406c53e Merge branch 'ent-9700-URLs-de-la-consola-en-elementos-de-CV-no-se-redirigen-bien' into 'develop', JJOS. 
fixed tinyMCE converting URLs to relative ones

See merge request artica/pandorafms!5523
 2023-03-02 17:38:41 +00:00
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-02 16:53:42 +00:00
Daniel Rodriguez 7e9abf01dd Merge branch 'ent-9805-14513-14958-problema-timestamp-vs-utimestamp-en-tevento-al-crear-eventos-por-api' into 'develop' 
Unified event timestamp and utimestamp

See merge request artica/pandorafms!5561
 2023-03-02 16:32:01 +00:00
Jose Gonzalez 18076d27cc Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 17:25:00 +01:00
Jose Gonzalez 7a11ce4145 Visual Consoles 2023-03-02 17:24:52 +01:00
Jonathan 348ba63ef8 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 17:17:15 +01:00
Jonathan cef5c478e9 Graph viewer and graph template item editor visual 2023-03-02 17:17:10 +01:00
Pablo Aragon 816f0f4770 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 17:10:01 +01:00
Pablo Aragon 0e9f7331db Ipam 2023-03-02 17:08:47 +01:00
Daniel Cebrian cdf359481a #10347 cleared code for apply acl permission 2023-03-02 17:06:16 +01:00
Daniel Rodriguez 006b35679d Merge branch 'ent-10093-Activar-modo-mantenimiento-en-politicas-cuando-se-ejecuta-el-pandora-db' into 'develop' 
policy maintenance mode

See merge request artica/pandorafms!5506
 2023-03-02 15:50:17 +00:00
Diego Muñoz-Reja 5d756ee393 Merge branch 'ent-9819-crear-tip-en-consola-sonora-de-eventos' into 'develop' 
Ent 9819 crear tip en consola sonora de eventos

See merge request artica/pandorafms!5466
 2023-03-02 15:25:31 +00:00
Daniel Cebrian af5a620883 #10347 fixed urls monitors and added name group 2023-03-02 16:22:25 +01:00
Diego Muñoz-Reja 873334fd97 Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop' 
Ent 9622 omnishell en la vista solapa de agente

See merge request artica/pandorafms!5508
 2023-03-02 14:52:45 +00:00
Jose Gonzalez b82b6bc1bc Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 15:25:10 +01:00
Jose Gonzalez 4519bd3d72 Improve label input block function 2023-03-02 15:24:54 +01:00
Jonathan 1c057773aa Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 14:35:05 +01:00
Jonathan dd1b58b83a Reporting Custom Graphs change visual 2023-03-02 14:35:01 +01:00
daniel 6545bdbaf1 fixed styles 2023-03-02 14:25:52 +01:00
Daniel Cebrian dc6256058f #10347 added list agents in tactical view groups 2023-03-02 13:48:14 +01:00
Jose Gonzalez 9a295cf974 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 12:59:47 +01:00
Jose Gonzalez d65852e9aa Visual console 2023-03-02 12:59:40 +01:00
daniel 5f8e9a3e3c fixed styles 2023-03-02 12:46:47 +01:00
daniel 6c87ec3c99 fixed styles 2023-03-02 11:29:47 +01:00
Daniel Cebrian a4a5650a01 #10347 added modal in heatmap agent 2023-03-02 11:10:37 +01:00
daniel ad33accfda fixed styles 2023-03-02 11:10:09 +01:00
Matias Didier c4e8ff49d5 Merge branch 'ent-10569-Error-500-a-la-hora-de-abrir-vista-de-algun-agente-en-fenix' into 'develop' 
error fix

See merge request artica/pandorafms!5574
 2023-03-02 09:15:37 +00:00
Jonathan 590ddc827c #9819 Change MR and add pandoradb.sql create table teventsound 2023-03-02 08:29:06 +01:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
Jonathan 2f4543a023 #9517 Change MR sql 2023-03-02 08:20:43 +01:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
artica f1bb7b450e Auto-updated build strings. 2023-03-02 01:00:46 +01:00
Daniel Cebrian ea51399460 #10347 create view tactic for groups with monitoring and alerts 2023-03-01 17:27:32 +01:00
Diego Muñoz-Reja 2057cf8d47 Merge branch 'ent-9666-nuevo-widget-event-cardboard' into 'develop' 
Ent 9666 nuevo widget event cardboard

See merge request artica/pandorafms!5533
 2023-03-01 15:49:47 +00:00
Jonathan c508daf560 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 16:31:00 +01:00
Jonathan 93479ed1f0 reporting viewer 2023-03-01 16:30:57 +01:00
alejandro.campos@artica.es fd13b376a5 Merge branch 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' of brutus.artica.es:artica/pandorafms into ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas 2023-03-01 16:10:30 +01:00
alejandro.campos@artica.es 296ec44ef4 minor fix 2023-03-01 16:10:18 +01:00
Jose Gonzalez a128151d9e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 14:21:00 +01:00
Jonathan b6fef7a097 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 14:20:11 +01:00
alejandro.campos@artica.es 36cfcc3c2f error fix 2023-03-01 14:19:35 +01:00
daniel 5d0d485efa fixed styles 2023-03-01 14:18:27 +01:00
Jonathan cc13726718 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 14:17:40 +01:00
Jonathan c4096f7d25 Reporting wizards 2023-03-01 14:17:03 +01:00
Jose Gonzalez 627d6cc5ec Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 14:10:02 +01:00
daniel 774b32d7a0 fixed styles 2023-03-01 13:54:22 +01:00
daniel 69d1bdd908 fixed styles 2023-03-01 13:44:01 +01:00
Jose Gonzalez a16b4c11f4 Fix toggle and spinner issues 2023-03-01 13:32:15 +01:00
Daniel Rodriguez 424c4db9de Merge branch 'ent-10302-errores-de-fecha-con-eventos-y-tz' into 'develop' 
Ent 10302 errores de fecha con eventos y tz

See merge request artica/pandorafms!5524
 2023-03-01 12:31:27 +00:00
Daniel Rodriguez 23f91fa0f3 Merge branch 'ent-9962-14776-Mergear-resultados-de-ITEM-SQL-Query-de-informes-en-META' into 'develop' 
added all nodes option in sql query report item in meta

See merge request artica/pandorafms!5535
 2023-03-01 12:29:54 +00:00
daniel 7b1d8a535a fixed styles 2023-03-01 13:19:12 +01:00
Jose Gonzalez 4c3fa9ade8 Changed info icon color 2023-03-01 12:44:22 +01:00
Jose Gonzalez 92c72d2026 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 12:37:27 +01:00
Jose Gonzalez 7958793e1a Service 2023-03-01 12:37:17 +01:00
Pablo Aragon 81e349bfd7 Ipam 2023-03-01 12:23:49 +01:00
Pablo Aragon a5758a86a9 Ipam 2023-03-01 12:22:46 +01:00
Jonathan 0ebbf9f14f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 12:15:08 +01:00
Jonathan 7e4337e4f3 Reporting templates 2023-03-01 12:14:23 +01:00
Jose Gonzalez ca6d722495 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 12:07:11 +01:00
Jose Gonzalez 63e05ff304 Update help tip icon 2023-03-01 12:07:03 +01:00
Jonathan 472b655ee6 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 08:18:50 +01:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
artica 6b23a0c696 Auto-updated build strings. 2023-03-01 01:00:24 +01:00
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Jimmy Olano a8d0f79540 Merge branch 'ent-10257-guardia-14543-no-muestra-modulos-no-init-en-vista-monitor-detail' into 'develop' (^JJOS) 
Fix empty module data list view

See merge request artica/pandorafms!5472
 2023-02-28 17:35:56 +00:00
Jose Gonzalez fa354ff8e6 Minor changes 2023-02-28 17:54:22 +01:00
Jose Gonzalez ad34dfef21 Minor changes 2023-02-28 17:53:10 +01:00
Pablo Aragon c0ab435f4f Events meta 2023-02-28 17:49:22 +01:00
Pablo Aragon 3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
Jonathan 1dca587455 SNMP Browser modals change visual styles 2023-02-28 17:22:17 +01:00
Alejandro Campos f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-02-28 16:11:46 +00:00
alejandro.campos@artica.es a1f172e713 several fixes 2023-02-28 17:06:31 +01:00
Jonathan f72ec5eb9d Fix html_print_label_input_block default id 2023-02-28 16:09:13 +01:00
Matias Didier 25413c7173 Merge branch 'ent-10235-anadir-mas-indices-al-modelo-de-datos-2' into 'develop' 
Added new indexes to mr and pandoradb

See merge request artica/pandorafms!5562
 2023-02-28 14:27:38 +00:00
Jonathan d5cd9a0ab2 SNMP browser action buttons 2023-02-28 15:26:42 +01:00
Matias Didier 9def6eb6d5 Merge branch 'ent-9047-vista-de-auditoria-mejoras-funcionales-y-esteticas' into 'develop' 
Ent 9047 vista de auditoria mejoras funcionales y esteticas

See merge request artica/pandorafms!5500
 2023-02-28 13:28:45 +00:00
Jonathan 78af41b700 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 14:27:24 +01:00
Jonathan 8d44bb7af1 Reporting view new style 2023-02-28 14:27:18 +01:00
Diego Muñoz-Reja 44cf59bfd3 Merge branch 'ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola' into 'develop' 
Ent 10253 enforcement de opciones de configuracion aviso en consola

See merge request artica/pandorafms!5499
 2023-02-28 12:27:54 +00:00
Matias Didier cccae56b8a Merge branch 'ent-9517-buscar-por-campos-avanzados-de-agente' into 'develop' 
Ent 9517 buscar por campos avanzados de agente

See merge request artica/pandorafms!5446
 2023-02-28 11:59:01 +00:00
Jose Gonzalez 825b937958 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 10:39:42 +01:00
Jose Gonzalez 114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
Matias Didier ad066b9e1a Merge branch 'ent-10559-no-deja-borrar-tareas-ipam-creadas-antes-de-los-cambios-del-ticket-10133' into 'develop' 
Ent 10559 no deja borrar tareas ipam creadas antes de los cambios del ticket 10133

See merge request artica/pandorafms!5568
 2023-02-28 09:04:50 +00:00
daniel b842d09240 fixed styles 2023-02-28 09:58:09 +01:00
Pablo Aragon 1d28762d22 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:50:50 +01:00
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
Daniel Cebrian 8a33756e3a #10324 added limit in modal title 2023-02-27 11:17:17 +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
Daniel Cebrian 08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00
Daniel Cebrian 4917b40d10 10324 fixed modal in filter title 2023-02-27 10:05:16 +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 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
Daniel Cebrian e76d8606dc #10324 added star in menu 2023-02-27 09:45:15 +01: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
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
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
daniel 3f572ab5f7 fixed styles 2023-02-24 14:19:56 +01:00
Daniel Cebrian 3dee690e42 #10324 added table tfavmenu_user in mr 2023-02-24 13:58:16 +01:00
Jose Gonzalez 47a433c312 Minor fix 2023-02-24 13:49:15 +01:00
daniel 5477fdbb6c Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 13:45:14 +01:00
daniel 65ed10be1a restyling 2023-02-24 13:43:34 +01:00
Jose Gonzalez 9e4b68c0d3 Fixed treeview alerts button 2023-02-24 13:43:10 +01:00
Jose Gonzalez 377d005800 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 13:38:05 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Daniel Cebrian 728991ad9a #10324 delete fav menu when delete element 2023-02-24 13:36:13 +01:00
Jonathan 967ac6dad3 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 13:21:05 +01:00
Jonathan 0a5571cd4d SNMP browser icons 2023-02-24 13:21:00 +01:00
daniel fcf380851b restyling 2023-02-24 13:09:03 +01:00
daniel 41f6ea0d6e restyling 2023-02-24 12:16:30 +01:00
Daniel Cebrian b367284d72 Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess' 
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
 2023-02-24 11:09:16 +00:00
Jose Gonzalez ec3e99e459 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 12:07:48 +01:00
Daniel Cebrian c7e53f5a1a #10259 resolve conflics 2023-02-24 12:07:37 +01:00
Jose Gonzalez 70216262a9 Minor fixes 2023-02-24 12:05:53 +01:00
Jonathan 84e3f11b7b Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 12:00:12 +01:00
Jonathan c56aac317a SNMP console view fix 2023-02-24 12:00:02 +01:00
Daniel Cebrian 651b605f55 #10324 added tfavmenu_user in database schema 2023-02-24 11:49:42 +01:00
Diego Muñoz-Reja 76dbaf46d2 Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop' 
Ent 10321 limitacion del numero de eventos

See merge request artica/pandorafms!5513
 2023-02-24 10:06:44 +00:00
Jose Gonzalez 29f21f5f7a Fix action_buttons height 2023-02-24 10:51:59 +01:00
daniel afbbb57a53 restyling 2023-02-24 10:48:30 +01:00
daniel 3575e199b0 restyling 2023-02-24 10:46:46 +01:00
Jose Gonzalez 6d8b3c9b66 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 10:37:06 +01:00
Jose Gonzalez 55c048b66f Change CSV icon 2023-02-24 10:36:53 +01:00
Jonathan 5e25f96c76 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 10:30:55 +01:00
Jonathan 4be8bbd9be SNMP trap generatos create view 2023-02-24 10:30:51 +01:00
Daniel Cebrian 032fcdeae4 #10324 added fav menu in reporting viewer 2023-02-24 10:23:14 +01:00
Jose Gonzalez d80dd284ab Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 10:20:11 +01:00
Jose Gonzalez 6a5c2c58c7 Fix tree view 2023-02-24 10:19:56 +01:00
daniel 6381aaa9a8 restyling 2023-02-24 10:18:52 +01:00
Pablo Aragon a28eb59ce0 10454-Fix filters 2023-02-24 10:06:32 +01:00
Pablo Aragon a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
Jonathan b8d0e9dda8 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 09:51:59 +01:00
Jonathan c4a0dc1934 SNMP views 2023-02-24 09:51:55 +01:00
artica 4fdd5296a0 Auto-updated build strings. 2023-02-24 01:02:05 +01:00
alejandro.campos@artica.es 25bfc49055 minor fix 2023-02-23 18:04:04 +01:00
daniel b34515d03c restyling 2023-02-23 17:57:48 +01:00
Jonathan 831579f9c8 Conflicto solution 2023-02-23 17:10:44 +01:00
Jonathan a09c423284 SNMP views fix 2023-02-23 17:09:58 +01:00
Jose Gonzalez 344261eafa Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 16:48:02 +01:00
Jose Gonzalez 65c2d09194 Icons added 2023-02-23 16:47:51 +01:00
daniel 1be0fb94b0 restyling 2023-02-23 16:30:18 +01:00
Jose Gonzalez fbca56500a TreeView minor fixes 2023-02-23 16:24:20 +01:00
daniel 929680eb17 restyling 2023-02-23 16:00:13 +01:00
daniel fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Jose Gonzalez f08fc6a8b7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 14:31:59 +01:00
Jose Gonzalez f45a777e5b Added save-load icons 2023-02-23 14:30:57 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
Calvo d1a3795acb Added new indexes to mr and pandoradb 2023-02-23 12:58:33 +01:00
daniel 598a1b1456 restyling 2023-02-23 12:34:41 +01:00
Daniel Cebrian d6645ee283 #10324 added fav menu in network map and visual console 2023-02-23 11:37:23 +01:00
Calvo dfa63378ff Unified event timestamp and utimestamp 2023-02-23 11:19:17 +01:00
Daniel Cebrian c0dcc03388 #10324 added system fav in visual console and modules 2023-02-23 11:00:46 +01:00
daniel e672ba141b restyling 2023-02-23 11:00:38 +01:00
Pablo Aragon c1342fb6a1 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 10:32:18 +01:00
Pablo Aragon c30dda1718 10519-New login meta 2023-02-23 10:32:01 +01:00
daniel ff9ee7a4f0 restyling 2023-02-23 10:24:03 +01:00
Jonathan 0fbf50673a Dashboard multiselect height + delete size modal 2023-02-23 10:11:35 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
artica 1babcb408d Auto-updated build strings. 2023-02-23 01:01:56 +01:00
Jose Gonzalez 6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Jose Gonzalez 0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
Matias Didier f371747619 Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop' 
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard

See merge request artica/pandorafms!5509
 2023-02-22 15:09:19 +00:00
Pablo Aragon ac4a76d653 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 15:02:14 +01:00
Pablo Aragon d414bb2600 10454-Fix event view - td styles 2023-02-22 15:02:08 +01:00
Jose Gonzalez 095caf6fa9 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 14:20:20 +01:00
Jose Gonzalez ec58cb4593 Plugins view 2023-02-22 14:19:57 +01:00
Pablo Aragon 1e384fd054 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 13:08:27 +01:00
Pablo Aragon 2081459556 10454-Fix event view 2023-02-22 13:08:15 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
Jose Gonzalez 370ee54d9f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 12:16:14 +01:00
Jose Gonzalez fd0c181820 Margin reversed 2023-02-22 12:16:04 +01:00
Jose Gonzalez bbde3e4181 Minor fixes 2023-02-22 12:15:17 +01:00
Daniel Cebrian 2980e180d8 Merge branch 'develop' into 'ent-10307-14480-anadir-informacion-del-usuario-al-poner-un-evento-in-process' 
# Conflicts:
#   pandora_console/include/functions_events.php
 2023-02-22 10:45:38 +00:00
Daniel Cebrian 3d5458ae46 #10302 fixed ack date 2023-02-22 11:36:09 +01:00
Matias Didier cbbb874d7b Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop' 
Ent 10416 no aplica los filtros de eventos desde servicio

See merge request artica/pandorafms!5551
 2023-02-22 10:36:00 +00:00
Matias Didier c8109dadd3 Merge branch 'ent-9523-derivado-del-trabajo-q-a-765-fe-de-errata-en-titulo-de-ventana-emergente-para-informacion-de' into 'develop' 
Ent 9523 derivado del trabajo q a 765 fe de errata en titulo de ventana emergente para informacion de

See merge request artica/pandorafms!5496
 2023-02-22 10:15:26 +00:00
alejandro.campos@artica.es 13186f23ba Merge remote-tracking branch 'origin/develop' into ent-10093-Activar-modo-mantenimiento-en-politicas-cuando-se-ejecuta-el-pandora-db 2023-02-22 11:08:27 +01:00
Pablo Aragon e7d6afd636 10488-Fix views reports 2023-02-22 10:35:33 +01:00
Pablo Aragon 95fb797a7e 10488-Fix views reports 2023-02-22 10:33:45 +01:00
alejandro.campos@artica.es 2a9494b48d fix conflicts 2023-02-22 10:10:59 +01:00
alejandro.campos@artica.es b76a4b1a48 fix conflicts 2023-02-22 10:10:14 +01:00
Jose Gonzalez 8df0c8a66d Fonts changed at Sancho request 2023-02-22 09:39:13 +01:00
Daniel Cebrian 2b7b49db20 #10493 fixed pagination in tags 2023-02-22 09:29:55 +01:00
Daniel Cebrian 2f1060af56 #10493 fixed pagination in collection 2023-02-22 09:05:27 +01:00
Jonathan 4d5891cd02 Select2 z-index for dialogs 2023-02-22 08:56:37 +01:00
Jonathan 28d964651f Modal report issue change email input style 2023-02-22 08:12:45 +01:00
Jonathan fe0bfbe9d6 Close mesage image fix 2023-02-22 08:08:11 +01:00
artica 53ca822779 Auto-updated build strings. 2023-02-22 01:02:03 +01:00
Jonathan 05c2232daa Modals dashboard view fix 2023-02-21 17:07:03 +01:00
Daniel Cebrian dfadbb0f80 #10493 added pagination in group module 2023-02-21 16:51:05 +01:00
Matias Didier 8b8414be52 Merge branch 'ent-10305-ultima-ejecucion-de-pandora-db-en-vista-about-da-53-anos-como-dato' into 'develop' 
Ent 10305 ultima ejecucion de pandora db en vista about da 53 anos como dato

See merge request artica/pandorafms!5501
 2023-02-21 15:31:31 +00:00
Daniel Cebrian f9c3524be8 #10493 fixed pagination in profiles 2023-02-21 16:05:24 +01:00
Daniel Cebrian 2b185b5754 #10493 fixed pagination in alerts 2023-02-21 15:44:41 +01:00
Jose Gonzalez 7a2cb912b2 Workaround for Status icon 2023-02-21 14:16:37 +01:00
Jose Gonzalez 1d566b4d18 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 14:15:05 +01:00
Jose Gonzalez 2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
Pablo Aragon 80818d7b6e 10489-Fix alerts edition and event response 2023-02-21 13:18:44 +01:00
Calvo 47bd0081ef Core: Fix and optimized lag calculaton. Console: optimized and unified queries with server 2023-02-21 12:56:26 +01:00
Pablo Aragon 57a6bf97b0 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-21 11:28:36 +01:00
Pablo Aragon 7ac794f5ff 10469-Fix omnishell view 2023-02-21 11:28:26 +01:00
Jonathan 005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Rafael Ameijeiras 776f0a69f5 Merge branch 'ent-10459-no-aplica-la-politica-de-contrasenas-en-el-cambio-de-password-usuario-admin' into 'develop' 
Draft: Ent 10459 no aplica la politica de contrasenas en el cambio de password usuario admin

See merge request artica/pandorafms!5549
 2023-02-21 09:03:33 +00:00
Rafael Ameijeiras 0fa39af4a9 Merge branch 'ent-10483-falla-el-csrf-en-login-despues-de-hacer-logout' into 'develop' 
Draft: Ent 10483 falla el csrf en login despues de hacer logout

See merge request artica/pandorafms!5550
 2023-02-21 09:02:40 +00:00