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

29065 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
artica 8225384e55 Auto-updated build strings. 2023-10-05 01:00:25 +02:00
Jorge Rincon 80807ae085 #12166 fixed style of selected item in calendar 2023-10-04 16:46:43 +02:00
Daniel Maya ae0bb2022d #12029 Fixed font size 2023-10-04 15:42:19 +02:00
miguel angel rasteu 27bee15d50 #12172 Change truncate event name limit to description_size_text 2023-10-04 12:56:28 +02:00
artica b9f94050a2 Auto-updated build strings. 2023-10-04 01:00:26 +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
Matias Didier 9e4903e545 Merge branch 'ent-12145-16086-gis-no-carga-en-mapas' into 'develop' 
Ent 12145 16086 gis no carga en mapas

See merge request artica/pandorafms!6514
 2023-10-03 08:52:21 +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
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
Enrique Martin c19a76e58e Merge branch 'ent-10923-scripts-cloud-para-el-nuevo-discovery-2' into 'develop' 
added discovery cloud plugins in MR

See merge request artica/pandorafms!6513
 2023-10-02 07:54:54 +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
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
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
Jonathan a1d170cf0f #12145 remove maxlength 2023-09-28 11:47:58 +02:00
Jonathan c577fedff4 #12145 remove maxlength 2023-09-28 11:46:15 +02:00
alejandro fd6757dbde added discovery cloud plugins in MR 2023-09-28 11:08:38 +02:00
artica 52f63a6f12 Auto-updated build strings. 2023-09-28 01:00:23 +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
Calvo 0b4ee35780 Fix query agent events 2023-09-27 11:01:21 +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
Rafael Ameijeiras a69550c733 Merge branch 'ent-12071-16277-columna-secondary-groups-en-la-vista-de-inventario-no-muestra-nada' into 'develop' 
Fix inventory view agent secondary groups

See merge request artica/pandorafms!6456
 2023-09-26 15:14:47 +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
Diego Muñoz-Reja 5079cb9256 Merge branch 'ent-12044-consola-acustica-rota-en-version-open' into 'develop' 
Ent 12044 consola acustica rota en version open

See merge request artica/pandorafms!6469
 2023-09-25 08:23:34 +00: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
miguel angel rasteu f2bda1e58d #12099 Fix filter position 2023-09-22 13:05:29 +02:00
daniel c6a04d5d8f fix show comment events ticket pandora_enterprise#12066 2023-09-22 12:56:01 +02:00
Rafael Ameijeiras 1ffebcf49c Merge branch 'ent-11990-error-al-configurar-un-servicio-existente' into 'develop' 
Ent 11990 error al configurar un servicio existente

See merge request artica/pandorafms!6470
 2023-09-22 06:59:42 +00:00
artica b706376fa7 Auto-updated build strings. 2023-09-22 01:00:25 +02:00