Commit Graph

14 Commits

Author SHA1 Message Date
fbsanchez cb6184a943 mr fix 2021-12-09 14:02:06 +01:00
fbsanchez 2cbfca2cdd mr rev + timap_sites 2021-12-09 13:51:20 +01:00
Daniel Rodriguez 69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
Daniel Rodriguez 345cbcf5ba Merge branch 'ent-8123-Autenticacion-remota-en-entornos-centralizados' into 'develop'
fix setup centraliced active directory

See merge request artica/pandorafms!4540
2021-11-30 14:44:48 +00:00
Daniel Barbero Martin 347769299b outocreate remote user centralized node 2021-11-30 14:23:19 +01:00
alejandro.campos@artica.es 73cde9ee48 db changes 2021-11-29 14:58:34 +01:00
Calvo 5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Calvo 4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
José González b8d884008b Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls'
# Conflicts:
#   pandora_console/extras/mr/51.sql
2021-11-22 11:44:06 +00:00
Jose Gonzalez 3f395f03dc Added sql file 2021-11-22 12:33:31 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin 25268ec9b4 color 2021-11-02 17:49:45 +01:00
fbsanchez 08d4323941 set deployment_timeout per agent installation file 2021-11-02 17:37:47 +01:00