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 |
|
daniel
|
310ad88707
|
fixed styles
|
2023-03-02 19:25:31 +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 |
|
Jonathan
|
cef5c478e9
|
Graph viewer and graph template item editor visual
|
2023-03-02 17:17:10 +01: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 |
|
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
|
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
|
6c87ec3c99
|
fixed styles
|
2023-03-02 11:29:47 +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
|
fdab2cff8e
|
Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos
|
2023-03-02 08:26:53 +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 |
|
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 |
|
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
|
69d1bdd908
|
fixed styles
|
2023-03-01 13:44:01 +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 |
|
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 |
|
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 |
|
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
|
d5cd9a0ab2
|
SNMP browser action buttons
|
2023-02-28 15:26:42 +01: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 |
|
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 |
|
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 |
|
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 |
|
Pablo Aragon
|
936c9bcafb
|
10454-Events
|
2023-02-27 10:12:42 +01:00 |
|
Daniel Cebrian
|
08fb4e3396
|
#10324 fixed delete element in favmenu
|
2023-02-27 10:07:35 +01:00 |
|
Pablo Aragon
|
e024658520
|
10454-Events
|
2023-02-27 09:57:17 +01:00 |
|
daniel
|
35241e0d38
|
restyling
|
2023-02-27 09:55:29 +01:00 |
|
Daniel Cebrian
|
e76d8606dc
|
#10324 added star in menu
|
2023-02-27 09:45:15 +01:00 |
|
daniel
|
7602ec1bd8
|
fixed styles
|
2023-02-24 14:28:07 +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
|
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 |
|