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

19825 Commits

Author SHA1 Message Date
Rafael Ameijeiras e1d8f862ae Merge branch 'ent-12166-estilos-calendarios' into 'develop' 
Ent 12166 estilos calendarios

See merge request artica/pandorafms!6529
 2023-10-06 07:32:11 +00:00
Matias Didier ee6ef65da6 Merge branch 'ent-12029-vista-heatmap-tamano-de-texto-muy-grande' into 'develop' 
Ent 12029 vista heatmap tamano de texto muy grande

See merge request artica/pandorafms!6534
 2023-10-06 07:07:30 +00:00
artica c616d2cf49 Auto-updated build strings. 2023-10-06 01:00:29 +02:00
Calvo d091ee8194 Migration dicovery fix bugs and changed script paths 2023-10-05 10:52:52 +02:00
Daniel Maya 9bdaed3cd0 #11818 Fixed refresh 2023-10-05 09:31:43 +02:00
artica 8225384e55 Auto-updated build strings. 2023-10-05 01:00:25 +02:00
alejandro.campos@artica.es 17f5b0dede quick shell changes 2023-10-04 18:00:19 +02:00
Jorge Rincon 80807ae085 #12166 fixed style of selected item in calendar 2023-10-04 16:46:43 +02:00
Calvo db291c77f5 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-10-04 16:21:29 +02:00
Daniel Maya ae0bb2022d #12029 Fixed font size 2023-10-04 15:42:19 +02:00
artica b9f94050a2 Auto-updated build strings. 2023-10-04 01:00:26 +02:00
Daniel Maya a842c8249f #12087 Fixed report with fatal error 2023-10-03 15:44:27 +02:00
Jorge Rincon a685a04493 #12166 fixed calendar button and border styles 2023-10-03 15:42:57 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
artica 19821c4a40 Auto-updated build strings. 2023-10-03 01:00:30 +02:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
alejandro.campos@artica.es 12fbd1e522 some functional changes in gotty 2023-10-02 13:57:11 +02:00
Rafael Ameijeiras b0d12c8a18 Merge branch 'ent-12081-añadir-el-lapso-de-tiempo-none-para-el-filtro-de-los-informes-en-la-vista-HTML-por-defecto' into 'develop' 
Ent 12081 añadir el lapso de tiempo none para el filtro de los informes en la vista html por defecto

See merge request artica/pandorafms!6496
 2023-10-02 11:23:35 +00:00
Rafael Ameijeiras 958c428e91 Merge branch 'ent-12142-error-500-cuando-la-consola-no-conecta-con-la-DB' into 'develop' 
Ent 12142 error 500 cuando la consola no conecta con la db

See merge request artica/pandorafms!6515
 2023-10-02 10:02:50 +00:00
Rafael Ameijeiras 439d5b54aa Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop' 
Agents show events 24h switch checked default

See merge request artica/pandorafms!6405
 2023-10-02 07:08:52 +00:00
artica 323572a4c7 Auto-updated build strings. 2023-10-02 01:00:18 +02:00
artica f6fdd587e7 Auto-updated build strings. 2023-10-01 01:00:18 +02:00
artica 7a890d5820 Auto-updated build strings. 2023-09-30 01:00:22 +02:00
Calvo bfe9bcaac0 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-09-29 15:18:08 +02:00
Jorge Rincon 418624000f #12142 Caught bd exception in php version 8.0 and 8.2 2023-09-29 09:21:08 +02:00
artica 477d3e62f8 Auto-updated build strings. 2023-09-29 01:00:27 +02:00
alejandro.campos@artica.es 85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +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
alejandro.campos@artica.es 70ad1ea986 minor changes 2023-09-28 13:08:33 +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
artica 52f63a6f12 Auto-updated build strings. 2023-09-28 01:00:23 +02:00
alejandro.campos@artica.es 3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
Rafael Ameijeiras 6acbc5b684 Merge branch 'ent-12050-security-hardening-console-widget-dashboard' into 'develop' 
Ent 12050 Security hardening: Console - Widget dashboard

See merge request artica/pandorafms!6450
 2023-09-27 14:07:04 +00:00
alejandro.campos@artica.es 57a0249982 implmented cron in open 2023-09-27 11:38:00 +02:00
alejandro.campos@artica.es 831ed2570d implemented cron in open 2023-09-27 11:35:57 +02:00
Calvo 0b4ee35780 Fix query agent events 2023-09-27 11:01:21 +02:00
Jorge Rincon d1f2fa4b44 #12113 Set select to close when an option is chosen 2023-09-27 10:50:33 +02:00
artica da935b6569 Auto-updated build strings. 2023-09-27 01:00:22 +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
artica fbeb616eb8 Auto-updated build strings. 2023-09-26 01:00:25 +02:00
Jorge Rincon db7a5e121d Add the None option to the date filter to prioritize the period of the report items. 2023-09-25 17:10:43 +02: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 60c3bb456a Merge branch 'ent-12099-cabecera-de-filtros-descuadrada-en-informes-vista-html' into 'develop' 
Ent 12099 cabecera de filtros descuadrada en informes vista html

See merge request artica/pandorafms!6480
 2023-09-25 11:22:08 +00:00
Diego Muñoz-Reja 738428a816 Merge branch 'ent-12090-editar-intevalos-por-defecto' into 'develop' 
Ent 12090 editar intevalos por defecto

See merge request artica/pandorafms!6467
 2023-09-25 09:27:49 +00:00
miguel angel rasteu 4b999b79d3 #12099 Fix filter position 2023-09-25 10:57:46 +02:00
miguel angel rasteu 9a5a1f02bf #12099 Fix filter position 2023-09-25 09:55:55 +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
artica 8c19a075c3 Auto-updated build strings. 2023-09-25 01:00:18 +02:00
artica fa2e94eea3 Auto-updated build strings. 2023-09-24 01:00:19 +02:00
artica 7b3b1f9ccc Auto-updated build strings. 2023-09-23 01:00:21 +02:00
daniel c6a04d5d8f fix show comment events ticket pandora_enterprise#12066 2023-09-22 12:56:01 +02:00
artica b706376fa7 Auto-updated build strings. 2023-09-22 01:00:25 +02:00
Rafael Ameijeiras 56cb2c3232 Merge branch 'ent-12060-quitar-subrayado-curvo-en-las-pestanas-de-eventos' into 'develop' 
Ent 12060 quitar subrayado curvo en las pestanas de eventos

See merge request artica/pandorafms!6453
 2023-09-21 15:45:50 +00:00
Rafael Ameijeiras fb45a73279 Merge branch 'ent-12027-tree-view-muestra-raro-los-elementos-en-modo-quiet' into 'develop' 
Ent 12027 tree view muestra raro los elementos en modo quiet

See merge request artica/pandorafms!6473
 2023-09-21 15:45:12 +00:00
Rafael Ameijeiras d136b7a9e3 Merge branch 'ent-9857-complex-alert-processing' into 'develop' 
Ent-9857-complex-alert-processing

Closes pandora_enterprise#9857

See merge request artica/pandorafms!6347
 2023-09-21 15:41:24 +00:00
Rafael Ameijeiras 902317fa70 Merge branch 'ent-12097-operacion-view-summary-en-discovery-tasks-no-funciona' into 'develop' 
Ent 12097 operacion view summary en discovery tasks no funciona

See merge request artica/pandorafms!6479
 2023-09-21 15:40:57 +00: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
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
artica 963664c1d8 Auto-updated build strings. 2023-09-21 01:00:30 +02:00
alejandro.campos@artica.es dbd418d6dc remove trace 2023-09-20 16:01:23 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
Rafael Ameijeiras 2f95504038 Merge branch 'ent-12001-modulos-de-inventario-no-se-muestran' into 'develop' 
Ent 12001 Módulos de inventario no se muestran

See merge request artica/pandorafms!6465
 2023-09-20 13:49:07 +00:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
Félix Suárez 2de84982cf Updates to save new Complex templates 2023-09-20 08:16:22 -05:00
Jonathan dc9b47a904 #12027 tree view quiet mode 2023-09-20 13:51:56 +02:00
Daniel Cebrian 73d179e52f #12001 added autoselect module in inventory 2023-09-20 12:14:55 +02:00
Jonathan aea61a6144 #12060 fix border radius sound events 2023-09-20 11:57:16 +02:00
Rafael Ameijeiras 06e23338cb Merge branch 'ent-12089-lineas-dobles-en-la-vista-de-modulos' into 'develop' 
Ent 12089 lineas dobles en la vista de modulos

See merge request artica/pandorafms!6466
 2023-09-20 09:00:41 +00:00
Rafael Ameijeiras 65b4bba0c6 Merge branch 'ent-11807-security-hardening-console-informes' into 'develop' 
Ent 11807 Security hardening: Console - Informes

See merge request artica/pandorafms!6292
 2023-09-20 07:59:02 +00:00
artica 92b8446110 Auto-updated build strings. 2023-09-20 01:00:27 +02:00
miguel angel rasteu 954a225279 #12090 Fix intervals 2023-09-19 17:47:12 +02:00
Daniel Cebrian cba3e39f6c Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-19 17:32:06 +02:00
miguel angel rasteu 6609571482 #12089 Add nowrap class to timestamp 2023-09-19 17:21:44 +02:00
Rafael Ameijeiras 8b267c530f Merge branch 'ent-12006-filtro-order-by-agent-de-inventario-rompe-la-vista-si-se-especifica-modulo' into 'develop' 
Ent 12006 Filtro "Order by agent" de inventario rompe la vista si se especifica módulo

See merge request artica/pandorafms!6459
 2023-09-19 10:09:40 +00:00
Rafael Ameijeiras e5ea35abca Merge branch 'ent-12072-error-al-crear-item-sql-en-metaconsola-con-local-metaconsole' into 'develop' 
fix error report sql pandora_enterprise#12072

See merge request artica/pandorafms!6458
 2023-09-19 10:09:02 +00:00
Daniel Cebrian 0a7152f3fa #12050 align text left in widget 2023-09-19 09:44:46 +02:00
artica 1bb1bb11b2 Auto-updated build strings. 2023-09-19 01:00:29 +02:00
Daniel Cebrian 6e794f74bb Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-18 16:54:16 +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
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Daniel Cebrian 5491feb845 #12050 control widget installed only in interprise 2023-09-18 16:09:23 +02:00
Daniel Cebrian 67ebf73bc0 #12050 widget security hardening 2023-09-18 15:57:09 +02:00
Rafael Ameijeiras 83732250da Merge branch 'ent-11363-automonitoring-alertserver' into 'develop' 
Ent-11363-automonitoring-alertserver

Closes pandora_enterprise#11363

See merge request artica/pandorafms!6406
 2023-09-18 13:20:37 +00:00
Rafael Ameijeiras a75369aeda Merge branch 'ent-11839-error-en-direccion-url-por-correo-electronico-con-incorrect-config-value-y-error-en-causa-raiz' into 'develop' 
Ent 11839 error en direccion url por correo electronico con incorrect config value y error en causa raiz

See merge request artica/pandorafms!6381
 2023-09-18 13:18:36 +00:00
Daniel Cebrian 1e9e74ce92 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard 2023-09-18 12:15:17 +02:00
Daniel Cebrian adbbb688de #12006 fixed interface in inventary widget 2023-09-18 12:11:45 +02:00
daniel b167a4b4c5 fix error report sql pandora_enterprise#12072 2023-09-18 11:55:01 +02:00
Daniel Rodriguez 6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop' 
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
 2023-09-18 07:55:18 +00: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
artica 2c055a4488 Auto-updated build strings. 2023-09-18 01:00:20 +02:00
artica 4450f4d5fe Auto-updated build strings. 2023-09-17 01:00:20 +02:00
artica 495780b8a8 Auto-updated build strings. 2023-09-16 01:00:25 +02:00
Daniel Cebrian 25e0834db0 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-15 14:57:18 +02:00
Jorge Rincon 08fe98a8ba fixed filter display permissions in modal 2023-09-15 13:57:14 +02:00
Daniel Cebrian 2844dfd4f0 #11807 fixed export csv in hardening, fixed interval time in exports report and fixed modal error in reports 2023-09-15 13:34:07 +02:00
artica 95f9ddba01 Auto-updated build strings. 2023-09-15 01:00:29 +02:00
Daniel Cebrian 977a18b829 #11807 fixed pdf exports in hardening 2023-09-14 17:56:19 +02:00