cc33e5413a
Merge branch 'ent-12202-eastern-egg-asteroids' into 'develop'
...
Ent 12202 eastern egg asteroids
See merge request artica/pandorafms!6693
2024-01-19 11:10:55 +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
5ade3a9e82
Merge branch 'ent-12541-fallos-en-graph-analytics' into 'develop'
...
Ent 12541 Fallos en graph analytics
See merge request artica/pandorafms!6714
2024-01-18 16:00:08 +00:00
9bd4593c60
Merge branch 'ent-12542-16692-grupo-de-modulo-de-componente-local-no-se-muestra-correctamente' into 'develop'
...
Ent 12542 16692 grupo de modulo de componente local no se muestra correctamente
See merge request artica/pandorafms!6730
2024-01-18 15:46:31 +00:00
01049303d9
#12202 remove loadModal not defined function
2024-01-18 16:22:44 +01:00
c2c3c5e5ed
Merge branch 'ent-12484-pestanas-de-informacion-en-el-about-en-774-han-desaparecido' into 'develop'
...
Ent 12484 pestanas de informacion en el about en 774 han desaparecido
See merge request artica/pandorafms!6831
2024-01-18 11:33:28 +00:00
8a41a04345
Merge branch 'ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha' into 'develop'
...
Ent 12143 arreglar mejorar visualizacion de calendarios y selectores de fecha
See merge request artica/pandorafms!6765
2024-01-18 11:27:20 +00:00
14b512ddde
Merge branch 'ent-12685-se-pueden-anadir-widget-sin-estar-en-modo-edicion' into 'develop'
...
Ent 12685 se pueden anadir widget sin estar en modo edicion
See merge request artica/pandorafms!6841
2024-01-18 11:20:34 +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
32c9524447
Merge branch 'ent-12384-restricciones-de-permisos-de-mapas-de-red' into 'develop'
...
Ent 12384 restricciones de permisos de mapas de red
See merge request artica/pandorafms!6727
2024-01-18 08:16:37 +00:00
c973d8b257
#12542 trigger module change
2024-01-17 14:04:27 +01:00
49784cab5a
Merge branch 'develop' into ent-12202-eastern-egg-asteroids
2024-01-17 09:29:21 +01:00
12f6f2e02b
12320-Welcome wizard new styles
2024-01-11 09:33:51 +01:00
bcf945daa2
#12685 fix invisible add widget
2024-01-10 15:16:15 +01:00
2ace34425c
#12143 fix datepicker
2024-01-09 16:04:28 +01:00
83b25fef31
Merge branch 'develop' into ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha
2024-01-09 11:37:54 +01:00
c862946813
Merge branch 'develop' into ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor
2024-01-09 09:25:22 +01:00
71b491a49d
#12484 same about
2024-01-08 13:07:48 +01:00
b80bfa2799
#12624 change of style in dialog 2
2024-01-04 15:39:27 +01:00
5b4531e74f
#12553 fixed titles
2023-12-27 17:10:11 +01:00
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
5c047fc1b5
#12657 entries order function datatables
2023-12-18 14:46:44 +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
88784de3ef
#12143 fix datepicker dashboard widget hardening
2023-12-13 13:03:08 +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
5191739658
#12542 fixed local component module group
2023-12-01 12:05:42 +01:00
87f4a6e15f
#12384 Fixed acl
2023-12-01 10:08:25 +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
f1a8c4b31d
#12541 change message export graph
2023-11-29 16:12:12 +01:00
b6722214de
#12541 changes in graph analytics
2023-11-29 15:43:38 +01:00
0d285802b1
#12520 Fixed form
2023-11-29 15:32:46 +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
51a152d86d
#12202 Added setup flag for easter egg
2023-11-24 13:25:42 +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
b6582b7f7e
#12202 added Asteroids game
2023-11-22 13:30:44 +01:00
89be9af98f
#11442 Fix conflicts
2023-11-17 12:33:33 +01:00
4ba13ad0e7
#12200 increase the duration of the snow effect from about
2023-11-17 10:07:13 +01:00
8635617815
#12200 The Christmas effect is added after 25 clicks on the about image
2023-11-16 10:24:03 +01:00
33c4833200
fix image pdf pandora_enterprise#12472
2023-11-15 17:28:16 +01:00
f725752f32
#12168 fixed filter in service tree genealogy
2023-11-14 12:33:29 +01:00
04649dee00
#12168 Fixed sql bringing main services
2023-11-13 13:41:47 +01:00
813bc4b851
#12424 class error input ranges warning critical
2023-11-13 09:49:19 +01:00
8ca94d4096
#11126 fixed normal link graph
2023-11-10 10:47:26 +01:00
ca8d0ed7f8
Merge branch 'ent-12376-problemas-vistos-en-la-nueva-vista-tactica' into 'develop'
...
Ent 12376 Problemas vistos en la nueva vista táctica
See merge request artica/pandorafms!6628
2023-11-08 13:36:10 +00:00
8f8e5ecf45
#12376 multiple changes in general tactical view
2023-11-07 13:18:44 +01:00
aaa590b65f
VC Public links pandora_enterprise#12329
2023-11-07 09:20:48 +01:00
5486b500f0
Add action ITSM in SNMP alert pandora_enterprise#12327
2023-11-06 13:12:14 +01:00
513a0bc296
#8365 Added csv report for device lists.
...
Fixed overlay for modals
2023-11-03 14:25:44 +01:00
ab6aa1ba57
#12268 dashboard widget events redirect event view
2023-11-02 17:13:16 +01:00
868700f9f1
add sliced mode simple graph reports and CV pandora_enterprise#9640
2023-10-25 15:55:54 +02:00
d8dfaf0fe3
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-10-23 17:02:51 +02:00
ef70444d71
add sliced mode simple graph widget pandora_enterprise#9640
2023-10-23 17:02:08 +02:00
4d5917e4b7
#12269 widget editor title name widget
2023-10-23 14:56:09 +02:00
0e58c64a39
#12260 Adjusted icon path depending on icon extension
2023-10-23 11:14:30 +02:00
48c314669a
Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop'
...
Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización)
See merge request artica/pandorafms!6485
2023-10-23 07:24:20 +00:00
9aee38aa0b
Merge branch 'ent-11391-pandora-indexer-cambios-en-el-collector-de-logs' into 'develop'
...
#11391 Fixed ace editor and log viewer
See merge request artica/pandorafms!6461
2023-10-23 07:19:51 +00:00
Daniel Rodriguez
Rafael Ameijeiras
Diego Muñoz-Reja
Jonathan
Pablo Aragon
Daniel Maya
Daniel Cebrian
daniel
miguel angel rasteu
Matias Didier
Jorge Rincon