Jose Gonzalez
|
6a35eb9950
|
Network map minor fixes
|
2023-03-06 11:12:59 +01:00 |
|
Jonathan
|
cf29caedcd
|
Conflict solution
|
2023-03-06 11:04:05 +01:00 |
|
Jose Gonzalez
|
c48ec28743
|
Minor fixes
|
2023-03-06 10:35:34 +01:00 |
|
Pablo Aragon
|
f77f635b8d
|
div>ul>li styles
|
2023-03-06 10:09:21 +01:00 |
|
Pablo Aragon
|
9c5203885e
|
IPAM
|
2023-03-06 09:23:30 +01:00 |
|
Jose Gonzalez
|
c13b77aea9
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-03-06 09:22:02 +01:00 |
|
Jose Gonzalez
|
7a2e929d3e
|
CSS styles for services
|
2023-03-06 09:21:48 +01:00 |
|
Rafael Ameijeiras
|
ec0d270078
|
Merge branch 'ent-10234-14931-codigo-generado-erroneamente-en-la-descarga-de-ficheros-de-colecciones-en-metaconsola' into 'develop'
Ent 10234 14931 codigo generado erroneamente en la descarga de ficheros de colecciones en metaconsola
See merge request artica/pandorafms!5485
|
2023-03-06 08:00:53 +00:00 |
|
Rafael Ameijeiras
|
03a7d9e89a
|
Merge branch 'ent-10230-AXITY-Vulnerabilidades-underscore-js' into 'develop'
updated underscore
See merge request artica/pandorafms!5570
|
2023-03-06 07:59:58 +00:00 |
|
Pablo Aragon
|
daf179f1f6
|
Conflit resolved
|
2023-03-06 08:32:28 +01:00 |
|
Pablo Aragon
|
6ae86b4c39
|
Sound events. Login SAML
|
2023-03-06 08:21:04 +01:00 |
|
daniel
|
f6e063b981
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/include/class/SnmpConsole.class.php
|
2023-03-06 08:09:29 +01:00 |
|
artica
|
15dd6e41ed
|
Auto-updated build strings.
|
2023-03-06 01:01:00 +01:00 |
|
Jimmy Olano
|
6b55c65330
|
Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS.
Ent 10092 14739 peticion de filtro en widget tree view
See merge request artica/pandorafms!5532
|
2023-03-05 22:56:35 +00:00 |
|
daniel
|
08dca1a83c
|
fixed styles
|
2023-03-05 13:46:27 +01:00 |
|
artica
|
f813af7397
|
Auto-updated build strings.
|
2023-03-05 01:01:11 +01:00 |
|
daniel
|
ff3b7001c3
|
fixed styles
|
2023-03-04 13:22:52 +01:00 |
|
artica
|
e4a2852be6
|
Auto-updated build strings.
|
2023-03-04 01:00:26 +01:00 |
|
Jimmy Olano
|
aea0aa3fb9
|
Merge branch 'ent-10282-desactivar-la-edicion-de-traps-en-la-version-open' into 'develop', JJOS.
Draft: Ent 10282 desactivar la edicion de traps en la version open
See merge request artica/pandorafms!5483
|
2023-03-03 14:00:40 +00:00 |
|
Jose Gonzalez
|
9ad97ee267
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-03-03 14:51:07 +01:00 |
|
Jose Gonzalez
|
6846961ff0
|
Icon updates
|
2023-03-03 14:50:47 +01:00 |
|
daniel
|
95df525cb2
|
fixed styles
|
2023-03-03 14:16:06 +01:00 |
|
Jose Gonzalez
|
df6dddb586
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-03-03 13:52:49 +01:00 |
|
Jose Gonzalez
|
128dc9c42c
|
Visual console changes
|
2023-03-03 13:52:28 +01:00 |
|
Daniel Cebrian
|
7562a9253a
|
#10347 refactoring and add link to events in graph
|
2023-03-03 13:13:49 +01:00 |
|
Pablo Aragon
|
f3b9d73855
|
Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones
|
2023-03-03 12:43:35 +01:00 |
|
Pablo Aragon
|
b18a689225
|
About meta and observer input password
|
2023-03-03 12:40:58 +01:00 |
|
Calvo
|
4b31bc340e
|
Fix code style
|
2023-03-03 11:50:21 +01:00 |
|
Daniel Maya
|
52b43410c7
|
Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha
|
2023-03-03 11:47:03 +01:00 |
|
Calvo
|
2386b87c1d
|
Functions servers lag query updated
|
2023-03-03 11:34:01 +01:00 |
|
Calvo
|
c5b98a30aa
|
Merge remote-tracking branch 'origin/develop' into ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole
|
2023-03-03 11:30:44 +01:00 |
|
Daniel Rodriguez
|
6f974508f0
|
Revert "Merge branch..."
This reverts merge request !5555
|
2023-03-03 10:11:35 +00:00 |
|
Daniel Maya
|
297a21c11d
|
Merge branch 'develop' into 'ent-9893-nuevo-sistema-de-ha'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-03-03 09:18:56 +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 |
|
Alejandro Campos
|
3ddb3c1034
|
Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
# pandora_console/extras/mr/62.sql
# pandora_console/pandoradb.sql
|
2023-03-03 08:12:57 +00: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 |
|
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 |
|