Commit Graph

26519 Commits

Author SHA1 Message Date
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
artica 490d3db086 Auto-updated build strings. 2023-02-21 01:01:52 +01:00
Jimmy Olano 016a4b7975 Merge branch 'ent-10267-limitar-bloque-de-pagina-en-la-vista-de-eventos' into 'develop'
Ent 10267 limitar bloque de pagina en la vista de eventos

See merge request artica/pandorafms!5484
2023-02-20 23:00:29 +00:00
Jose Gonzalez 13aa4e77f1 Fix minor issues 2023-02-20 17:49:02 +01:00
Jose Gonzalez 3ba9b752fe Clean unused items 2023-02-20 17:43:42 +01:00
Jose Gonzalez 82ab2af20a Fix header title and subtitle 2023-02-20 17:26:58 +01:00
Jose Gonzalez 7a1d7f9087 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 17:23:01 +01:00
Jose Gonzalez 91393d7ce5 Ticket 10431 Header icons added 2023-02-20 17:22:42 +01:00
Jimmy Olano 34f66ae6f8 Merge branch 'ent-10283-arreglar-layout-de-filtro-de-la-vista-de-consola-de-traps' into 'develop'
Ent 10283 arreglar layout de filtro de la vista de consola de traps

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10283

See merge request artica/pandorafms!5495
2023-02-20 16:11:29 +00:00
Daniel Maya a615d2d98f #9662 minor fixed 2023-02-20 17:08:36 +01:00
Daniel Maya c6e32e278b #9662 fixed favourites 2023-02-20 16:41:54 +01:00
Rafael Ameijeiras 8d13e873cc Merge branch 'ent-10217-disable-admin-s-account-via-cross-site-request-forgery' into 'develop'
Ent 10217 disable admin s account via cross site request forgery

See merge request artica/pandorafms!5503
2023-02-20 15:03:42 +00:00
Jonathan 934851ae4e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 15:58:52 +01:00
Jonathan fc68e6ead1 Monitor view meta fix status 2023-02-20 15:58:41 +01:00
Jose Gonzalez 49fc725cdc Cog animations 2023-02-20 15:16:27 +01:00
Jimmy Olano 30604d50a6 Merge branch 'ent-10296-anadir-hora-del-servidor-live-en-general-setup-de-la-consola' into 'develop'
Ent 10296 anadir hora del servidor live en general setup de la consola

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10296

See merge request artica/pandorafms!5515
2023-02-20 13:56:55 +00:00
Jose Gonzalez 6808fb0655 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 14:50:33 +01:00
Jose Gonzalez 8f21229246 Ticket 10467 Improve External Tools view 2023-02-20 14:50:17 +01:00
Jonathan 4bbf750944 Monitor view meta fix 2023-02-20 14:35:32 +01:00
Daniel Cebrian f67bf4d084 #10416 added name agent in filter event 2023-02-20 13:10:00 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Jose Gonzalez 98bd383141 Minor html and ui improvements 2023-02-20 11:49:54 +01:00
Jose Gonzalez 5ae99154bb Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 11:48:12 +01:00
Jose Gonzalez 47c2b62029 Improve login page 2023-02-20 11:47:56 +01:00
Jose Gonzalez 333a93fad2 Added MR 2023-02-20 11:45:59 +01:00
Pablo Aragon e95e6acd0c 9662-Fix double authentication login 2023-02-20 11:27:20 +01:00
Pablo Aragon fd77ee1a14 9662-Fix double authentication login 2023-02-20 11:16:07 +01:00
Pablo Aragon bf307adb01 10483-Fixed csrf token on login after logout 2023-02-20 10:47:00 +01:00
Daniel Cebrian 1d0046b3c1 #10459 activate Apply password policy to admin users default by default 2023-02-20 10:07:10 +01:00
Pablo Aragon 4e6937accb Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 09:54:56 +01:00
Pablo Aragon 4ee6cf7e28 9662-Fix login meta 2023-02-20 09:54:48 +01:00
Daniel Cebrian 8a4fe45891 #9073 added tables in schema sql installation 2023-02-20 08:59:11 +01:00
Jonathan 521f7ad0ce Menu go to images correction 2023-02-20 08:57:04 +01:00
artica c24bf70cc2 Auto-updated build strings. 2023-02-20 01:01:37 +01:00
artica 5a56dc0121 Auto-updated build strings. 2023-02-19 01:02:04 +01:00
artica 8db5ef0789 Auto-updated build strings. 2023-02-18 01:01:14 +01:00
Jose Gonzalez 69f08cc027 Ticket 10460 Improve menu buttons 2023-02-17 14:44:26 +01:00
Jose Gonzalez b0ee4a203a Ticket 10470 Agent improvements bis 2023-02-17 14:26:41 +01:00
Daniel Cebrian ace67ba42d #9073 fixed bug when modal close 2023-02-17 14:22:41 +01:00
Jose Gonzalez c1f8510563 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 14:21:49 +01:00
Jose Gonzalez a1bf42c9f9 Ticket 10470 Agent improvements 2023-02-17 14:21:29 +01:00
Daniel Cebrian 864d54ee88 #9073 fixed filter title 2023-02-17 14:15:16 +01:00
Jose Gonzalez 8a5a25cd65 Ticket 10452 Status monitor view improve 2023-02-17 13:35:42 +01:00
Daniel Cebrian 35a1a67006 #9073 refactoring 2023-02-17 12:53:35 +01:00
Pablo Aragon 46a4ee9af2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 12:53:12 +01:00
Pablo Aragon a065f4578c 9662-Login 2023-02-17 12:52:13 +01:00
Jonathan e6eed5e471 fix visual module graph and monitor details more details 2023-02-17 11:54:48 +01:00
Daniel Cebrian 9a0dc247c0 #9073 added preview tip 2023-02-17 11:07:28 +01:00
Daniel Maya 320b87b77e menu bug fixes 2023-02-17 10:10:47 +01:00
artica 4962c0e769 Auto-updated build strings. 2023-02-17 01:01:21 +01:00
Daniel Cebrian 0cee40e40a #9073 create button for preview tip 2023-02-16 18:13:34 +01:00
Jonathan 6c73ffddb3 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-16 16:35:24 +01:00
Jonathan 64f79b87c9 Event OS bug image 2023-02-16 16:35:13 +01:00
Daniel Cebrian dce5b07109 #9073 added control image and fixed bug with language filter 2023-02-16 16:14:50 +01:00
Jose Gonzalez f838ca390d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-16 16:08:27 +01:00
Jose Gonzalez 98d5500728 Minor style changes 2023-02-16 16:08:15 +01:00
Jonathan b8432a8a55 Search go to icons 2023-02-16 15:03:45 +01:00
Jose Gonzalez e6c55ad913 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-16 14:37:53 +01:00
Jose Gonzalez 1520b8c62f Menu improvements 2023-02-16 14:37:30 +01:00
Daniel Cebrian 63a23799a4 #9073 fixed image size 2023-02-16 14:17:05 +01:00
Jonathan ca39b4a4ce Conflict solution 2023-02-16 13:27:11 +01:00
Jonathan ce45469f83 Fix setup visual bugs 2023-02-16 13:16:31 +01:00
Daniel Cebrian e0b75f9829 #9073 added system profiles in tips 2023-02-16 13:14:59 +01:00
Jose Gonzalez 29ed8be0d2 Minor fix 2023-02-16 12:59:23 +01:00
Jose Gonzalez 5dc8e19d6d Include Api Token and QR code mockup 2023-02-16 12:44:11 +01:00
Jose Gonzalez d8230dba94 Minor change in buttons 2023-02-16 12:35:02 +01:00
Jonathan 041ce5d5e8 Manage Agents delete and create required "primary group" 2023-02-16 10:59:45 +01:00
artica 09d0415654 Updated version and build strings. 2023-02-16 10:36:23 +01:00
Matias Didier c6f6a6b9d3 Merge branch 'ent-10410-Carga-muy-lenta-de-comentarios-de-eventos-en-tyr-saga' into 'develop'
fixed comment loading in event dialog

See merge request artica/pandorafms!5543
2023-02-16 09:34:35 +00:00
Daniel Rodriguez ef6059ed1e Merge branch 'ent-10432-actualizacion-traducciones' into 'develop'
Ent 10432 actualizacion traducciones

See merge request artica/pandorafms!5542
2023-02-16 08:46:15 +00:00
Jonathan f557309238 Button ok mesage too much agents 2023-02-16 09:09:40 +01:00
Jose Gonzalez 21a4a4ced8 Edit user fix 2023-02-16 07:44:41 +01:00
Jose Gonzalez e42c4575d5 Double authentication active 2023-02-16 07:25:26 +01:00
artica 204480bca1 Auto-updated build strings. 2023-02-16 01:02:18 +01:00
alejandro.campos@artica.es 5c57954b50 fixed comment loading in event dialog 2023-02-15 19:38:57 +01:00
Daniel Cebrian d8cfc68585 #9073 order by language tips 2023-02-15 17:51:30 +01:00
Daniel Cebrian 8ea9a0fc7e #9073 added system system for edit images in edit tip 2023-02-15 16:41:14 +01:00
Jose Gonzalez 1de571fa66 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-15 16:29:02 +01:00
Jose Gonzalez 8673ea57b1 Fix issues with view button in setup view 2023-02-15 16:28:40 +01:00
Jonathan 4a9aae77da Fix style on meta visual console 2023-02-15 16:17:23 +01:00
Daniel Rodriguez 10d275c2a5 Merge branch 'ent-10428-carga-por-defecto-en-vista-de-monitores' into 'develop'
Fix showing all modules on monitors view on firt load

See merge request artica/pandorafms!5541
2023-02-15 15:04:30 +00:00
Diego Muñoz-Reja e34677e5f6 Merge branch 'ent-10195-offset-de-mapas' into 'develop'
Ent 10195 offset de mapas

See merge request artica/pandorafms!5539
2023-02-15 14:34:17 +00:00
Jonathan fa4d686f4f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-15 15:31:04 +01:00
Jonathan 7b759ce0c2 Icons menu for firefox explorer 2023-02-15 15:30:21 +01:00
Daniel Cebrian c92c355a3e #9073 added uniqid in image 2023-02-15 15:18:41 +01:00
Daniel Cebrian 1b82af24e8 #9073 added view edit tip 2023-02-15 15:14:17 +01:00
Daniel Maya 18ac39f2c4 #10432 translation updates 2023-02-15 15:05:17 +01:00
Jose Gonzalez 38dbec8618 Fix Firefox bug 2023-02-15 14:45:28 +01:00
Calvo 70291758c8 Fix showing all modules on monitors view on firt load 2023-02-15 14:25:43 +01:00
Diego Muñoz-Reja 472ffdf443 Merge branch 'ent-10118-creacion-de-mapas-de-red' into 'develop'
Ent 10118 creacion de mapas de red

See merge request artica/pandorafms!5531
2023-02-15 12:55:43 +00:00
Jose Gonzalez 4a535b14a2 Fully integrated principal action-buttons 2023-02-15 13:43:42 +01:00
Daniel Maya 845a2d08c3 #10118 Changed id_group 2 2023-02-15 13:42:19 +01:00
Daniel Cebrian 35e1e46a31 #9073 added delete tip 2023-02-15 13:11:02 +01:00
Jose Gonzalez 2d52327285 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-15 12:51:54 +01:00
Jose Gonzalez 1b174f9cd4 Ticket 10412 Reporting builder fix 2023-02-15 12:49:31 +01:00
Jose Gonzalez e539fa9697 Minor HTML input checkbox fix 2023-02-15 12:48:41 +01:00
Daniel Cebrian 09d703f981 #9073 added images input in create tips 2023-02-15 11:58:34 +01:00
Daniel Maya f141436e42 #10118 Changed id_group 2023-02-15 11:56:29 +01:00
Pablo Aragon 0125ba742b 9680-Create widget ModulesByStatus 2023-02-15 11:42:50 +01:00
Pablo Aragon 87c3bee756 9666-New widget Event cardboard 2023-02-15 11:23:36 +01:00
Jonathan 7622e02c2e Login button fix style 2023-02-15 10:50:30 +01:00