Daniel Maya
|
528c5a726a
|
Merge branch 'develop' into ent-11391-pandora-indexer-cambios-en-el-collector-de-logs
|
2023-10-02 10:27:14 +02:00 |
Diego Muñoz-Reja
|
b84ffc124b
|
Merge branch 'ent-12066-eventos-que-no-muestran-los-comentarios' into 'develop'
fix show comment events ticket pandora_enterprise#12066
See merge request artica/pandorafms!6488
|
2023-09-28 14:06:30 +00:00 |
Daniel Rodriguez
|
05cd8142bf
|
Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471
Closes pandora_enterprise#11471
See merge request artica/pandorafms!6131
|
2023-09-28 10:05:15 +00:00 |
Rafael Ameijeiras
|
03700d2653
|
Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop'
refactor cluster view pandora_enterprise#12032
See merge request artica/pandorafms!6476
|
2023-09-26 15:15:27 +00:00 |
daniel
|
91393c9e39
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-09-25 17:06:08 +02:00 |
|
Rafael Ameijeiras
|
b1c3eb7f3c
|
Merge branch 'ent-12100-graph-analysis-no-puedo-exportar-a-grafica-combinada' into 'develop'
Ent 12100 graph analysis no puedo exportar a grafica combinada
See merge request artica/pandorafms!6483
|
2023-09-25 07:11:48 +00:00 |
|
daniel
|
c6a04d5d8f
|
fix show comment events ticket pandora_enterprise#12066
|
2023-09-22 12:56:01 +02:00 |
miguel angel rasteu
|
e637866f72
|
#12100 Fix custom graph
|
2023-09-21 16:11:58 +02:00 |
|
miguel angel rasteu
|
80b0522c7c
|
#12097 Fix view discovery
|
2023-09-21 14:21:54 +02:00 |
|
miguel angel rasteu
|
7d5f4f17c6
|
#12097 Fix view summary in discovery task
|
2023-09-21 13:06:39 +02:00 |
|
daniel
|
f46626e120
|
refactor cluster view pandora_enterprise#12032
|
2023-09-21 10:21:45 +02:00 |
|
Daniel Maya
|
a0dcdb88b0
|
#11391 Fixed ace editor and log viewer
|
2023-09-13 15:19:42 +02:00 |
|
daniel
|
5093d54137
|
ITSM pandora_enterprise#11471
|
2023-09-11 18:14:32 +02:00 |
|
daniel
|
ce0468b37e
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/include/functions_menu.php
|
2023-09-08 13:11:52 +02:00 |
Pablo Aragon
|
87c02fd0a7
|
11801-Resolve conflict
|
2023-09-07 11:08:31 +02:00 |
|
daniel
|
fce86cb2ac
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-06 07:50:27 +02:00 |
|
Rafael Ameijeiras
|
f2b99cf38e
|
Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop'
Ent 10639 unificacion de controles de fecha
See merge request artica/pandorafms!6212
|
2023-09-05 07:50:45 +00:00 |
|
daniel
|
1a1087e311
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/66.sql
|
2023-09-04 08:16:48 +02:00 |
|
Daniel Rodriguez
|
aac8aa43fd
|
Merge branch 'ent-11216-clonar-widget' into 'develop'
Ent 11216 clonar widget
See merge request artica/pandorafms!6222
|
2023-09-01 07:05:11 +00:00 |
|
Pablo Aragon
|
9010d079d3
|
11801-Datatables add parameter Start disabled (enable on filter)
|
2023-08-31 14:58:47 +02:00 |
Gorka Sanchez
|
6102cb5015
|
Merge branch 'ent-11423-nueva-herramienta-graph-analytics' into 'develop'
Ent 11423 nueva herramienta graph analytics
See merge request artica/pandorafms!6327
|
2023-08-31 10:30:27 +00:00 |
Jonathan
|
4ca9b6d8d2
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-29 12:29:41 +02:00 |
|
Pablo Aragon
|
28316e25c3
|
11423-Graph analytics. Remove Group None from export filter
|
2023-08-25 10:33:32 +02:00 |
|
Pablo Aragon
|
670cf7d9a7
|
11423-Graph analytics. Remove graphs & several changes
|
2023-08-24 12:27:06 +02:00 |
|
Jonathan
|
d9e897568a
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-24 10:06:19 +02:00 |
|
Pablo Aragon
|
208304ed80
|
11943-Dashboards script tag as string
|
2023-08-24 08:42:20 +02:00 |
|
daniel
|
dca15b5637
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-23 18:54:01 +02:00 |
|
Pablo Aragon
|
6757e69a75
|
11423-Graph analytics. Resolve Confict
|
2023-08-23 11:55:41 +02:00 |
|
Pablo Aragon
|
c0933e8b15
|
11423-Graph analytics
|
2023-08-23 11:51:29 +02:00 |
|
Rafael Ameijeiras
|
1fa70b3afc
|
Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop'
Ent 11852 advertencia al usar intervalos largos
See merge request artica/pandorafms!6346
|
2023-08-23 05:56:19 +00:00 |
|
Pablo Aragon
|
bfa09367d4
|
11423-Graph analytics. Share function
|
2023-08-22 15:28:05 +02:00 |
|
daniel
|
5a61f074d7
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-22 09:22:11 +02:00 |
|
Rafael Ameijeiras
|
82389ddf2d
|
Merge branch 'ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento' into 'develop'
Ent 10870 [#15385] Limpiar eventos desde la vista detallada de evento
See merge request artica/pandorafms!6174
|
2023-08-21 11:10:35 +00:00 |
|
Jonathan
|
563323d0be
|
#11852 warning time lapse more than 30 days
|
2023-08-21 13:05:39 +02:00 |
|
miguel angel rasteu
|
6cbb332a8a
|
#10701 Fix css conflict
|
2023-08-21 09:16:22 +02:00 |
|
Rafael Ameijeiras
|
a6e1e1cf61
|
Merge branch 'ent-11794-stored-cross-site-scripting-via-dashboard-panel' into 'develop'
Ent 11794 stored cross site scripting via dashboard panel
See merge request artica/pandorafms!6296
|
2023-08-21 06:23:49 +00:00 |
|
daniel
|
a63824d802
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/66.sql
pandora_console/godmode/users/user_management.php
|
2023-08-21 08:08:34 +02:00 |
|
Rafael Ameijeiras
|
dbd90d79a7
|
Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop'
Ent 10344 Conexion con el servidor se ha perdido
See merge request artica/pandorafms!6228
|
2023-08-21 05:58:32 +00:00 |
Daniel Cebrian
|
fa04db27a7
|
Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento
|
2023-08-18 10:40:29 +02:00 |
|
daniel
|
dbf98689c2
|
ITSM pandora_enterprise#11471
|
2023-08-11 14:30:18 +02:00 |
|
daniel
|
7f82273dc4
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/65.sql
|
2023-08-09 08:59:01 +02:00 |
|
miguel angel rasteu
|
1009404bfd
|
Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro
|
2023-08-03 13:42:49 +02:00 |
|
miguel angel rasteu
|
1dc24cdfb4
|
#11668 Fix black theme
|
2023-08-03 12:22:20 +02:00 |
|
miguel angel rasteu
|
0a799c51e6
|
#10701 D3 Tree implementation, links and colors
|
2023-08-02 12:29:20 +02:00 |
|
miguel angel rasteu
|
ca42714fca
|
#10701 include d3 v7
|
2023-08-01 14:56:44 +02:00 |
|
Jonathan
|
f2328407b1
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-01 09:39:56 +02:00 |
|
miguel angel rasteu
|
f09ab409cc
|
#11794 Fix entitites in dashboard
|
2023-07-31 11:24:44 +02:00 |
|
Daniel Maya
|
ad24712eed
|
resolved conflict 2
|
2023-07-31 09:48:42 +02:00 |
|
Daniel Maya
|
8bbaa11ce3
|
resolved conflict
|
2023-07-31 09:44:46 +02:00 |
|
Daniel Maya
|
858a6230b3
|
resolved conflict
|
2023-07-31 09:02:58 +02:00 |