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

775 Commits

Author SHA1 Message Date
Diego Muñoz-Reja 5296466d0b Merge branch 'ent-13668-release-777' into 'develop' 
fix errors in translations pandora_enterprise#13668

See merge request artica/pandorafms!7386
 2024-05-24 11:10:21 +00:00
Enrique Martin 7076426b28 cve-2024-35307 2024-05-23 12:49:26 +02:00
daniel a5aecac20c Merge remote-tracking branch 'origin/develop' into ent-13668-release-777 2024-05-21 08:23:51 +02:00
Rafael Ameijeiras 042accbc22 Merge branch 'ent-13312-cambios-en-licencia-y-update-manager-para-version-777' into 'develop' 
Ent 13312 cambios en licencia y update manager para version 777

See merge request artica/pandorafms!7302
 2024-05-20 08:04:35 +00:00
daniel d2417257bf fix errors in translations pandora_enterprise#13668 2024-05-15 18:27:25 +02:00
daniel d9cd306ab8 fix errors in translations pandora_enterprise#13668 2024-05-15 14:08:44 +02:00
Daniel Maya a4972ec3fe #13312 new free license 3 2024-05-08 17:54:13 +02:00
Pablo Aragon ecb98c3c82 13604-Remove compound options when creating severities. Change Priority->Severity. WIP 2024-05-03 12:53:12 +02:00
Jorge Rincon cae5bcd164 #13433 Fixed error 500 when filtering. The none option is left by default when loading report data 2024-04-19 10:25:59 +02:00
Jonathan 90ab285a90 #13218 fix ssl for pdf grpahs 2024-04-16 13:40:54 +02:00
Matias Didier 8195f082ea Merge branch 'ent-13171-configuracion-de-recepcion-de-logs' into 'develop' 
Ent 13171 configuracion de recepcion de logs

See merge request artica/pandorafms!7131
 2024-04-10 11:11:59 +00:00
daniel 6c4c43daee fixed mergetool pandora_enterprise#13063 2024-04-08 12:22:31 +02:00
Matias Didier 652f9a53b9 Merge branch 'ent-12893-usuario-sin-grupo' into 'develop' 
added check to group deletion

See merge request artica/pandorafms!6983
 2024-04-05 11:45:03 +00:00
Jonathan 43f006038e #13171 log collector move and notification 2024-04-03 12:14:18 +02:00
Rafael Ameijeiras 6bc3f777bc Merge branch 'ent-13149-mensajes-log-auditoria-hack-attempt' into 'develop' 
Ent 13149 Mensajes log auditoria: Hack attempt

See merge request artica/pandorafms!7064
 2024-03-26 11:33:21 +00:00
Daniel Cebrian 1ef4aa4551 #13130 fixed filter graph 2024-03-22 12:38:50 +01:00
Daniel Cebrian f1827fc56b #13149 remove message audit from check_login 2024-03-21 17:20:12 +01:00
alejandro.campos@artica.es a35749314d Merge remote-tracking branch 'origin/develop' into ent-12893-usuario-sin-grupo 2024-03-20 12:57:40 +01:00
daniel 7db8c17823 api change path v1 to v2 pandora_enterprise#13019 2024-03-13 09:07:58 +01:00
Daniel Cebrian 1125f64e89 #12994 fixed message error sql in history db 2024-03-07 13:28:34 +01:00
Rafael Ameijeiras d3f931703b Merge branch 'ent-12630-guardia-15143-problemas-con-cifrado-de-contrasenas-smtp' into 'develop' 
Ent 12630 guardia 15143 problemas con cifrado de contrasenas smtp

See merge request artica/pandorafms!6753
 2024-03-06 08:42:13 +00:00
Rafael Ameijeiras 5941aac339 Merge branch 'ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD' into 'develop' 
visual changes in demo view

See merge request artica/pandorafms!6916
 2024-03-05 07:59:04 +00:00
alejandro.campos@artica.es ead051073b added check to group deletion 2024-02-29 09:33:05 +01:00
alejandro.campos@artica.es 8ff87ec93a Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-13 09:36:36 +01:00
daniel 851b046add Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-12 08:05:36 +01:00
alejandro.campos@artica.es ecfef0da29 several changes 2024-02-09 18:48:32 +01:00
alejandro.campos@artica.es df8c14864c improvements 2024-02-09 10:37:04 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
daniel daa2a09e82 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-29 10:24:54 +01:00
daniel 00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-01-25 15:57:20 +01:00
Daniel Cebrian fd8d233cf8 #12460 fixed deprecated 2024-01-24 13:28:43 +01:00
daniel bdc500c1b0 new api 2.0 2024-01-16 08:05:45 +01:00
Rafael Ameijeiras 5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop' 
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
 2023-12-21 12:00:44 +00:00
Jonathan 59866d9949 #12398 remove transactional_view 2023-12-21 12:39:10 +01:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
 2023-12-19 09:39:24 +01:00
Jonathan 82e4eb46e0 #12667 move translate string to open 2023-12-18 10:51:48 +01:00
Jonathan 8a6efadc7c #12398 fix url mcros to macros 2023-12-13 15:31:06 +01:00
Jonathan 475453ac3d #12398 fix minor errors 2023-12-13 08:02:43 +01:00
Jonathan c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
Daniel Maya e9d0002d4e #12630 Fixed double safe_input 2023-12-11 15:26:57 +01:00
daniel a418673489 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-11 11:09:54 +01:00
miguel angel rasteu 6455314f0c Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-12-05 11:16:42 +01:00
daniel 77cf0ce6ca Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-05 08:02:55 +01:00
Daniel Rodriguez a7abf4add7 Merge branch 'ent-12382-16531-permitir-cambiar-la-url-del-pdf-para-que-el-chromium-pueda-acceder-a-ella' into 'develop' 
fix chart_generator pdf pandora_enterprise#12382

See merge request artica/pandorafms!6679
 2023-12-04 13:38:18 +00:00
miguel angel rasteu 41b92cc55f Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-12-01 10:34:43 +01:00
miguel angel rasteu b8574cf689 #11494 Resolve conflicts 2023-11-23 08:24:15 +01:00
daniel 0f9facb999 fix chart_generator pdf pandora_enterprise#12382 2023-11-16 13:17:25 +01:00
daniel 868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02:00
Daniel Cebrian 4d9679648d Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-10-20 09:59:05 +02:00
Calvo 480b6828b6 chart generator secured with apipass 2023-10-11 14:25:58 +02:00