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
6a904f4e59
Merge branch 'ent-12269-el-editor-de-widgets-no-me-dice-que-tipo-de-widget-estoy-editando' into 'develop'
...
Ent 12269 el editor de widgets no me dice que tipo de widget estoy editando
See merge request artica/pandorafms!6590
2023-12-19 14:59:13 +00:00
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
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
0ac20717f1
#12200 resolved conflict
2023-12-18 13:15:42 +01:00
9b0bee3b36
fix rerors duplicate in CVS pandora_enterprise#9640
2023-12-18 11:35:39 +01:00
d56e3a5496
fix rerors duplicate in CVS pandora_enterprise#9640
2023-12-18 11:14:55 +01: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
e14a2bcb67
fix times sound events pandora_enterprise#12607
2023-12-15 09:11:05 +01:00
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
2420c79500
Merge branch 'ent-12447-errores-al-aplicar-parches' into 'develop'
...
fix error update manager pandora_enterprise#12447
Closes pandora_enterprise#12447
See merge request artica/pandorafms!6721
2023-12-14 14:36:36 +00:00
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
f78c7495e5
fixed modal close click button execute twice function close pandora_enterprise#12447
2023-12-14 13:18:53 +01:00
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
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
53b56b31af
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-14 08:38:52 +01: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
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
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
a3feac4f2e
#12065 Resolve conflicts
2023-12-13 08:32:12 +01:00
206bdc4acb
Merge branch 'ent-12168-GISS-Jerarquia-en-vista-de-arbol-de-servicios-no-se-muestra-bien-al-hacer-búsquedas-en-el-filtro-Nodo-y-Meta' into 'develop'
...
Ent 12168 giss jerarquia en vista de arbol de servicios no se muestra bien al hacer búsquedas en el filtro nodo y meta
See merge request artica/pandorafms!6547
2023-12-11 14:45:36 +00:00
fd212e7c20
fix error hide/show input sliced mode pandora_enterprise#9640
2023-12-11 11:24:45 +01: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
49fd9435dd
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-11 10:13:46 +01:00
385989f185
Merge branch 'ent-12329-16465-problema-public-link-consolas-visuales-metaconsola' into 'develop'
...
VC Public links pandora_enterprise#12329
See merge request artica/pandorafms!6633
2023-12-07 15:27:57 +00:00
78bb8e0bae
#8365 ix merge conflict
2023-12-07 10:58:45 +01:00
5c6f11511c
fix error events sound modal pandora_enterprise#12607
2023-12-05 16:48:12 +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
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
c41b360a6e
#8365 merge conflict
2023-11-30 12:04:28 +01:00
b99c9240de
#8365 NCM Merge conflict
2023-11-30 08:32:15 +01:00
75d57337af
#11705 Fix merge conflict
2023-11-30 08:10:32 +01:00
7a5201db4f
#8365 NCM V3 Minor fix
2023-11-29 16:31:06 +01:00
33ca5ab4ab
Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop'
...
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer
See merge request artica/pandorafms!6651
2023-11-29 14:23:32 +00:00
447e788ab3
Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'
...
Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado
See merge request artica/pandorafms!6587
2023-11-28 14:14:26 +00:00
837f1ff73c
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 13:04:13 +01:00
730cfb30ff
Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
...
Conflicts:
pandora_console/include/styles/pandora.css
2023-11-28 08:40:07 +01:00
9819c3a5ff
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
2023-11-28 08:30:23 +01:00
f6f0f15731
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/graphs/fgraph.php
pandora_console/include/lib/Dashboard/Widgets/single_graph.php
pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
2dec31485a
Merge branch 'develop' into ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer
2023-11-28 08:19:53 +01:00
3b2c5237d1
Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop'
...
Ent 12036 error en el nombre de la copia de un dashboard cualquiera
See merge request artica/pandorafms!6457
2023-11-28 07:09:11 +00:00
def169abb8
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 07:58:50 +01:00
964321d1bd
Merge branch 'ent-12091-filtrado-de-agentes-modulos-en-operaciones-masivas-de-alertas' into 'develop'
...
Ent 12091 filtrado de agentes modulos en operaciones masivas de alertas
See merge request artica/pandorafms!6516
2023-11-27 14:50:39 +00:00
95cf2a2654
Merge branch 'ent-12268-dashboard-widget-de-eventos-no-se-puede-clickar' into 'develop'
...
Ent 12268 dashboard widget de eventos no se puede clickar
See merge request artica/pandorafms!6620
2023-11-27 12:05:52 +00:00
47a0c8e956
Merge branch 'ent-11442-consejos-de-bienvenida-tienen-controles-confusos' into 'develop'
...
Ent 11442 consejos de bienvenida tienen controles confusos
See merge request artica/pandorafms!6414
2023-11-27 10:47:18 +00:00
e744942f33
Merge branch 'ent-12164-no-se-establece-el-intervalo-inverso-en-los-modulos-creados-a-traves-de-remote-components' into 'develop'
...
Ent 12164 no se establece el intervalo inverso en los modulos creados a traves de remote components
See merge request artica/pandorafms!6530
2023-11-27 10:33:28 +00:00
9f72dd7d6e
#12200 Added setup flag for easter egg
2023-11-24 14:01:17 +01:00
305f8c7658
Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
2023-11-23 14:18:44 +01:00
b497e573fe
fix modal events sound bottom bar pandora_enterprise#12378
2023-11-23 14:18:29 +01:00
4f707a5a1b
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
2023-11-23 09:27:46 +01:00
Rafael Ameijeiras
daniel
Daniel Maya
Diego Muñoz-Reja
Jonathan
miguel angel rasteu
Matias Didier
Jorge Rincon