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

5431 Commits

Author SHA1 Message Date
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
daniel 564f714112 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-29 09:46:08 +02: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
daniel 6e3eddff08 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-27 08:23:46 +02: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 e82c1e6881 wip integration integriaIMS pandora_enterprise#11471 2023-06-16 13:47:25 +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
Jorge Rincon eea9a9e47b #11538 Fixed styles for dark theme 2023-06-13 09:12:32 +02:00
Jonathan 2c0d716caa #11093 VC items movement like grid when its enable 2023-06-09 08:45:32 +02:00
Miguel Angel Rasteu 878ec24a17 Merge branch 'develop' into 'ent-11474-inventario-all-no-se-muestra-en-metaconsola' 
# Conflicts:
#   pandora_console/operation/inventory/inventory.php
 2023-06-08 14:52:20 +00:00
Jonathan 0463d3bea3 #11093 grid position recolocation after drag 2023-06-08 13:54:05 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
miguel angel rasteu 115b77d7df #11474 Fix data position 2023-06-08 09:25:36 +02:00
Jonathan dd375dc73e #11093 grid background VC 2023-06-07 12:46:39 +02:00
miguel angel rasteu 0ca464846d #11474 Fix metaconsole inventory 2023-06-07 11:23:12 +02:00
Daniel Maya 6e8f0d1e93 #11469 Fixed add selected modules 2023-06-06 14:55:30 +02:00
Daniel Maya 73de090e60 #11420 Fixed inventory 2023-06-05 17:00:25 +02:00
miguel angel rasteu 4b4e2b0266 #10875 add mw250px to comment column 2023-06-05 16:05:38 +02:00
Daniel Cebrian 3751af36c7 #11418 fixed css in graphs 2023-06-01 15:08:34 +02:00
Daniel Cebrian 54ba66e72a #11418 change graph in agent view 2023-06-01 14:53:45 +02:00
miguel angel rasteu 4e1e9a1d99 #11431 Fix alert conditional table and menu 2023-06-01 12:27:58 +02:00
Rafael Ameijeiras d44eb102e7 Merge branch 'ent-11078-quitar-las-opciones-de-crear-ficheros-y-directorios-en-el-mib-uploader' into 'develop' 
Ent 11078 quitar las opciones de crear ficheros y directorios en el mib uploader

See merge request artica/pandorafms!5826
 2023-05-31 11:23:50 +00:00
Rafael Ameijeiras ea24cc8f1b Merge branch 'ent-10851-problemas-con-fechas-en-el-inventario' into 'develop' 
Ent 10851 problemas con fechas en el inventario

See merge request artica/pandorafms!5729
 2023-05-31 11:15:05 +00:00
Daniel Cebrian eb1e28ce7d #11280 fixed acoustic console name 2023-05-30 17:18:58 +02:00
Daniel Cebrian 2a7eb1e069 #11280 fixed acoustic console name 2023-05-30 17:17:34 +02:00
miguel angel rasteu 6d84353778 #10851 Fix id agent and delete hd 2023-05-30 14:09:32 +02:00
miguel angel rasteu cdb01f1105 #10851 Fix variable name 2023-05-30 14:03:39 +02:00
Rafael Ameijeiras 9196770ba0 Merge branch 'ent-11049-graficas-personalizadas-el-filtro-se-resetea-al-visualizar-la-grafica' into 'develop' 
Ent 11049 graficas personalizadas el filtro se resetea al visualizar la grafica

See merge request artica/pandorafms!5790
 2023-05-30 09:40:36 +00:00
Daniel Cebrian 6b869f8ca8 #11380 fixed arrow in metaconsole table and filter status in monitors view 2023-05-29 10:32:43 +02:00
Jorge Rincon 4984e2608a #11314 Collapses the boxes for modules, alerts and events when the agent does not have this information related 2023-05-26 12:30:36 +02:00
miguel angel rasteu 0c180f7ed3 #11371 Fix inner join error and fix data array 2023-05-26 09:59:08 +02:00
Rafael Ameijeiras 8aeeabdbc1 Merge branch 'ent-11277-15627-15577-public-dashboards-tras-desloguearse-usando-saml-no-funcionan' into 'develop' 
Ent 11277 15627 15577 public dashboards tras desloguearse usando saml no funcionan

See merge request artica/pandorafms!5958
 2023-05-26 07:29:52 +00:00
miguel angel rasteu bd453ea1de #10851 Fix inventory date filter and last update query 2023-05-26 08:36:56 +02:00
Rafael Ameijeiras 1982ef1ebb Merge branch 'ent-11330-mapas-de-red-no-muestran-todos-los-elementos' into 'develop' 
Ent 11330 mapas de red no muestran todos los elementos

See merge request artica/pandorafms!5955
 2023-05-25 14:59:32 +00:00
Rafael Ameijeiras 88c130220d Merge branch 'ent-11298-filtro-se-superpone-al-modulo-remoto-en-metaconsola' into 'develop' 
Ent 11298 filtro se superpone al modulo remoto en metaconsola

See merge request artica/pandorafms!5943
 2023-05-25 14:58:59 +00:00
Daniel Cebrian 562aebfb85 #11312 fixed url public in visual console 2023-05-25 14:01:43 +02:00
miguel angel rasteu cccb03010c #10851 change date order to asc and fix sql query 2023-05-25 10:30:34 +02:00
Daniel Maya 8a62bcf283 #11277 Fixed public_dashboard with saml 2023-05-25 09:51:20 +02:00
Jorge Rincon 2952b1244b #11294 Fixed general search for policies 2023-05-24 11:52:59 +02:00
Daniel Cebrian 8c35fdbce8 #11330 fixed pagination in network map 2023-05-24 09:32:29 +02:00
miguel angel rasteu 8bd1378d45 #11293 Fix the menu to point to the list of reports and the link on all icons 2023-05-23 16:35:55 +02:00
Daniel Rodriguez dbf7d4dcfe Merge branch 'ent-11054-15466-modo-legacy-con-problemas' into 'develop' 
fixed visual errors in legacy VC pandora_enterprise#11054

See merge request artica/pandorafms!5829
 2023-05-23 10:07:14 +00:00
Jorge Rincon 58823d1619 #11298 Removed the SNMP Browser, from create module management policies section 2023-05-23 11:36:52 +02:00
Rafael Ameijeiras 8aae692cb2 Merge branch 'ent-11117-edicion-usuario-entorno-meta-nodo' into 'develop' 
Ent 11117 edicion usuario entorno meta nodo

See merge request artica/pandorafms!5856
 2023-05-22 16:12:04 +00:00
Rafael Ameijeiras 7089b12256 Merge branch 'ent-10994-icono-borroso-en-edicion-de-custom-graph' into 'develop' 
Ent 10994 icono borroso en edicion de custom graph

See merge request artica/pandorafms!5740
 2023-05-22 16:00:55 +00:00
Matias Didier 451bc20330 Merge branch 'ent-11229-al-guardar-filtro-en-netflow-live-view-lo-guarda-sin-nombre' into 'develop' 
Ent 11229 al guardar filtro en netflow live view lo guarda sin nombre

See merge request artica/pandorafms!5927
 2023-05-22 12:31:30 +00:00
miguel angel rasteu 5207585d2b #10994 Fix builder svg 2023-05-22 12:50:29 +02:00
miguel angel rasteu 33d95ef00e #11117 Add new field in tusuario for metaconsole event default and fix selectors 2023-05-22 12:08:27 +02:00
Matias Didier a3787bf2ab Merge branch 'ent-11142-bugs-visuales-en-group-view' into 'develop' 
Ent 11142 bugs visuales en group view

See merge request artica/pandorafms!5882
 2023-05-22 08:25:00 +00:00
miguel angel rasteu 6a1f389109 #11229 Add input text for new filter name 2023-05-22 09:38:01 +02:00
Matias Didier 1523952597 Merge branch 'ent-10869-group_id-en-vista-de-monitorizacion-de-agentes-cambia-aleatoriamente' into 'develop' 
Ent 10869 group id en vista de monitorizacion de agentes cambia aleatoriamente

See merge request artica/pandorafms!5774
 2023-05-18 07:08:19 +00:00
Diego Muñoz-Reja f19134b31f Merge branch 'ent-11119-mejora-estetica-de-la-visualizacion-de-modulos-en-la-vista-detallada-de-agente' into 'develop' 
Ent 11119 mejora estetica de la visualizacion de modulos en la vista detallada de agente

See merge request artica/pandorafms!5855
 2023-05-17 15:39:59 +00:00
Rafael Ameijeiras 1bf3b94100 Merge branch 'ent-11098-snmp-walk-desde-editor-de-modulos-no-te-permite-seleccionar-oid-para-crear-modulo' into 'develop' 
Ent 11098 snmp walk desde editor de modulos no te permite seleccionar oid para crear modulo

See merge request artica/pandorafms!5835
 2023-05-17 14:45:41 +00:00
Rafael Ameijeiras 5bd875d005 Merge branch 'ent-10998-15445-problemas-edicion-usuarios-con-acl-enterprise-en-la-nueva-ui' into 'develop' 
Ent 10998 15445 problemas edicion usuarios con acl enterprise en la nueva ui

See merge request artica/pandorafms!5775
 2023-05-17 14:45:00 +00:00
Diego Muñoz-Reja b2edd9c19a Merge branch 'ent-11120-mejora-estetica-visualizacion-alertas-en-vista-detallada-de-agente' into 'develop' 
Ent 11120 mejora estetica visualizacion alertas en vista detallada de agente

See merge request artica/pandorafms!5838
 2023-05-17 07:06:59 +00:00
Jorge Rincon c3f569fbb1 #11205 Update of styles for the table Active issue on this agent 2023-05-16 15:43:02 +02:00
miguel angel rasteu b16260f08c #11143 Change dialog width to auto 2023-05-16 12:40:37 +02:00
Daniel Rodriguez be807d572d Merge branch 'ent-10081-14644-meta-homescreen-no-aparece-en-edit-my-user-pero-si-en-configuracion-de-usuario' into 'develop' 
Ent 10081 14644 meta homescreen no aparece en edit my user pero si en configuracion de usuario

See merge request artica/pandorafms!5809
 2023-05-16 09:49:59 +00:00
Matias Didier 9603e98903 Merge branch 'ent-11118-no-gis-data-esa-caja-no-se-debe-ver-si-no-hay-datos-gis' into 'develop' 
Ent 11118 no gis data esa caja no se debe ver si no hay datos gis

See merge request artica/pandorafms!5844
 2023-05-16 09:48:56 +00:00
miguel angel rasteu 739414abae #11118 Evaluate if exist array 2023-05-16 11:37:46 +02:00
Daniel Rodriguez 391bb0d3e3 Merge branch 'ent-11173-bugs-en-vista-de-inventario' into 'develop' 
Ent 11173 bugs en vista de inventario

See merge request artica/pandorafms!5881
 2023-05-16 09:30:47 +00:00
Matias Didier 1e3c24c360 Merge branch 'ent-11124-pequenos-cambios-visuales-en-la-lista-detallada-de-agentes' into 'develop' 
Ent 11124 pequenos cambios visuales en la lista detallada de agentes

See merge request artica/pandorafms!5851
 2023-05-16 07:24:02 +00:00
Matias Didier d236c4959d Merge branch 'ent-10984-no-se-muestran-los-nombres-de-los-elementos-al-hacer-hover-en-cv' into 'develop' 
Ent 10984 no se muestran los nombres de los elementos al hacer hover en cv

See merge request artica/pandorafms!5758
 2023-05-12 06:30:33 +00:00
Jorge Rincon b88e765c75 #11152 keep select value in filter 2023-05-11 13:00:32 +02:00
miguel angel rasteu b58a3a79fc #11142 Fix group view table 2023-05-11 11:39:20 +02:00
miguel angel rasteu ef20ab00dd Update get_data_basic_info_sql to order by more filters 2023-05-11 11:10:13 +02:00
miguel angel rasteu 1203ea48aa #10627 Fix conditional 2023-05-10 13:06:33 +02:00
Jonathan c5b2835215 #11119 change visual list of modules agent 2023-05-08 15:37:49 +02:00
alejandro.campos@artica.es e0090aee95 wrap csv fields with string delimiter on export 2023-05-08 14:47:22 +02:00
Jorge Rincon 53bd63a7d5 #11124 Visual changes are made to the detailed list of agents 2023-05-08 14:26:28 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
miguel angel rasteu dab73a6972 #11118 Fix conditional. Don't show anything if don't exists GIS data 2023-05-08 10:10:25 +02:00
Jonathan 5e7a3d96d4 #10976 fix pagination search global 2023-05-08 09:42:17 +02:00
Jorge Rincon 82db353dd1 #11098 The operation of the create module button from the SNPM Walk modal is adjusted 2023-05-05 14:10:41 +02:00
alejandro.campos@artica.es 9c0ef3e5aa send login hash info in post body in meta links to node 2023-05-05 13:05:38 +02:00
Jonathan 49a795fdb9 #10976 datatables seatch agents 2023-05-05 13:04:27 +02:00
alejandro.campos@artica.es 4cac880eca send login hash info in post body in meta links to node 2023-05-05 13:04:02 +02:00
miguel angel rasteu c4d706f08b #11120 Change class and js code to fix the visual style 2023-05-05 13:03:38 +02:00
Jorge Rincon 9ab9087377 #11098 The Create agent module button is enabled 2023-05-04 16:48:20 +02:00
Jonathan 0336f03a6c #10976 search agents 2023-05-04 16:01:08 +02:00
daniel 75eae248a5 fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 13:27:34 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
Pablo Aragon b8bd5c437d 11078-Remove Create files and directories buttons from MIB Uploader 2023-05-04 11:32:04 +02:00
daniel 5f3cbbb12a fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 11:14:11 +02:00
Pablo Aragon aeeae1a2b3 11078-Remove Create files and directories buttons from MIB Uploader 2023-05-04 09:55:32 +02:00
Pablo Aragon 4f9e09b84a 10815-Bulk operations do not edit modules created with policies 2023-05-03 17:01:21 +02:00
miguel angel rasteu c1e35a5d17 #10081 Add option homescreen in metaconsole again 2023-04-28 09:51:30 +02:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' 
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
 2023-04-28 06:04:18 +00:00
Jonathan fdc13256cd #9478 create edit delete alerts from meta 2023-04-27 16:05:37 +02:00
Jorge Rincon 841b1d66d3 #10765 The action of deleting a map is changed to confirmDialog 2023-04-27 14:35:22 +02:00
Daniel Cebrian 4c32c6c888 #11049 hiden Equalize maxiddmum when graph is not Bullet 2023-04-26 13:46:29 +02:00
Daniel Cebrian 48aff76697 #11049 fixed reset time range 2023-04-26 12:55:37 +02:00
Diego Muñoz-Reja 3e0c06b4b7 Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop' 
several minor fixes

See merge request artica/pandorafms!5638
 2023-04-26 08:57:03 +00:00
Pablo Aragon 6540a229e1 10755-Horizontal graph legend & interfaz graph 2023-04-25 13:31:59 +02:00
Daniel Cebrian e1f995744b #10998 fixed acl edit my user 2023-04-25 10:57:21 +02:00
Jorge Rincon 1c41a91c14 #10869 removed the group_id from the url, in the detail agent filter 2023-04-25 10:19:30 +02:00
Jorge Rincon 30697d5b33 #10963 icon change in the reset button, agent detail view 2023-04-24 14:31:20 +02:00
Jonathan 0c2de27774 #10984 title visual console 2023-04-21 11:40:27 +02:00
Jonathan f5c517ae7d #10191 event sound fix select2 2023-04-21 09:30:22 +02:00
Daniel Rodriguez f5a7dd40e9 Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop' 
Ent 10490 theme base de tinymce

See merge request artica/pandorafms!5649
 2023-04-20 11:51:13 +00:00
Matias Didier 086a6f72aa Merge branch 'ent-10342-14680-problema-con-las-busquedas-de-agentes-en-nodo' into 'develop' 
Ent 10342 14680 problema con las busquedas de agentes en nodo

See merge request artica/pandorafms!5646
 2023-04-20 10:28:54 +00:00
Pablo Aragon 9e124933b0 10886-Confict 2023-04-18 10:42:37 +02:00
miguel angel rasteu 9da8e83633 Modified the timestamp according to input data. Added query with the timestamp of the filter. 2023-04-18 09:52:59 +02:00
Rafael Ameijeiras 852e7ae2a0 Merge branch 'ent-10714-mejoras-de-usabilidad-en-vista-de-inventario-export-csv' into 'develop' 
Ent 10714 mejoras de usabilidad en vista de inventario export csv

See merge request artica/pandorafms!5726
 2023-04-17 15:40:19 +00:00
Matias Didier e468c306b9 Merge branch 'ent-10848-mejorar-aspecto-de-formulario-de-graficas-de-interfaces-y-de-las-graficas-de-modulo' into 'develop' 
Ent 10848 mejorar aspecto de formulario de graficas de interfaces y de las graficas de modulo

See merge request artica/pandorafms!5669
 2023-04-17 14:50:32 +00:00
Pablo Aragon bd4066c690 10886-Timestamp events with ui_print_timestamp() 2023-04-17 15:43:53 +02:00
Pablo Aragon 54767d20a3 10848-Small input graph form 2023-04-17 15:30:56 +02:00
Rafael Ameijeiras 54326a444b Merge branch 'ent-10813#15305-Botones-101-no-funcionan-cuando-buscas-modulos-en-el-buscador' into 'develop' 
Ent 10813#15305 botones 101 no funcionan cuando buscas modulos en el buscador

See merge request artica/pandorafms!5723
 2023-04-17 12:34:13 +00:00
Jonathan cbf122f4c6 #10714 csv inventory button 2023-04-17 14:11:16 +02:00
Matias Didier e4fd12f6de Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop' 
Ent 10067 anadir filtro alerts triggered en tree view y widget tree view

See merge request artica/pandorafms!5662
 2023-04-17 11:06:10 +00:00
Pablo Aragon 6bc185e148 10848-confict 2023-04-16 18:06:54 +02:00
Jorge Rincon 4a4c3a0cdb #10813 Adjustment of the buttons in the Graph column 2023-04-14 11:05:55 +02:00
Daniel Rodriguez 895b1bea7c Merge branch 'ent-10945-timestamp-desconocido-en-vista-de-eventos' into 'develop' 
Ent 10945 timestamp desconocido en vista de eventos

See merge request artica/pandorafms!5717
 2023-04-13 14:53:45 +00:00
Rafael Ameijeiras b1ef24cae9 Merge branch 'ent-9464-14144-limitacion-en-el-campo-de-seleccion-etiquetas-metaconsola' into 'develop' 
Ent 9464 14144 limitacion en el campo de seleccion etiquetas metaconsola

See merge request artica/pandorafms!5698
 2023-04-13 12:49:43 +00:00
Daniel Maya a8277dc19f #10945 Fix timestamp 2023-04-13 12:25:18 +02:00
miguel angel rasteu c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02:00
Matias Didier 250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop' 
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
 2023-04-13 08:24:18 +00:00
Jorge Rincon 06203dc503 #9464 fix tag filters 2023-04-12 11:02:35 +02:00
Jonathan b36ade1821 #10191 fix url event sounds 2023-04-11 16:24:37 +02:00
Pablo Aragon 5f1e20e399 10886-Timestamp events with ui_print_timestamp() 2023-04-11 15:31:27 +02:00
Jonathan 3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
daniel 086f742455 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/operation/agentes/ver_agente.php
 2023-04-10 16:42:41 +02:00
daniel 7302a108c0 fixed styles 2023-04-10 12:02:35 +02:00
Jonathan 55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00
Jonathan a0ae7327c7 Conflict solution inventory 2023-04-10 09:23:40 +02:00
Pablo Aragon c8ca3ad68f 10848-Small input graph form 2023-04-05 17:29:28 +02:00
Jonathan 1dbe161ea9 Merge branch 'develop' into ent-9662-second-round 2023-04-05 14:37:13 +02:00
Pablo Aragon 514c1b300c 10867-Tactical view status 2023-04-05 14:33:06 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop' 
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
 2023-04-05 11:55:20 +00:00
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +02:00
Pablo Aragon 73d7345844 10067-Alerts triggered filter tree view 2023-04-05 09:14:01 +02:00
Rafael Ameijeiras cc2709c42c Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop' 
Ent 10699 errores en los mapas varios

See merge request artica/pandorafms!5632
 2023-04-05 06:47:31 +00:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00
Jimmy Olano 89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS. 
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
 2023-04-04 11:57:45 +00:00
Jonathan b1b516d664 Merge branch 'develop' into ent-10490-theme-base-de-tinymce 2023-04-04 11:31:47 +02:00
Jonathan 000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Calvo 764823c93f Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-04-03 10:25:58 +02:00
daniel c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +02:00
Daniel Maya 27c4cc56e0 #10342 Fixed search 2023-03-31 13:27:30 +02:00
Pablo Aragon 426690bc35 10843 & 10844 2023-03-31 10:44:51 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop' 
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
 2023-03-31 07:33:26 +00:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Calvo 307057f934 Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-03-30 15:29:55 +02:00
daniel f2e1b2ef57 fixed styles 2023-03-30 12:36:05 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
daniel 27e13c26c6 fixed styles 2023-03-30 11:40:32 +02:00
alejandro.campos@artica.es e8323e4b00 several minor fixes 2023-03-29 17:45:37 +02:00
Pablo Aragon f26e70630a Blue background & Datatable fix 2023-03-29 17:09:41 +02:00
Pablo Aragon 168d03eecc New qrcode.js version & vcard 2023-03-29 15:35:18 +02:00
Pablo Aragon 2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
daniel e7d08fe6d3 fixed styles 2023-03-29 14:48:47 +02:00
daniel e4383a0573 fixed styles 2023-03-29 14:07:56 +02:00
Pablo Aragon 1a82056039 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 12:13:05 +02:00
Pablo Aragon 7ada30c9b1 10718 & 10821 2023-03-29 12:12:56 +02:00
Jimmy Olano 5044c23ef3 Merge branch 'ent-9529-14208-definir-timezone-por-defecto-para-nuevos-usuarios' into 'develop', JJOS. 
Draft: Ent 9529 14208 definir timezone por defecto para nuevos usuarios

See merge request artica/pandorafms!5492
 2023-03-29 02:28:47 +00:00
Pablo Aragon dab2a29b6b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 17:07:19 +02:00
Pablo Aragon ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02:00
daniel 0df3ad3ff3 fixed styles 2023-03-28 13:44:24 +02:00
Pablo Aragon 5969928003 10408-Fix action column & 10398-Events pure mode 2023-03-28 12:39:02 +02:00
Daniel Maya 712da9070f #10699 Fixed maps 2023-03-28 10:45:41 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop' 
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
 2023-03-27 10:43:48 +00:00
Jonathan 3057e67d1f Merge conflict solution 2023-03-27 12:11:53 +02:00
Matias Didier 2daea0e5c4 Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop' 
Ent 10764 favoritos y nuevos menus

See merge request artica/pandorafms!5618
 2023-03-27 09:01:48 +00:00
Jonathan 0ae7630714 Gis map fix view 2023-03-27 08:44:45 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
daniel abf9fcf200 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-24 14:05:30 +01:00
daniel 25ea15fe0f fixed styles 2023-03-24 14:04:38 +01:00
Matias Didier f931a86f22 Merge branch 'ent-10792-en-version-open-la-vista-tactica-de-grupo-devuelve-error-500-al-solicitar-grupo-all' into 'develop' 
Ent 10792 en version open la vista tactica de grupo devuelve error 500 al solicitar grupo all

See merge request artica/pandorafms!5624
 2023-03-24 12:15:01 +00:00
Pablo Aragon 95edb47d01 10408 2023-03-24 12:29:03 +01:00
Daniel Cebrian 075d0a1c4f #10441 added version file in css 2023-03-24 12:06:40 +01:00
Jimmy Olano eb833f2ad8 Merge branch 'ent-10747-version-open-error-500-en-vista-principal-de-un-agente' into 'develop', JJOS. 
Ent 10747 version open error 500 en vista principal de un agente

See merge request artica/pandorafms!5616
 2023-03-24 10:14:01 +00:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +01:00
Matias Didier 5529c33f0c Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop' 
Ent 10650 bugs funcionales en consolas visuales

See merge request artica/pandorafms!5601
 2023-03-24 09:11:26 +00:00
Daniel Cebrian da742bc15e #10441 added version file in js 2023-03-24 09:13:22 +01:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop' 
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
 2023-03-24 07:25:52 +00:00
daniel bac1a7bf65 fixed styles 2023-03-23 17:44:06 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Daniel Cebrian 2683f9e6dc #10792 fixed error 500 in agent status list 2023-03-23 12:39:55 +01:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Daniel Maya 94c843dac2 #9662 Fixed gis map menu 2023-03-23 10:41:08 +01:00
daniel 72c95a6274 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-22 19:12:16 +01:00
Calvo 96017090ce Netflow monitoring filters forms 2023-03-22 14:22:17 +01:00
Jonathan c52ca613b2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 14:22:08 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
Calvo 784bd2dbcf Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-22 12:31:11 +01:00
Rafael Ameijeiras 3fcf4dfbc5 Merge branch 'ent-10737-15246-error-500-en-mapa-servicios-metaconsola' into 'develop' 
Ent 10737 15246 error 500 en mapa servicios metaconsola

See merge request artica/pandorafms!5617
 2023-03-22 10:34:42 +00:00
daniel 5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' 
# Conflicts:
#   pandora_console/install.php
 2023-03-22 08:23:07 +00:00
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +01:00
Daniel Cebrian a21e43a452 #10764 ignore selected action in fav menu 2023-03-21 15:40:46 +01:00
Jonathan d2d8b43c87 Custom fields agent view change size svg 2023-03-21 13:09:32 +01:00
Daniel Cebrian aec5e6b483 #10737 fixed error 500 in service map 2023-03-21 12:52:24 +01:00
Jonathan 9654ba4fa2 Snmp browser select multiple post 2023-03-21 12:35:25 +01:00
Daniel Cebrian 8e88e0a603 #10747 fixed error 500 in agent 2023-03-21 11:45:38 +01:00
Calvo a69151a3ca Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-21 11:23:02 +01:00
Daniel Cebrian ed7b46eb22 #9662 fixed url tactic in list groups 2023-03-21 09:56:36 +01:00
Jonathan 82dd6ebb37 Metaconsole view reports change 2023-03-21 09:52:21 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
daniel a9633085bc fixed styles 2023-03-17 12:00:51 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00