Rafael Ameijeiras
|
06a3fa3f27
|
Merge branch 'ent-12636-error-con-los-iconos-y-cabecera-de-sistemas-operativos' into 'develop'
Ent 12636 error con los iconos y cabecera de sistemas operativos
See merge request artica/pandorafms!6872
|
2024-02-08 14:50:49 +00:00 |
Jonathan
|
2246fd8049
|
#12695 WIP warnings
|
2024-02-07 16:39:33 +01:00 |
|
Jonathan
|
3ea38c0455
|
#12621 dialog tips css
|
2024-02-05 08:43:26 +01:00 |
|
Jonathan
|
4c617acefc
|
#12621 dialog tips on click
|
2024-02-02 13:43:04 +01:00 |
Daniel Cebrian
|
5b7a123086
|
Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache
|
2024-01-30 13:21:44 +01:00 |
alejandro.campos@artica.es
|
2ba5dd767d
|
visual changes in demo view
|
2024-01-26 12:41:32 +01:00 |
daniel
|
65385f36c1
|
fix visual errors in widgets dashboard pandora_enterprise#12267
|
2024-01-26 09:18:47 +01:00 |
|
Jonathan
|
a747308b26
|
#12636 fix errors
|
2024-01-22 16:21:51 +01:00 |
|
Daniel Cebrian
|
d504267460
|
Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache
|
2024-01-22 15:18:01 +01:00 |
|
Daniel Cebrian
|
bb2d908de7
|
#12460 fixed deprecated log
|
2024-01-17 12:25:57 +01:00 |
|
Jonathan
|
8a9fbbac8b
|
#12515 event title ... over 300 characters
|
2023-12-18 16:32:39 +01:00 |
|
Daniel Cebrian
|
1a9bdf97d1
|
#12566 changes in view events
|
2023-12-11 17:01:40 +01:00 |
|
Daniel Cebrian
|
7f4dc4fbe4
|
#12460 fixed log deprecated
|
2023-12-11 09:18:40 +01:00 |
|
Daniel Cebrian
|
ea474ecd89
|
#12566 changes in events table
|
2023-12-04 15:05:01 +01:00 |
Daniel Rodriguez
|
a7abf4add7
|
Merge branch 'ent-12382-16531-permitir-cambiar-la-url-del-pdf-para-que-el-chromium-pueda-acceder-a-ella' into 'develop'
fix chart_generator pdf pandora_enterprise#12382
See merge request artica/pandorafms!6679
|
2023-12-04 13:38:18 +00:00 |
|
Rafael Ameijeiras
|
67700a1ea2
|
Merge branch 'ent-12083-open-inventory-widget-no-carga' into 'develop'
Ent 12083 open inventory widget no carga
See merge request artica/pandorafms!6506
|
2023-11-27 14:46:47 +00:00 |
|
Rafael Ameijeiras
|
c3af86414f
|
Merge branch 'ent-11650-aviso-emergente-no-acorde-con-la-nueva-interfaz' into 'develop'
Ent 11650 aviso emergente no acorde con la nueva interfaz
See merge request artica/pandorafms!6395
|
2023-11-27 11:56:57 +00:00 |
|
daniel
|
0f9facb999
|
fix chart_generator pdf pandora_enterprise#12382
|
2023-11-16 13:17:25 +01:00 |
|
Daniel Cebrian
|
e38246521d
|
#12251 added info in security in agent contact
|
2023-11-14 09:33:04 +01:00 |
|
Daniel Cebrian
|
dc714a5b9f
|
#12249 column secmon
|
2023-11-13 15:27:07 +01:00 |
|
Daniel Cebrian
|
b100d34985
|
#12249 new view vulnerabilities agent
|
2023-11-13 09:38:24 +01:00 |
miguel angel rasteu
|
0f32550f21
|
#11650 Fix conflict
|
2023-10-30 08:35:34 +01:00 |
|
Daniel Rodriguez
|
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 |
|
miguel angel rasteu
|
35cd554257
|
#12207 Fix status discovery task
|
2023-10-16 15:47:48 +02:00 |
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 |
|
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 |
|
miguel angel rasteu
|
0d197e449e
|
#12083 Fix inventory widget
|
2023-09-27 11:53:05 +02: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 |
Diego Muñoz-Reja
|
576ee1bf37
|
Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into 'develop'
Ent 11965 Security hardening: Console - Vistas estaticas
See merge request artica/pandorafms!6370
|
2023-09-21 14:57:06 +00:00 |
|
daniel
|
f46626e120
|
refactor cluster view pandora_enterprise#12032
|
2023-09-21 10:21:45 +02:00 |
|
miguel angel rasteu
|
6609571482
|
#12089 Add nowrap class to timestamp
|
2023-09-19 17:21:44 +02:00 |
|
Daniel Cebrian
|
b85d622d51
|
Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas
|
2023-09-18 16:52:57 +02:00 |
|
Rafael Ameijeiras
|
b568085841
|
Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop'
not show edition buttons of alert detail pandora_enterprise#12035
See merge request artica/pandorafms!6444
|
2023-09-18 07:22:13 +00:00 |
|
daniel
|
af968b5e13
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-14 08:08:05 +02:00 |
|
Daniel Maya
|
a0dcdb88b0
|
#11391 Fixed ace editor and log viewer
|
2023-09-13 15:19:42 +02:00 |
|
miguel angel rasteu
|
91aee79ab2
|
#12037 Resolve conflicts
|
2023-09-12 15:07:00 +02:00 |
|
daniel
|
802f0bf83b
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-12 12:37:31 +02:00 |
|
daniel
|
16f1d80919
|
not show edition buttons of alert detail pandora_enterprise#12035
|
2023-09-12 12:30:52 +02:00 |
|
Daniel Cebrian
|
1cd5d1b0fa
|
#11965 new view hardening
|
2023-09-12 10:45:23 +02:00 |
|
miguel angel rasteu
|
55fa824792
|
#12037 Fix size of agent text and event text
|
2023-09-11 11:41:30 +02:00 |
|
miguel angel rasteu
|
99f92b9bec
|
#10676 Fix truncate text
|
2023-09-11 10:09:34 +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 |
|
miguel angel rasteu
|
9cdc7273a6
|
#10676 increase chars in agents name in monitor view and truncate at the end
|
2023-09-08 10:42:40 +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 |
|
miguel angel rasteu
|
083043eaba
|
#11650 Change style for tooltip
|
2023-09-01 14:06:48 +02:00 |
Gorka Sanchez
|
7dcb38f382
|
Merge branch 'ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios' into 'develop'
Ent 11821 error sql en vista de eventos al agregar columna de comentarios
See merge request artica/pandorafms!6359
|
2023-09-01 09:24:10 +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
|
17bfcba735
|
11960-Fix url import datatables node/meta
|
2023-08-28 14:10:03 +02:00 |
|
Pablo Aragon
|
e0c5b2777d
|
11821-Show events comment in table
|
2023-08-25 12:06:29 +02:00 |
|
Pablo Aragon
|
fac107ca49
|
Merge branch 'develop' into ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios
|
2023-08-25 11:45:41 +02:00 |
|
Pablo Aragon
|
9271dc33f1
|
11821-Events not sort by comments
|
2023-08-24 14:43:05 +02:00 |
|
Jonathan
|
d9e897568a
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-24 10:06:19 +02:00 |
|
Jonathan
|
92fae2bb54
|
#11929 fix datatable for port != 80
|
2023-08-23 13:25:06 +02:00 |
|
Pablo Aragon
|
6757e69a75
|
11423-Graph analytics. Resolve Confict
|
2023-08-23 11:55:41 +02:00 |
|
Pablo Aragon
|
63d3745794
|
11423-Graph analytics. Get filter data (WIP)
|
2023-08-16 15:12:31 +02:00 |
|
daniel
|
133eef456a
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-14 08:14:34 +02:00 |
|
Daniel Cebrian
|
06eae47560
|
Merge branch 'develop' into ent-11326-security-hardening-console
|
2023-08-09 13:27:21 +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 |
|
Daniel Cebrian
|
496afbc973
|
#11326 reorganized tables
|
2023-08-08 08:46:56 +02:00 |
|
Daniel Maya
|
aef7f0edd0
|
#11739 Fixed deprecated functions 4
|
2023-08-01 14:51:31 +02:00 |
|
Jonathan
|
f2328407b1
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-01 09:39:56 +02:00 |
|
Daniel Maya
|
8bbaa11ce3
|
resolved conflict
|
2023-07-31 09:44:46 +02:00 |
|
Rafael Ameijeiras
|
6db5b41633
|
Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop'
Ent 10875 15383 limitar ancho y o largo de la linea de los eventos
See merge request artica/pandorafms!6034
|
2023-07-31 06:40:38 +00:00 |
|
Daniel Cebrian
|
21435b32c3
|
Merge branch 'develop' into ent-11326-security-hardening-console
|
2023-07-28 13:39:22 +02:00 |
|
miguel angel rasteu
|
014d32181c
|
#10875 Fix title
|
2023-07-28 12:12:14 +02:00 |
|
miguel angel rasteu
|
b4ae714af3
|
#10875 Truncate long string
|
2023-07-28 10:39:46 +02:00 |
|
alejandro.campos@artica.es
|
6114787764
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-27 13:32:26 +02:00 |
|
Rafael Ameijeiras
|
9ce383d2ec
|
Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop'
Ent 11739 compatibilidad php 8 2
See merge request artica/pandorafms!6286
|
2023-07-27 09:17:24 +00:00 |
|
Daniel Cebrian
|
2c9f7e026e
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-07-26 15:58:26 +02:00 |
|
Daniel Maya
|
bee65bc575
|
#11739 Fixed deprecated functions
|
2023-07-26 14:18:20 +02:00 |
|
Daniel Cebrian
|
001ffc1799
|
Merge branch 'develop' into ent-11326-security-hardening-console
|
2023-07-26 10:55:49 +02:00 |
|
Pablo Aragon
|
ccf124103d
|
11135-Move js code from ui_print_datatable. Resolve conflict
|
2023-07-24 10:46:19 +02:00 |
|
Daniel Cebrian
|
2d0fe4b149
|
#11326 added design
|
2023-07-20 15:13:58 +02:00 |
|
daniel
|
1f1b85561c
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-19 11:39:06 +02:00 |
|
Daniel Cebrian
|
6eaa8e9cd8
|
#11326 fixed pagination with multiples datatable
|
2023-07-18 14:52:34 +02:00 |
|
Daniel Cebrian
|
41a03a7a49
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-07-18 09:27:14 +02:00 |
|
daniel
|
a29497f659
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-07-17 10:52:15 +02:00 |
|
Rafael Ameijeiras
|
d860d613d6
|
Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida
See merge request artica/pandorafms!6043
|
2023-07-17 05:57:29 +00:00 |
|
daniel
|
0722cfca1a
|
ITSM fixed pandora_enterprise#11471
|
2023-07-14 15:42:35 +02:00 |
|
Daniel Cebrian
|
b35b4e40a1
|
#9686 fixed bug pagination in datatable
|
2023-07-13 10:46:10 +02:00 |
|
Rafael Ameijeiras
|
a8d8676422
|
Merge branch 'ent-10976-busqueda-rapida-agentes-pasar-a-datatables' into 'develop'
Ent 10976 busqueda rapida agentes pasar a datatables
See merge request artica/pandorafms!5834
|
2023-07-12 06:04:56 +00:00 |
|
daniel
|
200750f90b
|
change events user_comment new table tevent_comment pandora_enterprise#11387
|
2023-07-07 12:53:14 +02:00 |
|
Jonathan
|
d6df9ed38e
|
#10639 new datepicker style and filters
|
2023-07-05 14:38:59 +02:00 |
|
Jonathan
|
8be0236af1
|
#9478 permisions & confirm on delete alert action
|
2023-07-05 11:14:09 +02:00 |
|
Jonathan
|
a385ff93a3
|
#9478 creation alerts to nodes on metaconsole
|
2023-07-04 12:47:04 +02:00 |
|
Jonathan
|
8f227233fd
|
#9478 fix delete mesage and permisions
|
2023-07-03 14:56:39 +02:00 |
|
Jonathan
|
1c69208a6a
|
Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola
|
2023-07-03 10:21:55 +02:00 |
|
miguel angel rasteu
|
61ab82d808
|
#10304 Fix action default in agent detail
|
2023-06-29 12:59:32 +02:00 |
Jorge Rincon
|
9a20ea1231
|
#11025 Fixed the bug that cuts the text of the Search field
|
2023-06-28 17:21:06 +02:00 |
Matias Didier
|
43e158011a
|
Merge branch 'ent-11139-icono-de-lupa-descolocado-en-alert-details' into 'develop'
Ent 11139 icono de lupa descolocado en alert details
See merge request artica/pandorafms!5877
|
2023-06-27 08:37:39 +00:00 |
|
Matias Didier
|
e1fe10f3e3
|
Merge branch 'ent-11380-15677-selector-filtro-por-estado-monitor-view-metaconsola' into 'develop'
Ent 11380 15677 selector filtro por estado monitor view metaconsola
See merge request artica/pandorafms!5981
|
2023-06-26 12:48:46 +00:00 |
|
Daniel Cebrian
|
d2413ed461
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-06-26 13:15:09 +02:00 |
|
Matias Didier
|
fde3857674
|
Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright
See merge request artica/pandorafms!6069
|
2023-06-22 13:24:47 +00:00 |
|
Daniel Cebrian
|
363f29d333
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-06-14 11:23:32 +02:00 |