1528 Commits

Author SHA1 Message Date
miguel angel rasteu
d6363d37b7 #12684 Fix tree view filter 2023-12-26 13:22:24 +01:00
Rafael Ameijeiras
5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop'
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
2023-12-21 12:00:44 +00:00
Jonathan
158a52a1ce #12398 fix url 2023-12-21 12:36:54 +01:00
Diego Muñoz-Reja
6114c6a37a Merge branch 'ent-12236-varios-bugs-en-modulos-predictivos-de-politica' into 'develop'
Policy capacity planning modules. JS errors

See merge request artica/pandorafms!6650
2023-12-21 10:57:42 +00:00
Rafael Ameijeiras
8658dbc938 Merge branch 'ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center' into 'develop'
fix error js load modal filter sound events pandora_enterprise#12607

See merge request artica/pandorafms!6739
2023-12-20 10:21:51 +00:00
Calvo
421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Calvo
e41dc13ac2 WIP: Policy synthetic op: Creating modules 2023-12-19 18:37:49 +01:00
Daniel Rodriguez
d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
implement demo data feature

See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
daniel
d57f0971b6 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center
Conflicts:
	pandora_console/include/javascript/pandora.js
2023-12-19 14:41:12 +01:00
Enrique Martin
321a0075f9 Fixed report custom graph search 2023-12-18 16:12:08 +01:00
Alejandro Campos
c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-18 10:54:27 +00:00
Daniel Cebrian
8df792f11b #12571 custom graphs refactored 2023-12-15 10:41:21 +01:00
daniel
9e3c17bf2c Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-14 16:32:33 +01:00
daniel
ea97bb8f60 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-14 13:27:03 +01:00
Diego Muñoz-Reja
60a2557878 Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop'
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion

See merge request artica/pandorafms!6451
2023-12-14 11:19:25 +00:00
daniel
2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-14 11:05:29 +01:00
daniel
af99c10b19 fix events sound pandora_enterprise#12607 2023-12-13 13:03:58 +01:00
daniel
f4d2a40f13 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-13 10:58:57 +01:00
daniel
cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-13 10:39:48 +01:00
Jonathan
c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
Daniel Cebrian
276cf73e49 #12575 fixed order columns in dashboard 2023-12-12 10:23:47 +01:00
miguel angel rasteu
fec7bf8b90 Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed 2023-12-12 09:45:36 +01:00
Enrique Martin
9f98710248 Set default agents to create 2023-12-11 12:15:53 +01:00
Enrique Martin
93293f41ef Removed debug default agents to create value 2023-12-11 12:14:19 +01:00
Enrique Martin
00a0fa8eae Fixed reports generation 2023-12-11 11:53:46 +01:00
Enrique Martin
5a5674f3b4 Set default agents to create to 30 2023-12-11 10:33:03 +01:00
miguel angel rasteu
d034116dd3 #11495 Fix report 2023-12-11 09:26:57 +01:00
Alejandro Campos
0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es
cfc1992d26 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:58 +01:00
alejandro.campos@artica.es
9622b61557 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:40 +01:00
Enrique Martin
2d1b2bf6d2 Added new dashboard widgets 2023-12-05 12:11:25 +01:00
alejandro.campos@artica.es
e7f18709b7 optimization 2023-12-05 12:07:23 +01:00
daniel
34784752b7 fix error js load modal filter sound events pandora_enterprise#12607 2023-12-05 11:47:37 +01:00
daniel
1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
alejandro.campos@artica.es
c9c3426b16 minor change 2023-12-05 08:30:00 +01:00
daniel
77cf0ce6ca Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-05 08:02:55 +01:00
Enrique Martin
e833499dc3 Improvements, fixes and new demo elements 2023-12-04 16:58:08 +01:00
daniel
8a92b39eee add new filters widget modules status pandora_enterprise#12267 2023-12-04 11:59:31 +01:00
alejandro.campos@artica.es
4a64f023fe Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-04 11:37:41 +01:00
alejandro.campos@artica.es
75ddb3b934 minor changes in demo data functionality 2023-12-04 11:37:12 +01:00
Enrique Martin
55aee67df3 Added GIS maps creation 2023-12-03 23:23:57 +01:00
Enrique Martin
b14c77862e Added new items to visual consoles 2023-12-03 21:43:00 +01:00
Enrique Martin
14fc8ef2b1 Added new items to visual consoles and fixed unknown modules on creation 2023-12-03 21:30:17 +01:00
miguel angel rasteu
5ee6eb7306 #12052 Resolve conflicts 2023-12-01 10:19:39 +01:00
alejandro.campos@artica.es
cb60581bcf Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-01 09:49:37 +01:00
alejandro.campos@artica.es
d6e107ea95 performance improvement 2023-12-01 09:48:45 +01:00
Daniel Rodriguez
39c6420d2c Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop'
Ent 11763 15982 regex en busqueda de eventos

See merge request artica/pandorafms!6512
2023-12-01 08:44:46 +00:00
Enrique Martin
3807baa8ef Added GIS random data to agents 2023-11-30 17:41:01 +01:00
Matias Didier
8cfb0353dd Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop'
fix sound alerts severity filter pandora_enterprise#12378

See merge request artica/pandorafms!6663
2023-11-30 11:41:30 +00:00
Rafael Ameijeiras
c60c75475b Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop'
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro

See merge request artica/pandorafms!6523
2023-11-30 09:23:16 +00:00