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

7766 Commits

Author SHA1 Message Date
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
miguel angel rasteu 91aee79ab2 #12037 Resolve conflicts 2023-09-12 15:07:00 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel 5093d54137 ITSM pandora_enterprise#11471 2023-09-11 18:14:32 +02:00
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
miguel angel rasteu 99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/functions_menu.php
 2023-09-08 13:11:52 +02:00
daniel 3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
Rafael Ameijeiras 885ed9747b Merge branch 'ent-11953-informe-group-report-en-meta-no-muestra-mas-nodos-que-el-1' into 'develop' 
Ent 11953 informe group report en meta no muestra mas nodos que el 1

See merge request artica/pandorafms!6408
 2023-09-08 07:25:04 +00:00
Calvo 9deccd7d29 Fix OS stats for group report 2023-09-07 12:41:37 +02:00
Rafael Ameijeiras 81ef243d66 Merge branch 'ent-11889-quitar-legacy-de-las-tareas-de-netscan-y-ipam' into 'develop' 
Ent 11889 quitar legacy de las tareas de netscan y ipam

See merge request artica/pandorafms!6411
 2023-09-06 14:33:39 +00:00
Rafael Ameijeiras a67b943c17 Merge branch 'ent-11985-fallo-al-guardar-valores-por-defecto-en-snmp-v3' into 'develop' 
Fix default values for SNMP v3 modules

See merge request artica/pandorafms!6407
 2023-09-06 09:29:54 +00:00
Rafael Ameijeiras e3c30ad313 Merge branch 'ent-11964-16168-errores-editor-alertas-snmp' into 'develop' 
Ent 11964 16168 errores editor alertas snmp

See merge request artica/pandorafms!6377
 2023-09-06 09:28:21 +00:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Calvo 5059d67d61 Fix default values for SNMP v3 modules 2023-09-05 14:20:17 +02:00
Calvo c0fbfda25c Merge remote-tracking branch 'origin/develop' into ent-11953-informe-group-report-en-meta-no-muestra-mas-nodos-que-el-1 2023-09-05 13:32:45 +02:00
Jorge Rincon bd9aecb168 The word legacy has been removed from the ipam and netscan tasks 2023-09-05 11:19:34 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop' 
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
 2023-09-05 07:50:45 +00:00
Calvo deb1b0d88b Fix meta group report always selecting one node 2023-09-04 17:41:50 +02:00
Calvo 57c608a28f Fix meta group report always selecting one node 2023-09-04 17:36:28 +02:00
Calvo e1829d5bea Fix default values for SNMP v3 modules 2023-09-04 17:18:01 +02:00
daniel a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Gorka Sanchez 2afd8d3ff3 Merge branch 'ent-11781-unauthenticated-admin-account-takeover-via-malicious-agent-and-xss' into 'develop' 
Ent 11781 unauthenticated admin account takeover via malicious agent and xss

See merge request artica/pandorafms!6362
 2023-08-31 10:34:30 +00:00
Gorka Sanchez 34ddf9e06c Merge branch 'ent-11734-paradas-planificadas-periodicas-y-de-cron-no-deshabilitan-los-modulos' into 'develop' 
Fix cron and periodically module planned downtimes

See merge request artica/pandorafms!6248
 2023-08-31 10:33:18 +00:00
Gorka Sanchez 0d4a097a48 Merge branch 'ent-10622-anadir-acciones-sobre-alertas-y-alertas-externas-en-politicas-de-manera-masiva' into 'develop' 
Ent 10622 anadir acciones sobre alertas y alertas externas en politicas de manera masiva

See merge request artica/pandorafms!6331
 2023-08-31 06:48:45 +00:00
miguel angel rasteu 6305d13a86 #11964 Fix snmp alerts editor 2023-08-30 11:57:40 +02:00
Jonathan b83c8c6da6 #10622 fix bug 2023-08-29 14:08:06 +02:00
Jonathan 4ca9b6d8d2 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-29 12:29:41 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
Calvo 32d67361b4 Fix planned downtime string 2023-08-28 10:43:06 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
miguel angel rasteu 73773e6ff9 #11781 clean custom_id 2023-08-25 13:42:41 +02:00
Jonathan e986ac27d6 #10622 add action full name 2023-08-24 13:14:31 +02:00
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
Matias Didier 9e747e9952 Merge branch 'ent-11873-paradas-planificadas-de-modulos-ponen-en-modo-quiet-agente-en-vez-de-modulos' into 'develop' 
Ent 11873 paradas planificadas de modulos ponen en modo quiet agente en vez de modulos

See merge request artica/pandorafms!6345
 2023-08-24 08:43:28 +00:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
daniel 512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' 
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
 2023-08-23 05:56:19 +00:00
Rafael Ameijeiras 1bca8b0006 Merge branch 'ent-11819-cambios-en-wizard-de-las-consolas-visuales' into 'develop' 
Ent 11819 cambios en wizard de las consolas visuales

See merge request artica/pandorafms!6338
 2023-08-23 05:54:46 +00:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Jonathan 631a247f19 #10622 fix style policy alerts external 2023-08-21 14:50:51 +02:00
miguel angel rasteu 19fb83cd92 #11051 Fix css conflict 2023-08-21 13:16:53 +02:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
Jorge Rincon 35a7c409bf #11873 Fixed Scheduled Downtime quiet mode for modules 2023-08-21 13:03:44 +02:00
Rafael Ameijeiras b91798947e Merge branch 'ent-10603-personalizacion-weekly-mail-report' into 'develop' 
Ent 10603 personalizacion weekly mail report

See merge request artica/pandorafms!6263
 2023-08-21 10:22:10 +00:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00