2616 Commits

Author SHA1 Message Date
Jose Gonzalez
bab3248d57 Monitor view with not normal at start 2023-03-15 08:56:15 +01:00
Daniel Cebrian
e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
daniel
c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Pablo Aragon
2215097100 Manage agent, modules 2023-03-13 17:39:58 +01:00
Daniel Cebrian
90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Jose Gonzalez
c2ba5cfdd3 Agent status 2023-03-13 16:21:14 +01:00
Jose Gonzalez
a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Daniel Cebrian
bdeb2240f3 10324 refactor duplicity code 2023-03-13 13:01:48 +01:00
Daniel Cebrian
339d7e8bfe #10324 fixed error 500 2023-03-13 12:57:09 +01:00
daniel
0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Daniel Cebrian
dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
Jose Gonzalez
d449179765 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-11 02:10:23 +01:00
Jose Gonzalez
39ace10629 Fix image issue with Networkmap 2023-03-11 02:08:37 +01:00
Calvo
e2297171cb Process inventory modules with correct xml and empty data 2023-03-10 15:14:43 +01:00
daniel
8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
Pablo Aragon
427ecf96e4 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 13:03:35 +01:00
Pablo Aragon
ceed3c5d51 Alert details validation 2023-03-10 13:02:23 +01:00
daniel
3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
daniel
6d0b0039c5 fixed styles 2023-03-09 19:25:14 +01:00
Jose Gonzalez
ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
daniel
63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
Daniel Cebrian
3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Jose Gonzalez
4af67db415 Export data view 2023-03-07 18:10:07 +01:00
Jose Gonzalez
f7aab35082 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:59:51 +01:00
Jose Gonzalez
226b80b7c7 Icon revision 2023-03-07 15:59:10 +01:00
Daniel Maya
6b9175ea0d Merge branch 'develop' into ent-9662-second-round 2023-03-07 15:05:28 +01:00
Daniel Cebrian
fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
daniel
1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Jose Gonzalez
44fb762fdf Minor fixes with graphs 2023-03-06 15:44:32 +01:00
daniel
08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
daniel
95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
Daniel Cebrian
00b5d3f237 #1347 added links tactical view group 2023-03-03 13:24:33 +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
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
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
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
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
alejandro.campos@artica.es
36cfcc3c2f error fix 2023-03-01 14:19:35 +01:00
daniel
774b32d7a0 fixed styles 2023-03-01 13:54:22 +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
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
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
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
daniel
f38adff73a fixed styles 2023-02-27 18:05:51 +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
daniel
12212fff02 restyling 2023-02-27 13:41:44 +01:00