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

6166 Commits

Author SHA1 Message Date
fbsanchez af45aec166 reporting_label_macro general review 2022-02-16 14:01:23 +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 Barbero Martin c8daf0a977 fix module name finish % pandora_enterprise#8570 2022-02-14 11:13:33 +01:00
Daniel Barbero Martin bc9bb070df fix module name finish % pandora_enterprise#8570 2022-02-14 08:55:14 +01:00
Daniel Barbero Martin 362c1d2a51 fix module name finish % pandora_enterprise#8570 2022-02-11 13:22:35 +01: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 Rodriguez f771e2bf9e Merge branch 'ent-8422-Revision-completa-audit-logs' into 'develop' 
Ent 8422 revision completa audit logs

Closes pandora_enterprise#8422

See merge request artica/pandorafms!4669
 2022-02-10 14:20:42 +00:00
Daniel Rodriguez 3f5b9a21f9 Merge branch 'ent-8552-fallo-subida-pspz-y-pspz2' into 'develop' 
Ent 8552 fallo subida pspz y pspz2

See merge request artica/pandorafms!4684
 2022-02-10 14:10:36 +00:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +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
Luis 611cac2340 Fix plugin registration pspz pspz2 2022-02-08 10:01:17 +01:00
Daniel Barbero Martin ba6d6f9107 calendar not editable pandora_enterprise#3943 2022-02-08 09:38:42 +01:00
fbsanchez 838b6b30e9 php8 compatibility review 2022-02-07 14:32:59 +01:00
Daniel Barbero Martin 0e0e737283 calendar not editable pandora_enterprise#3943 2022-02-07 13:07:48 +01:00
Daniel Barbero Martin dca70fa8ec Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-07 08:04:36 +01:00
fbsanchez e1776d7994 removed collation from filtering 2022-02-04 13:26:03 +01:00
fbsanchez a298b25a38 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-03 17:55:34 +01:00
Jose Gonzalez 1129a801c4 Fix alert commands 2022-02-03 13:49:26 +01:00
Jose Gonzalez 2f356541ea Fixed alert management log 2022-02-03 12:54:50 +01:00
Daniel Rodriguez 9240533de5 Merge branch 'ent-7430-Fallos-visuales-en-Mapas-GIS' into 'develop' 
Ent 7430 fallos visuales en mapas gis

See merge request artica/pandorafms!4657
 2022-02-02 14:05:11 +00:00
Daniel Barbero Martin 3d951749f5 alert template schedule pandora_enterprise#3943 2022-02-02 13:03:52 +01:00
Jose Gonzalez bc6175abad Added audit log in massive operations 2022-02-02 12:45:43 +01:00
fbsanchez 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
Daniel Rodriguez 110052a21f Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop' 
Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos

See merge request artica/pandorafms!4666
 2022-02-02 09:37:15 +00:00
Daniel Rodriguez 2ed2fdfd6c Merge branch 'ent-8276-copiado-paradas-planificadas' into 'develop' 
Planned downtime copy.

See merge request artica/pandorafms!4662
 2022-02-02 09:36:18 +00:00
Daniel Barbero Martin 5060d0b8f7 alert template schedule pandora_enterprise#3943 2022-02-02 10:09:31 +01:00
Daniel Barbero Martin b91109d747 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-02 08:06:05 +01:00
Daniel Barbero Martin b62566af49 alert template schedule pandora_enterprise#3943 2022-02-01 16:50:53 +01:00
fbsanchez 5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-01 15:16:21 +01:00
Daniel Rodriguez 91797c7112 Merge branch 'ent-8470-POST-ocultar-comando-en-respuestas-de-eventos-2' into 'develop' 
added token to display or hide command in event response execution

See merge request artica/pandorafms!4671
 2022-02-01 13:42:14 +00:00
alejandro.campos@artica.es 74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +01:00
José González 36bef528ab Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/massive/massive_delete_agents.php
 2022-02-01 12:45:17 +00:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Daniel Barbero Martin 0a4d6cfd31 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-02-01 11:36:33 +01:00
Daniel Barbero Martin 645257f9dc alert template schedule pandora_enterprise#3943 2022-02-01 11:29:25 +01:00
Daniel Maya f4c92c4854 #7430 Fixed url 2022-02-01 11:17:20 +01:00
Daniel Rodriguez d21d65a7ac Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop' 
Added select filtered modulo to custom graphs conf menu

See merge request artica/pandorafms!4647
 2022-02-01 09:38:12 +00:00
Daniel Barbero Martin 15ada66942 alert template schedule pandora_enterprise#3943 2022-01-31 16:50:48 +01:00
Daniel Barbero Martin c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
alejandro.campos@artica.es b9c78bbfb1 show agent and module name tip 2022-01-31 13:18:26 +01:00
Daniel Barbero Martin 392a9223e8 alert template schedule pandora_enterprise#3943 2022-01-28 14:06:31 +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