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

19721 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 12fbd1e522 some functional changes in gotty 2023-10-02 13:57:11 +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
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
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
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
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
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
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