da1c74e9db
#12751 fixed path with spaces and vul
2024-02-02 14:04:37 +01:00
67bbaa311c
Merge branch 'ent-12824-no-se-pueden-crear-agentes-manualmente-en-develop-775' into 'develop'
...
Ent 12824 No se pueden crear agentes manualmente en develop (775)
See merge request artica/pandorafms!6899
2024-02-01 16:37:10 +00:00
83e6ad429d
Merge branch 'ent-12794-no-se-puede-cambiar-pass-de-users-locales-con-autenticacion-externa' into 'develop'
...
Ent 12794 No se puede cambiar pass de users locales con autenticación externa
See merge request artica/pandorafms!6896
2024-02-01 15:07:33 +00:00
9b57534f2a
#12751 fixed vul
2024-02-01 11:41:19 +01:00
688f235c6b
#12687 Fixed export with json_ref 2
2024-02-01 10:48:34 +01:00
5feb11c547
9992 added email test dialog in metaconsole
2024-01-31 16:34:25 +01:00
b026a248e3
#12805 ipam change permisions AW/PM
2024-01-31 15:40:44 +01:00
8bf3794072
#12824 fixed create agent view
2024-01-31 15:02:20 +01:00
60d2733066
#12794 fixed login when user use external login
2024-01-30 18:22:20 +01:00
1882c7a624
#12833 fixed critical value in bulk operation
2024-01-30 17:58:41 +01:00
a83577d1a8
#12687 Added import/export prd 4
2024-01-30 17:34:37 +01:00
f68615cba0
#12460 fixed deprecated
2024-01-30 17:00:38 +01:00
5b7a123086
Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache
2024-01-30 13:21:44 +01:00
c0ad547625
#12460 fixed deprecated
2024-01-30 13:14:54 +01:00
c008aee180
#12815 modules search space entity
2024-01-30 12:01:20 +01:00
e07d89883f
#12687 Added import/export prd 3
2024-01-29 17:38:01 +01:00
3db0090c0e
Merge branch 'ent-12351-16497-Mejoras-Ampliacion-de-los-informes-monitorizacion-Netflow-Top-N-Connection' into 'develop'
...
implement several changes in top-n connection report item
See merge request artica/pandorafms!6833
2024-01-29 11:14:58 +00:00
8bb2b46c48
Merge branch 'ent-12568-Falta-la-opcion-de-escoger-Exec-server-en-la-configuracion-de-Event-response' into 'develop'
...
fix missing fields
See merge request artica/pandorafms!6766
2024-01-29 09:32:50 +00:00
2ba5dd767d
visual changes in demo view
2024-01-26 12:41:32 +01:00
31312eaa53
visual fix
2024-01-25 17:19:05 +01:00
cdd9af5108
#11799 hide interval for broker agents
2024-01-25 15:25:08 +01:00
874bd04aa8
#11799 hide interval for broker agents
2024-01-25 15:23:48 +01:00
e19f520eb0
Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop'
...
Ent 12522 Mejoras en audit log
See merge request artica/pandorafms!6816
2024-01-25 14:00:56 +00:00
574db2befe
Merge branch 'ent-12128-en-alert-details-no-se-muestra-el-nombre-de-la-accion-correspondiente-a-la-alerta-al-usar' into 'develop'
...
Ent 12128 en alert details no se muestra el nombre de la accion correspondiente a la alerta al usar
See merge request artica/pandorafms!6802
2024-01-25 13:57:05 +00:00
fd8d233cf8
#12460 fixed deprecated
2024-01-24 13:28:43 +01:00
401b1973be
#12687 Added import/export prd 2
2024-01-24 12:15:16 +01:00
fbb5d349a2
Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache
2024-01-24 11:58:00 +01:00
6352243e64
Merge branch 'ent-12386-16541-Implementar-autorefresh-en-la-vista-de-modulos-del-agente' into 'develop'
...
add autorefresh to agent view
See merge request artica/pandorafms!6786
2024-01-23 14:22:22 +00:00
e47b8eb364
Merge branch 'ent-12323-campo-para-configurar-rotado-de-netflow_interval' into 'develop'
...
Ent 12323 Campo para configurar rotado de netflow_interval
See merge request artica/pandorafms!6824
2024-01-23 12:51:28 +00:00
1cce0a3cea
Merge branch 'ent-12777-export-qr-mete-html-encoding' into 'develop'
...
Ent 12777 export qr mete html encoding
See merge request artica/pandorafms!6865
2024-01-23 11:23:33 +00:00
c5f94a203e
Merge branch 'ent-12693-bug-al-editar-inventario-remoto' into 'develop'
...
Ent 12693 bug al editar inventario remoto
See merge request artica/pandorafms!6863
2024-01-23 07:22:16 +00:00
b14825b2b3
Merge branch 'ent-12734-perdida-de-agente-al-actualizar-gis-map' into 'develop'
...
Ent 12734 perdida de agente al actualizar gis map
See merge request artica/pandorafms!6839
2024-01-23 07:21:50 +00:00
95f8519d5d
#12687 Added import/export prd
2024-01-22 17:22:23 +01:00
a747308b26
#12636 fix errors
2024-01-22 16:21:51 +01:00
23c33a73f6
Merge branch 'ent-12299-al-borrar-un-agente-por-masivas-en-meta-no-se-borra-el-md5-y-el-conf' into 'develop'
...
remove agents bulk operation pandora_enterprise#12299
See merge request artica/pandorafms!6749
2024-01-22 14:34:29 +00:00
d504267460
Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache
2024-01-22 15:18:01 +01:00
29207ed367
#12617 add class correct colum
2024-01-22 12:59:11 +01:00
f43279acc3
#12777 qr name remove entities
2024-01-22 09:27:02 +01:00
5ece13fc9f
#11086 fixed acl in extensions view
2024-01-19 14:05:20 +01:00
d36ec9a8c0
#12693 add filter id_agente
2024-01-19 10:18:38 +01:00
0c73dab521
Merge branch 'ent-12366-bug-al-asignar-5-o-mas-perfiles-a-un-usuario' into 'develop'
...
Ent 12366 bug al asignar 5 o mas perfiles a un usuario
See merge request artica/pandorafms!6771
2024-01-19 08:36:45 +00:00
2baef1ccf2
Merge branch 'ent-12553-correccion-de-erratas' into 'develop'
...
Ent 12553 Corrección de erratas
See merge request artica/pandorafms!6817
2024-01-19 08:23:35 +00:00
23c63e2c3f
Merge branch 'ent-12674-selectores-sin-accion-en-custom-graphs' into 'develop'
...
Ent 12674 selectores sin accion en custom graphs
See merge request artica/pandorafms!6798
2024-01-19 08:21:43 +00:00
5afa5c36c0
Merge branch 'ent-12598-16733-Filtro-de-eventos-borrado-y-asignado-como-favorito-permanece-en-la-seccion' into 'develop'
...
Ent 12598 16733 filtro de eventos borrado y asignado como favorito permanece en la seccion
See merge request artica/pandorafms!6736
2024-01-19 08:20:47 +00:00
49487c0960
Merge branch 'ent-12577-Error-visual-de-los-contenedores-de-opciones-avanzadas-de-modulos-Dynamic-Threshold-FF-threshold-y-Cron-from' into 'develop'
...
Ent 12577 error visual de los contenedores de opciones avanzadas de modulos dynamic threshold ff threshold y cron from
See merge request artica/pandorafms!6743
2024-01-19 08:20:07 +00:00
4705aefb83
Merge branch 'ent-12692-anadir-informacion-i-al-token-event-storm-protection-del-setup-para-evitar-confusiones' into 'develop'
...
Ent 12692 anadir informacion i al token event storm protection del setup para evitar confusiones
See merge request artica/pandorafms!6819
2024-01-19 08:19:48 +00:00
838d68d5e4
Merge branch 'ent-12733-faltan-los-botones-de-accion-de-los-filtros-de-eventos' into 'develop'
...
Ent 12733 faltan los botones de accion de los filtros de eventos
See merge request artica/pandorafms!6836
2024-01-19 08:19:15 +00:00
e4c30eaeb6
Merge branch 'ent-12501-varios-errores-en-los-campos-personalizados-por-consola-web' into 'develop'
...
Ent 12501 varios errores en los campos personalizados por consola web
See merge request artica/pandorafms!6723
2024-01-19 08:18:53 +00:00
2dad4fcf0b
Merge branch 'ent-12435-metaconsola-external-links-recorta-enlaces-muy-largos' into 'develop'
...
Ent 12435 metaconsola external links recorta enlaces muy largos
See merge request artica/pandorafms!6775
2024-01-18 12:57:53 +00:00
04478bbdfb
Merge branch 'ent-12503-cambio-visual-del-boton-unique-ip-de-la-config-de-agentes' into 'develop'
...
Ent 12503 Cambio Visual del Botón Unique IP de la Config de Agentes
See merge request artica/pandorafms!6820
2024-01-18 12:57:08 +00:00
d98c264640
Merge branch 'ent-11900-16100-contador-de-items-en-distintas-vistas' into 'develop'
...
Ent 11900 16100 contador de items en distintas vistas
See merge request artica/pandorafms!6792
2024-01-18 12:53:43 +00:00
3d1492b6a3
Merge branch 'develop' into ent-12435-metaconsola-external-links-recorta-enlaces-muy-largos
2024-01-18 13:50:27 +01:00
d1855569dc
Merge branch 'ent-12571-arreglar-interfaz-de-definicion-de-graficas-combinadas' into 'develop'
...
Ent 12571 Arreglar interfaz de definicion de graficas combinadas
See merge request artica/pandorafms!6767
2024-01-18 11:32:59 +00:00
1f64fb6115
Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop'
...
Ent 12320 wizard de bienvenida mas molon visualmente
See merge request artica/pandorafms!6842
2024-01-18 11:16:08 +00:00
e7ee0ef6b8
Merge branch 'ent-12747-Home-Screen-no-actualiza-en-nodo-cuando-mergeamos-nodo-y-meta-2' into 'develop'
...
fix home screen
See merge request artica/pandorafms!6850
2024-01-18 11:13:04 +00:00
2b839149fd
Merge branch 'ent-12419-solicitud-de-cambio-de-longitud-maxima-del-campo-external-link' into 'develop'
...
Ent 12419 Solicitud de cambio de longitud máxima del campo External Link
See merge request artica/pandorafms!6821
2024-01-18 11:10:05 +00:00
7d1e06ce30
#12571 resolve conflics
2024-01-18 10:39:07 +01:00
1201da4b50
Merge branch 'ent-12402-multiselector-roto-en-Components-groups' into 'develop'
...
Ent 12402 multiselector roto en components groups
See merge request artica/pandorafms!6774
2024-01-18 08:39:26 +00:00
78652c0009
Merge branch 'ent-12192-enlace-a-pandora-itsm-en-idioma-espanol' into 'develop'
...
Ent 12192 enlace a pandora itsm en idioma espanol
See merge request artica/pandorafms!6558
2024-01-18 08:36:38 +00:00
947f6511d5
Merge branch 'ent-12569-boton-para-agregar-item-en-credential-boxes-no-hace-nada' into 'develop'
...
Ent 12569 Botón para agregar item en Credential boxes no hace nada
See merge request artica/pandorafms!6728
2024-01-18 08:14:30 +00:00
bb2d908de7
#12460 fixed deprecated log
2024-01-17 12:25:57 +01:00
f52700f392
fix home screen
2024-01-15 17:42:41 +01:00
0b18397095
#12503 fixed empty all_ip in create agent
2024-01-15 09:19:37 +01:00
40d1efac11
12320-Welcome wizard new styles, fix in Configuration->Configuration Wizard
2024-01-11 11:39:14 +01:00
034b9805cc
#12734 Fixed visible
2024-01-10 11:17:46 +01:00
6bb619fb62
#12733 fix delete button
2024-01-09 16:47:53 +01:00
9a7ef16f9c
implement several changes in top-n connection report item
2024-01-08 17:31:52 +01:00
72d34ef99b
#12435 fix conflict merge develop
2024-01-08 13:14:07 +01:00
706426471e
#12366 fix for spaces on users
2024-01-08 10:57:32 +01:00
110d7f4842
#12323 added netflow interval select
2024-01-02 12:57:02 +01:00
3044ef4823
#12419 fixed external url and changed size field
2024-01-02 10:26:36 +01:00
0627ea07cd
#12503 changed unique ip in agent
2023-12-29 13:43:28 +01:00
87f1346ee1
#12692 Add help tip in Event storm protection token
2023-12-29 09:58:20 +01:00
5b4531e74f
#12553 fixed titles
2023-12-27 17:10:11 +01:00
05ec992fac
#12522 enhanced audit log
2023-12-27 16:05:34 +01:00
c4b6183074
Merge branch 'ent-11951-anadir-nombre-de-servidor-en-la-lista-de-servidores' into 'develop'
...
Fix servers name
See merge request artica/pandorafms!6794
2023-12-21 15:16:13 +00:00
a0ad52b75f
#12128 action alert no show when empty
2023-12-21 13:13:31 +01:00
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
87cfc51793
#12674 fix sort custom reports
2023-12-20 17:19:18 +01:00
ca33be4495
Fix servers name
2023-12-20 11:58:31 +01:00
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
e41dc13ac2
WIP: Policy synthetic op: Creating modules
2023-12-19 18:37:49 +01:00
d68daca985
#11900 counter items
2023-12-19 16:50:36 +01:00
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
855fc32a7d
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/include/javascript/pandora.js
pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
8cc159f19f
Merge branch 'ent-12665-error-500-al-crear-un-custom-graph' into 'develop'
...
fix rerors selectors pandora_enterprise#12665
See merge request artica/pandorafms!6788
2023-12-19 07:57:28 +00:00
a4eed65758
Merge branch 'ent-12200-huevo-de-pascua-efecto-nieve' into 'develop'
...
Ent 12200 huevo de pascua efecto nieve
See merge request artica/pandorafms!6675
2023-12-19 07:56:55 +00:00
ae43f8a948
fix rerors selectors pandora_enterprise#12665
2023-12-18 16:29:56 +01:00
348c48d974
Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
...
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola
See merge request artica/pandorafms!6757
2023-12-18 13:40:21 +00:00
315d1a3223
add autorefresh to agent view
2023-12-18 13:50:54 +01:00
0ac20717f1
#12200 resolved conflict
2023-12-18 13:15:42 +01:00
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
8aeee6d876
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-12-18 11:15:18 +01:00
9158b43945
Merge branch 'ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql' into 'develop'
...
move extension translate_string and file_repo pandora_enterprise#12333
See merge request artica/pandorafms!6706
2023-12-15 11:49:11 +00:00
8df792f11b
#12571 custom graphs refactored
2023-12-15 10:41:21 +01:00
3fe41179e0
Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
...
Ent 12216 entradas fantasma para elementos de discovery offline
See merge request artica/pandorafms!6740
2023-12-15 09:22:10 +00:00
70dd1719db
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-12-15 09:13:07 +01:00
d84faad8cf
#12631 added field ignore_unknown in api modules and cli
2023-12-14 18:11:34 +01:00
c6d29ea60e
#12435 external link users fix
2023-12-14 16:59:39 +01:00
4c11595899
fix name token easter eggs pandora_enterprise#12201
2023-12-14 16:48:10 +01:00
27a83a8eb5
Merge remote-tracking branch 'origin/develop' into ent-12201-eastern-egg-setup
...
Conflicts:
pandora_console/include/functions_config.php
2023-12-14 16:36:11 +01:00
7398982912
fix multiple selector
2023-12-14 12:27:00 +01:00
9258de7edc
fix multiple selector
2023-12-14 12:25:21 +01:00
3cb4b5cce4
Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/extras/mr/67.sql
pandora_console/operation/menu.php
2023-12-14 11:21:51 +01:00
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
065b096f14
#12366 user list 5 users bug styles
2023-12-14 10:03:58 +01:00
53b56b31af
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-14 08:38:52 +01:00
c5687ee1fd
Merge branch 'ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto' into 'develop'
...
fix error empty clusters pandora_enterprise#12511
See merge request artica/pandorafms!6719
2023-12-13 16:32:17 +00:00
29260473fc
fix missing fields
2023-12-13 13:29:48 +01:00
e042c67d2a
Merge branch 'ent-11495-nuevo-tipo-de-informe-service-level-detailed' into 'develop'
...
Ent 11495 nuevo tipo de informe service level detailed
See merge request artica/pandorafms!6447
2023-12-13 12:20:17 +00:00
adcf2df86d
Merge branch 'ent-12345-16503-boton-deshabilitar-modulo-en-vista-modulos-no-inserta-token-module_disabled-1' into 'develop'
...
Ent 12345 16503 boton deshabilitar modulo en vista modulos no inserta token module disabled 1
See merge request artica/pandorafms!6638
2023-12-13 12:18:52 +00:00
710edde3e0
Merge branch 'ent-9753-derivado-del-trabajo-q-a-766-reparar-la-administracion-de-module-groups-en-metaconsola' into 'develop'
...
Ent 9753 derivado del trabajo q a 766 reparar la administracion de module groups en metaconsola
See merge request artica/pandorafms!6703
2023-12-13 12:08:45 +00:00
70d8b344b7
Merge branch 'ent-12176-mejorar-la-captura-de-errores-en-nuevo-discovery-cuando-termine-con-errores' into 'develop'
...
Ent 12176 Mejorar la captura de errores en nuevo Discovery cuando termine con errores
See merge request artica/pandorafms!6705
2023-12-13 10:32:58 +00:00
5fa9cd5877
Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
2023-12-13 11:19:32 +01:00
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
7df7fdff7d
fix msg error agent cluster pandora_enterprise#12511
2023-12-13 10:32:29 +01:00
56f50bf4b0
Merge remote-tracking branch 'origin/develop' into ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto
2023-12-13 10:05:07 +01:00
a5889b5913
#12631 added Ignore unknown in massive edit agent
2023-12-12 15:55:27 +01:00
6e60d19193
#8365 ftp server ip
2023-12-12 15:46:42 +01:00
464ad467aa
#12631 created new token Ignore unknown for agent and modules
2023-12-12 15:30:10 +01:00
c593161525
#12398 change urls wiki
2023-12-12 12:22:51 +01:00
fec7bf8b90
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
2023-12-12 09:45:36 +01:00
94256559f1
#11495 Fix agent name in metaconsole module selector
2023-12-11 16:46:19 +01:00
a2436cf60e
Merge branch 'ent-12620-elementos-de-lista-negra-de-deteccion-de-cambios-en-inventario-en-el-setup-no-funciona' into 'develop'
...
Ent 12620 elementos de lista negra de deteccion de cambios en inventario en el setup no funciona
See merge request artica/pandorafms!6745
2023-12-11 14:46:27 +00:00
7f75445d75
Merge branch 'ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0' into 'develop'
...
Ent 11537 bug en cuadros de busqueda con los caracteres 2 y 0
See merge request artica/pandorafms!6410
2023-12-11 14:30:51 +00:00
d072187a2c
Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop'
...
fix error 500 and warnings pandora_enterprise#12605
See merge request artica/pandorafms!6738
2023-12-11 14:27:39 +00:00
8b0d96bab7
Merge branch 'ent-12606-no-deja-editar-tiempo-en-reportes-sla' into 'develop'
...
Ent 12606 no deja editar tiempo en reportes sla
See merge request artica/pandorafms!6744
2023-12-11 14:23:53 +00:00
3a00ba0fd6
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
2023-12-11 12:41:37 +01:00
28d6b73bd8
Removed services and plugin agents setup for demo
2023-12-11 12:12:47 +01:00
86671c7211
#12350 added agent name editing
2023-12-11 11:36:34 +01:00
5c0435d226
Merge branch 'ent-11846-rehacer-vista-list-of-elements-consolas-visuales-relacionado-con-11835' into 'develop'
...
Ent 11846 rehacer vista list of elements consolas visuales relacionado con 11835
See merge request artica/pandorafms!6563
2023-12-11 10:34:10 +00:00
a418673489
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-12-11 11:09:54 +01:00
7258188491
remove agents bulk operation pandora_enterprise#12299
2023-12-11 11:01:53 +01:00
49fd9435dd
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-11 10:13:46 +01:00
be553ed170
Merge branch 'ent-11954-16123-borrado-de-acciones-no-deseadas-con-bulk' into 'develop'
...
Ent 11954 16123 borrado de acciones no deseadas con bulk
See merge request artica/pandorafms!6380
2023-12-11 08:29:29 +00:00
ce298c1e8f
Merge branch 'ent-12353-URL-de-Pandora-RC-en-Pandora-FMS-continua-siendo-ehorus-en-el-Setup' into 'develop'
...
change url pandorarc name
See merge request artica/pandorafms!6649
2023-12-11 08:24:46 +00:00
8e69326e3c
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
2023-12-11 08:43:37 +01:00
725c5d964c
#12620 fixed blacklist items in setup
2023-12-07 13:09:42 +01:00
b99b0d4708
#12606 Fixed period
2023-12-07 12:49:20 +01:00
78bb8e0bae
#8365 ix merge conflict
2023-12-07 10:58:45 +01:00
b1b3cced7d
Merge branch 'ent-11903-16107-borrar-listado-mapas-gis' into 'develop'
...
Ent 11903 16107 borrar listado mapas gis
See merge request artica/pandorafms!6393
2023-12-07 09:27:38 +00:00
abfa08b6e0
#12577 fixed visual error of the dynamic threshold ff threshold and cron from module containers
2023-12-07 10:25:11 +01:00
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
457f8e9448
some changes in discovery
2023-12-05 16:07:14 +01:00
d601103df3
fix url
2023-12-05 11:49:43 +01:00
433ce7971f
minor change
2023-12-05 11:38:11 +01:00
60137eb300
changes in discovery extensions
2023-12-05 11:32:19 +01:00
1d36d8a436
fix error 500 and warnings pandora_enterprise#12605
2023-12-05 09:14:02 +01:00
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
c22525febc
#12569 fixed actions credential boxes
2023-12-04 16:54:14 +01:00
Daniel Cebrian
Rafael Ameijeiras
Diego Muñoz-Reja
Daniel Maya
Jonathan
Daniel Rodriguez
alejandro.campos@artica.es
Matias Didier
Pablo Aragon
miguel angel rasteu
Calvo
daniel
Enrique Martin
Jorge Rincon