Daniel Maya
|
c1b4501da5
|
resolved conflict
|
2022-10-03 14:41:14 +02:00 |
Daniel Rodriguez
|
637fae3e8d
|
Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop'
Ent 8898 anida mapas de red no actualizan bien
See merge request artica/pandorafms!5143
|
2022-09-29 12:36:37 +00:00 |
Alejandro Campos
|
b11839dde5
|
Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios'
# Conflicts:
# pandora_console/extras/mr/57.sql
|
2022-09-27 15:24:28 +00:00 |
|
alejandro.campos@artica.es
|
9c7e70c7de
|
changes to mr
|
2022-09-27 17:19:10 +02:00 |
Jimmy Olano
|
84d9b272c3
|
Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop'
implemented alert commands and actions to send report by email
Ref pandora_enterprise#8217
See merge request artica/pandorafms!5104
|
2022-09-27 12:26:24 +00:00 |
Diego Muñoz-Reja
|
aea77db9e9
|
Merge branch 'ent-7827-Control-de-acceso-a-la-consola-por-IP' into 'develop'
Ent 7827 control de acceso a la consola por ip
See merge request artica/pandorafms!5098
|
2022-09-26 11:03:52 +00:00 |
|
Daniel Maya
|
67c8a945bf
|
resolved conflict
|
2022-09-26 11:08:18 +02:00 |
|
alejandro.campos@artica.es
|
520a820625
|
Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' of brutus.artica.es:artica/pandorafms into ent-8217-Comando-Accion-de-alerta-para-enviar-informes
|
2022-09-23 13:00:40 +02:00 |
|
alejandro.campos@artica.es
|
23bb4d0750
|
minor fix
|
2022-09-23 13:00:28 +02:00 |
|
Daniel Maya
|
96f81475f7
|
resolved conflict
|
2022-09-23 09:20:59 +02:00 |
|
Alejandro Campos
|
9301b46f41
|
Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes'
# Conflicts:
# pandora_console/extras/mr/57.sql
|
2022-09-23 06:41:57 +00:00 |
|
alejandro.campos@artica.es
|
2af04e7de0
|
change mr
|
2022-09-21 15:22:20 +02:00 |
|
alejandro.campos@artica.es
|
d1cc2458b6
|
implemented alert commands and actions to send report by email
|
2022-09-13 12:16:53 +02:00 |
Daniel Barbero
|
cefc5c4605
|
fixed size field bbdd tmodule_group pandora_enterprise#9453
|
2022-09-13 08:30:37 +02:00 |
José González
|
9cdb8788ff
|
DB Files for IP Allow control
|
2022-09-12 12:41:33 +02:00 |
|
Daniel Maya
|
d53ee55663
|
#9331 Fixed wizard wmi
|
2022-09-08 15:18:48 +02:00 |
Ramon Novoa
|
9f30d66328
|
Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien
|
2022-09-02 14:06:50 +02:00 |
|
Daniel Maya
|
d3612439fb
|
#8898 conflict resolved
|
2022-08-29 14:06:15 +02:00 |
|
alejandro.campos@artica.es
|
de55200659
|
Merge remote-tracking branch 'origin/develop' into ent-5319-9412-mas-personalizacion-de-paradas-planificada
|
2022-08-29 10:06:41 +02:00 |
|
Daniel Maya
|
16554cfc7a
|
#8898 networkmap
|
2022-08-29 09:39:47 +02:00 |
|
alejandro.campos@artica.es
|
ded2fb08ff
|
implemented cron based scheduled downtimes
|
2022-08-16 18:42:51 +02:00 |
|
Daniel Barbero
|
50bb50418d
|
fixed error metaconsole_node_id pandora_enterprise#9350
|
2022-08-12 11:34:35 +02:00 |
|
Daniel Barbero
|
cd1dfa6361
|
fixed error metaconsole_node_id pandora_enterprise#9350
|
2022-08-12 11:32:07 +02:00 |