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

7821 Commits

Author SHA1 Message Date
Daniel Maya 030ffc55f9 resolved conflict 2023-10-06 09:15:38 +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
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02: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
Daniel Maya d096fa263d #11914 Added log_alerts 2023-09-27 11:05:06 +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
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
Daniel Maya d4e2fb4fea resolved conflict 2023-09-21 18:04:15 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +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
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
felix.suarez 976a32617f Add logic to complex alerts 2023-09-20 08:18:39 -05:00
Félix Suárez 2de84982cf Updates to save new Complex templates 2023-09-20 08:16:22 -05:00
Daniel Cebrian 592d7ab745 #11807 fixed empty field agent 2023-09-19 09:21:42 +02:00
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02: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 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
Daniel Cebrian ca928bd4a4 #11807 new input interval in report hardening 2023-09-18 09:41:53 +02:00
Pablo Aragon bed83f1406 11839-Add max in User->Block size pagination 2023-09-18 08:23:05 +02:00
Daniel Cebrian f1c153231f #11807 added period in evolution 2023-09-15 14:55:49 +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
daniel 09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
Daniel Cebrian 8ecb57a498 #11807 fixed bug in open 2023-09-13 13:53:53 +02:00
Pablo Aragon 959a2e9110 11806-Add alert icon in Manage agent 2023-09-13 08:14:11 +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 Cebrian 8d0213f841 #11807 fixed selected module in report list check 2023-09-12 12:13:01 +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
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +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
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
Daniel Cebrian 39a44828fc Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-07 13:55:48 +02:00
Calvo 9deccd7d29 Fix OS stats for group report 2023-09-07 12:41:37 +02:00
alejandro.campos@artica.es 753851410e implemented os version management 2023-09-06 17:02:15 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +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