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

1645 Commits

Author SHA1 Message Date
Daniel Maya 38088ca598 #8966 Fixed tags 2022-05-11 16:04:02 +02:00
Daniel Maya dcdcbfad88 #8786 Fixed delete address 2022-04-04 17:40:51 +02:00
Daniel Rodriguez de75277c8a Merge branch 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' into 'develop' 
Fix missing include

See merge request artica/pandorafms!4741
 2022-03-15 10:47:39 +00:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' 
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
 2022-03-11 08:51:33 +00:00
Luis d1709a631c Merge branch 'develop' into 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' 
# Conflicts:
#   pandora_console/godmode/agentes/configurar_agente.php
 2022-03-10 10:55:12 +00:00
Daniel Rodriguez e637c74dbf Merge branch 'ent-8692-Faltan-iconos-de-configuración-del-agente-en-760' into 'develop' 
Ent 8692 faltan iconos de configuración del agente en 760

See merge request artica/pandorafms!4752
 2022-03-09 13:20:12 +00:00
Daniel Maya 29906b3c53 #8692 Fixed remote config 2 2022-03-09 13:55:49 +01:00
Daniel Rodriguez 09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop' 
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
 2022-03-09 12:48:47 +00:00
Daniel Maya 0a7238fe33 #8692 Fixed remote config 2022-03-09 12:06:21 +01:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
Calvo a34ba86129 Fix missing include 2022-03-04 15:26:47 +01:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
José González 95e8a10fe1 Clean traces 2022-02-25 08:31:14 +01:00
José González 08b393614a Fixed missing char 2022-02-24 14:55:47 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
Daniel Rodriguez 45b97be611 Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop' 
Added token local user to allow enabling local auth  at user level

See merge request artica/pandorafms!4668
 2022-02-18 11:04:06 +00:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
fbsanchez 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
 2022-02-15 17:32:10 +01:00
fbsanchez 7c11a01b85 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 2022-02-15 14:32:50 +01:00
Daniel Rodriguez 6abd7212e6 Merge branch 'ent-7573-Problemas-integracion-Module-Library-vs-Wordpress' into 'develop' 
Ent 7573 problemas integracion module library vs wordpress

Closes pandora_enterprise#7573

See merge request artica/pandorafms!4634
 2022-02-15 10:19:49 +00:00
Daniel Rodriguez cbee39189f Merge branch 'ent-8559-no-aparece-webserver-module' into 'develop' 
Fixed issue with web_available token

Closes pandora_enterprise#8559

See merge request artica/pandorafms!4686
 2022-02-11 10:51:01 +00:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez 9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
 2022-02-10 18:52:51 +01:00
Daniel Barbero Martin b56c9e6529 new modal planned_downtime resume agents/modules pandora_enterprise#5886 2022-02-09 14:57:36 +01:00
Daniel Barbero Martin 625438c1c3 clean file planned_downtime pandora_enterprise#5886 2022-02-09 10:51:18 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
Jose Gonzalez 995095afc7 Fixed issue with web_available token 2022-02-08 11:56:12 +01:00
fbsanchez e9249d550a removed policy stuff from configurar_agente 2022-02-07 18:53:31 +01:00
fbsanchez e1776d7994 removed collation from filtering 2022-02-04 13:26:03 +01:00
Daniel Barbero Martin 1146afe94c bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 13:52:40 +01:00
Daniel Barbero Martin a359fd6828 bulk operation edit agents add secundary groups pandora_enterprise#2152 2022-02-03 12:56:36 +01:00
fbsanchez 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Calvo 11dc743dac Planned downtime copy. 2022-01-28 10:59:08 +01:00
Calvo 0b119af949 WIP:Planned downtime copy. 2022-01-27 18:24:14 +01:00
Calvo a92fe64b64 WIP:Planned downtime copy. 2022-01-27 18:23:07 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Jose Gonzalez 6fb7f317a6 Fix issues with links 2022-01-17 17:13:29 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Daniel Rodriguez 0f82255904 Merge branch 'ent-8421-extension-antigua-backups' into 'develop' 
Ent 8421 extension antigua backups

Closes pandora_enterprise#8421

See merge request artica/pandorafms!4614
 2022-01-11 10:10:29 +00:00
Daniel Rodriguez eb9d1ff70d Merge branch 'ent-8430-mensaje-erroneo-al-cambiar-thresholds-modulo-snmp' into 'develop' 
Fix wrong error message when changing editing snmp modules

See merge request artica/pandorafms!4612
 2022-01-07 11:59:56 +00:00
Daniel Rodriguez e1a1281985 Merge branch 'ent-8363-edicion-de-paradas-planificadas' into 'develop' 
Fix module edidtion on alerts only planned downtime

See merge request artica/pandorafms!4608
 2022-01-05 12:33:11 +00:00
Jose Gonzalez 1e92ad99ad Fix merge 2022-01-05 11:14:04 +01:00
Calvo 14c860aec6 Fix wrong error message when changing editing snmp modules 2022-01-04 17:50:27 +01:00
Calvo d8ab5c1e7f Fix module edidtion on alerts only planned downtime 2022-01-03 11:42:06 +01:00
Calvo e4804db8cb Planned downtime monthly same day on different hours fix 2021-12-29 18:27:18 +01:00
Jose Gonzalez e9b619f507 Fix issue with output 2021-12-24 12:08:25 +01:00
Daniel Rodriguez 7f78a5b514 Merge branch 'ent-8179-Mensaje-anti-hacking-al-intentar-eliminar-modulos' into 'develop' 
minor fix

See merge request artica/pandorafms!4562
 2021-12-23 12:16:54 +00:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00