33601 Commits

Author SHA1 Message Date
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
00b5d3f237 #1347 added links tactical view group 2023-03-03 13:24:33 +01:00
Daniel Cebrian
7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
alejandro.campos@artica.es
6cee279de7 fixed entities 2023-03-03 12:49:54 +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
Jonathan
5d73f96823 Graphs template wizard visual change 2023-03-03 12:41:32 +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
4b773671a9 #9893 changed mr 2 2023-03-03 11:49:25 +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
Calvo
5fb43198ea Fix quores error 2023-03-03 11:22:39 +01:00
slerena
970c8e4830 Updated "DB First installed", this field was intented to be used on changes of major versions, not used anymore, but doesn't have amy sense to keepit in 6.x 2023-03-03 10:14:43 +00:00
Daniel Rodriguez
d1e8ee3308 Merge branch 'revert-cce6e2d2' into 'develop'
Revert "Merge branch..."

See merge request artica/pandorafms!5576
2023-03-03 10:12:41 +00:00
slerena
88ce83b9ac Updated some dates and notices. Updated database schema version / build (build should be modified in each release) 2023-03-03 10:12:31 +00:00
Daniel Rodriguez
6f974508f0 Revert "Merge branch..."
This reverts merge request !5555
2023-03-03 10:11:35 +00:00
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
Daniel Maya
62673d8292 #9893 changed mr 2023-03-03 10:26:21 +01: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
Daniel Maya
b5ea1c5868 #9893 Added mr 2023-03-03 10:15:02 +01: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
Daniel Rodriguez
0a16fbbecf Merge branch 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' into 'develop'
implemented agents view filter management

See merge request artica/pandorafms!5457
2023-03-02 17:21:13 +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