tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,699 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

5333 Commits

Author SHA1 Message Date
Rafael Ameijeiras fec85ce8e7 Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' 
Ent 11749 15964 conteo de agentes no aparece en v772

See merge request artica/pandorafms!6266
 2023-08-03 07:04:11 +00:00
miguel angel rasteu fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +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 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
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 539dd0ddee #10875 Fix title dialog event 2023-07-28 13:07:04 +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
Pablo Aragon 0eb60cf5c8 11174-Timezone iana graph firefox 2023-07-27 11:24:52 +02:00
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' 
remove legacy visual console

See merge request artica/pandorafms!6140
 2023-07-26 11:09:44 +00:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
Rafael Ameijeiras 0e6531b983 Merge branch 'ent-11335-se-pueden-crear-mapas-de-red-con-el-mismo-nombre-y-grupo' into 'develop' 
Ent 11335 Se pueden crear mapas de red con el mismo nombre y grupo

See merge request artica/pandorafms!6143
 2023-07-25 07:53:15 +00:00
Rafael Ameijeiras 25e2183d23 Merge branch 'ent-11726-15939-no-hay-columna-nombre-del-agente' into 'develop' 
Ent 11726 15939 no hay columna nombre del agente

See merge request artica/pandorafms!6240
 2023-07-25 07:51:24 +00:00
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02:00
miguel angel rasteu a1965de2ea #11386 Fix sound alert modal 2023-07-24 12:25:06 +02:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
miguel angel rasteu 80b60eb86f #11749 Fix agent count 2023-07-20 08:43:51 +02:00
daniel c520375c61 ack utimestamp pandora_enterprise#11387 2023-07-19 13:28:53 +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 Maya 5806da78dd #11487 Fixed subgroups 2023-07-18 10:18:30 +02:00
Diego Muñoz-Reja 92623a5837 Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop' 
Ent 11573 mejora de los informes en vivo de netflow 2

See merge request artica/pandorafms!6142
 2023-07-18 07:30:00 +00:00
Miguel Angel Rasteu c428a7d69c Merge branch 'develop' into 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' 
# Conflicts:
#   pandora_console/operation/events/events.php
 2023-07-17 08:45:28 +00:00
Rafael Ameijeiras de84f5fae9 Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop' 
Ent 11418 cambiar vista de graficas del detalle de un agente

See merge request artica/pandorafms!6014
 2023-07-17 07:53:10 +00:00
Daniel Cebrian 0e2d1ee47f #11326 security hardening 2023-07-12 15:54:04 +02:00
miguel angel rasteu 2af618b765 #11726 Fix alert status column name agent 2023-07-12 14:11:00 +02:00
Diego Muñoz-Reja a7c0866be0 Merge branch 'ent-11293-lista-de-reportes-en-metaconsola' into 'develop' 
Ent 11293 lista de reportes en metaconsola

See merge request artica/pandorafms!5952
 2023-07-12 07:16:35 +00: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 Cebrian 0a34d06603 #10344 changed message in popup conexion check 2023-07-11 11:35:57 +02:00
Jonathan 183e11a640 #10976 & correction on search agents 2023-07-11 10:24:50 +02:00
miguel angel rasteu 8bcd7cae26 #10946 redirect to tree view in metaconsole 2023-07-11 09:56:46 +02:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
Gorka Sanchez 374cad5d8d Merge branch 'ent-11312-15642-problemas-url-publica-de-visual-consoles' into 'develop' 
Ent 11312 15642 problemas url publica de visual consoles

See merge request artica/pandorafms!5963
 2023-07-10 14:12:53 +00:00
Jonathan 27222a1731 #10976 fix minor error 2023-07-10 13:59:33 +02:00
Jonathan fd9a30d0a3 #10639 datetime range reporting 2023-07-10 11:33:10 +02:00
Jonathan 111ae5c0ba #10639 datetime range reporting 2023-07-10 09:20:15 +02:00
miguel angel rasteu 14819e045e #11649 Fix event widget 2023-07-10 09:04:07 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Gorka Sanchez cd668590bd Merge branch 'ent-11567-ventana-about' into 'develop' 
Ent 11567 ventana about

See merge request artica/pandorafms!6138
 2023-07-07 07:24:44 +00:00
Jonathan 178f04945f #10976 fix bug search agents global search 2023-07-07 09:21:52 +02:00
miguel angel rasteu 444dbb4599 #11386 Fix modal event sound 2023-07-06 13:15:45 +02:00
Jonathan 82cac02da9 Merge branch 'develop' into ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2 2023-07-06 12:37:16 +02:00
Gorka Sanchez 8fd3ed6650 Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop' 
Ent 9478 creacion y edicion directa de alertas desde metaconsola

See merge request artica/pandorafms!5806
 2023-07-06 09:44:33 +00:00
Daniel Cebrian d993674c12 Merge branch 'develop' into ent-11567-ventana-about 2023-07-06 11:30:45 +02:00
Daniel Cebrian 951a468282 #11418 fixed id modules order in view graphs 2023-07-06 11:26:29 +02:00
Jonathan d6df9ed38e #10639 new datepicker style and filters 2023-07-05 14:38:59 +02:00
Matias Didier 3ad880cdec Merge branch 'ent-10627-no-se-pueden-crear-mensajes-para-un-grupo' into 'develop' 
Ent 10627 no se pueden crear mensajes para un grupo

See merge request artica/pandorafms!5874
 2023-07-05 12:36:06 +00:00
Gorka Sanchez 7dea46c634 Merge branch 'ent-11093-reticula-en-consola-visual' into 'develop' 
Ent 11093 reticula en consola visual

See merge request artica/pandorafms!6056
 2023-07-05 09:54:35 +00:00
Matias Didier 5dee7f6d28 Merge branch 'ent-11625-los-iconos-del-tipo-de-evento-son-todo-cubos-de-colores' into 'develop' 
Ent 11625 los iconos del tipo de evento son todo cubos de colores

See merge request artica/pandorafms!6150
 2023-07-05 07:25:55 +00:00
Matias Didier af2def1a62 Merge branch 'ent-11205-vista-de-incidencias-con-estilo-no-homogeneo' into 'develop' 
Ent 11205 vista de incidencias con estilo no homogeneo

See merge request artica/pandorafms!5908
 2023-07-04 14:02:13 +00:00
Jonathan e9064dfd2f Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-04 14:09:15 +02:00
Jonathan a385ff93a3 #9478 creation alerts to nodes on metaconsole 2023-07-04 12:47:04 +02:00
miguel angel rasteu 138fa636ad #10637 Change group view 2023-07-04 11:06:49 +02:00
Gorka Sanchez 9427ba68e0 Merge branch 'ent-11314-vista-detalle-de-agente-cajas-colapsadas-por-defecto-si-no-hay-informacion' into 'develop' 
Ent 11314 vista detalle de agente cajas colapsadas por defecto si no hay informacion

See merge request artica/pandorafms!5969
 2023-07-04 08:53:12 +00:00
Jonathan 11bc45ff02 #11625 fix style event type icon 2023-07-03 12:13:27 +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
Jonathan d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +02:00
Gorka Sanchez d7a871ff76 Merge branch 'ent-10563-mejoras-personalizacion-interfaz' into 'develop' 
Ent 10563 mejoras personalizacion interfaz

See merge request artica/pandorafms!6200
 2023-07-03 07:49:25 +00:00
Miguel Angel Rasteu 82f6c6c0da Merge branch 'develop' into 'ent-10563-mejoras-personalizacion-interfaz' 
# Conflicts:
#   pandora_console/godmode/agentes/module_manager.php
 2023-07-03 07:45:32 +00:00
Miguel Angel Rasteu 6a161a1af8 Merge branch 'develop' into 'ent-11474-inventario-all-no-se-muestra-en-metaconsola' 
# Conflicts:
#   pandora_console/include/functions_inventory.php
 2023-07-03 07:44:19 +00:00
Gorka Sanchez ffc4f04989 Merge branch 'ent-11628-no-carga-el-total-amount-of-events-correctamente-si-hay-varios-widget-tactical-view' into 'develop' 
Ent 11628 no carga el total amount of events correctamente si hay varios widget tactical view

See merge request artica/pandorafms!6154
 2023-07-03 07:42:21 +00:00
Jonathan 5f8c2f1653 #11628 merge conflict solution 2023-07-03 09:34:04 +02:00
Gorka Sanchez 6a8a0e8b6f Merge branch 'ent-11469-selector-de-modulos-comunes-en-wizard-de-servicios-no-anade-nada' into 'develop' 
Ent 11469 selector de modulos comunes en wizard de servicios no anade nada

See merge request artica/pandorafms!6047
 2023-07-03 07:33:05 +00:00
Gorka Sanchez 28f99d2c27 Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop' 
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres

See merge request artica/pandorafms!5713
 2023-06-30 11:39:50 +00:00
miguel angel rasteu ac92b5979c #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-06-30 08:35:37 +02:00
Jorge Rincon ada52da898 #10850 agent detail view added to favorites system 2023-06-29 16:09:07 +02:00
Rafael Ameijeiras d082687c44 Merge branch 'ent-10020-Eliminar-login-hash-de-vistas-metaconsola' into 'develop' 
Ent 10020 eliminar login hash de vistas metaconsola

See merge request artica/pandorafms!5839
 2023-06-29 09:55:53 +00:00
Rafael Ameijeiras 3c87f090d5 Merge branch 'ent-9928-Entrecomillar-campos-en-exportacion-CSV-para-la-vista-de-eventos' into 'develop' 
wrap csv fields with string delimiter on export

See merge request artica/pandorafms!5854
 2023-06-29 09:49:29 +00:00
alejandro.campos@artica.es 1225c055a1 removed hash in url from agent id link 2023-06-28 09:35:49 +02:00
Matias Didier 63ee67bdff Merge branch 'ent-11143-se-descoloca-menu-de-paginas-al-pasar-de-14' into 'develop' 
Ent 11143 se descoloca menu de paginas al pasar de 14

See merge request artica/pandorafms!5902
 2023-06-27 13:24:37 +00:00
Matias Didier ac25997f45 Merge branch 'ent-10963-icono-de-reset-erroneo' into 'develop' 
Ent 10963 icono de reset erroneo

See merge request artica/pandorafms!5770
 2023-06-27 12:16:36 +00:00
Rafael Ameijeiras d0f33605e0 Merge branch 'ent-10815-operaciones-masivas-permiten-cambiar-parametros-que-deberian-estar-bloqueados-de-modulos-de' into 'develop' 
Ent 10815 operaciones masivas permiten cambiar parametros que deberian estar bloqueados de modulos de

See merge request artica/pandorafms!5823
 2023-06-27 12:07:15 +00:00
Rafael Ameijeiras 7fd836d8de Merge branch 'ent-11503-campo-comments-ocupa-mucho-para-lo-que-muestra-eventos' into 'develop' 
Ent 11503 campo comments ocupa mucho para lo que muestra eventos

See merge request artica/pandorafms!6158
 2023-06-27 11:22:44 +00:00
miguel angel rasteu f934d72af9 #11143 Fix auto width modal 2023-06-27 13:09:57 +02:00
Matias Didier fc3a0766f8 Merge branch 'ent-11152-parametro-de-filtro-de-monitor-detail-se-desmarca-solo' into 'develop' 
Ent 11152 parametro de filtro de monitor detail se desmarca solo

See merge request artica/pandorafms!5886
 2023-06-27 08:55:29 +00:00
miguel angel rasteu f33e569e7b #11503 Fix event class 2023-06-26 17:09:38 +02: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
Diego Muñoz-Reja 746c12ff9d Merge branch 'ent-11640-snmp-browser-no-carga-en-v772' into 'develop' 
Ent 11640 snmp browser no carga en v772

See merge request artica/pandorafms!6164
 2023-06-26 09:52:42 +00:00
Rafael Ameijeiras f6a5e161f8 Merge branch 'ent-10765-meter-confirmacion-en-el-borrado-de-mapas' into 'develop' 
Ent 10765 meter confirmacion en el borrado de mapas

See merge request artica/pandorafms!5805
 2023-06-26 07:30:48 +00: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
Jonathan 70aa6eb0f2 #11640 fix snmp browser and policy manager snmp 2023-06-22 10:37:33 +02:00
Gorka Sanchez 5020845aea Merge branch 'ent-11574-graficas-del-network-explorer-(netflow)' into 'develop' 
Ent 11574 Graficas del network explorer (netflow)

See merge request artica/pandorafms!6119
 2023-06-21 10:11:36 +00:00
miguel angel rasteu 36ee57ce65 #11503 Fix td comment width 2023-06-21 10:43:28 +02:00
Jonathan 5224b0e9d0 #11625 Events - icons event type 2023-06-20 14:35:33 +02:00
Daniel Cebrian 4bda7090b7 #11335 controled name and group in network maps 2023-06-19 16:33:56 +02:00
Jonathan 9fd08c928a #11573 network filters 2023-06-19 16:14:21 +02:00
alejandro.campos@artica.es 77ff766f84 remove legacy visual console 2023-06-19 15:25:37 +02:00
Daniel Cebrian 01d48c7ba4 #11567 new about window in operation 2023-06-19 15:09:30 +02:00
Daniel Maya d711533f1a #11562 Fixed filter 2023-06-19 12:33:52 +02:00
Daniel Maya 18c4f7295b #11562 Fixed snmp walk 2023-06-15 15:49:06 +02:00
Daniel Cebrian 6ef2173632 #11574 changed netflow graph 2023-06-15 14:46:31 +02:00
Rafael Ameijeiras 1478673f4b Merge branch 'ent-11538-vista-de-eventos-sonoros-rota-con-el-tema-negro' into 'develop' 
Ent 11538 vista de eventos sonoros rota con el tema negro

See merge request artica/pandorafms!6087
 2023-06-15 07:47:50 +00:00
Jorge Rincon f153e59caf #11538 Fixed styles for the Discovered alerts tab 2023-06-14 13:51:21 +02:00
Calvo a1e55b9408 Fix get remote image size 2023-06-14 12:54:44 +02:00