Commit Graph

19041 Commits

Author SHA1 Message Date
vgilc 6302dc634d Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
fixed minor error

See merge request artica/pandorafms!1996
2018-11-20 09:22:17 +01:00
daniel 2078014406 fixed minor error 2018-11-20 09:14:36 +01:00
artica 01ba290a68 Auto-updated build strings. 2018-11-20 00:01:29 +01:00
vgilc 522a098d24 Merge branch '2615-bug-session-timeout' into 'develop'
time used for session cookie expiration set to gmt time

See merge request artica/pandorafms!1995
2018-11-19 17:30:11 +01:00
daniel ee22d3988c fixed error ldap 2018-11-19 16:33:27 +01:00
alejandro-campos 2c5cd6627b time used for session cookie expiration set to gmt time 2018-11-19 16:33:27 +01:00
vgilc 34aea47449 Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
2784 pantalla por dispositivos filtrado por custom fields

See merge request artica/pandorafms!1993
2018-11-19 16:24:58 +01:00
daniel 9d80e940bf fixed minor error cfv 2018-11-19 16:17:20 +01:00
vgilc c499a21cc2 Merge branch '2615-bug-session-timeout' into 'develop'
time used for session cookie set to timezone current time instead of gmt time

See merge request artica/pandorafms!1991
2018-11-19 13:29:01 +01:00
alejandro-campos 3ffab647cb time used for session cookie set to timezone current time instead of gmt time 2018-11-19 13:21:25 +01:00
vgilc 89868cd3c5 Merge branch '2606-Gestión-de-colecciones-desde-metaconsola-return-2-dev' into 'develop'
2606 gestión de colecciones desde metaconsola return 2 dev

See merge request artica/pandorafms!1989
2018-11-19 12:24:22 +01:00
danielmaya 24fe48d5c5 Added token metaconsole_deploy_collection in the config 2018-11-19 12:12:10 +01:00
danielmaya 04ebb6b2c5 Added delete function in the api 2018-11-19 11:28:35 +01:00
Alejandro Gallardo Escobar 919e94e46a Added an exit after every Location header declared 2018-11-19 11:28:07 +01:00
daniel 105e93d069 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-19 08:42:30 +01:00
vgilc 96a36615cc Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
2784 pantalla por dispositivos filtrado por custom fields

See merge request artica/pandorafms!1987
2018-11-19 08:39:16 +01:00
artica ce5c679ad6 Auto-updated build strings. 2018-11-19 00:01:29 +01:00
artica f2bf27d367 Auto-updated build strings. 2018-11-18 00:01:28 +01:00
artica 4021af48f9 Auto-updated build strings. 2018-11-17 00:01:31 +01:00
daniel 2eb47c1251 fixed errors in custom fields view 2018-11-16 15:00:09 +01:00
vgilc f8e128120e Merge branch 'fix/api-disable-standby-agent' into 'develop'
standby software agent while disabling

See merge request artica/pandorafms!1986
2018-11-16 14:30:26 +01:00
fbsanchez b2ed4a9d2c standby software agent while disabling 2018-11-16 14:26:11 +01:00
daniel 449c02763a fixed minor error cfv 2018-11-16 13:22:10 +01:00
vgilc d0d989ab19 Merge branch 'fix/db-retry-lock' into 'develop'
retried db query on error 1205 - lock

See merge request artica/pandorafms!1981
2018-11-16 13:15:06 +01:00
vgilc f99dadca39 Merge branch 'fix/ux-panel-historical-images' into 'develop'
Fix/ux panel historical images

See merge request artica/pandorafms!1984
2018-11-16 12:51:31 +01:00
fbsanchez 5c3b3a0e66 adjusted replication_interval default 2018-11-16 12:46:10 +01:00
fbsanchez 35870d13fd allow snapshot_view check historical db 2018-11-16 12:42:08 +01:00
vgilc fd4f848a53 Merge branch '2784-Pantalla_por_dispositivos_filtrado_por_custom_fields' into 'develop'
2784 pantalla por dispositivos filtrado por custom fields

See merge request artica/pandorafms!1983
2018-11-16 12:03:23 +01:00
daniel 0a097d185d fixed errors in custom fields view 2018-11-16 11:58:49 +01:00
fbsanchez 50c3453415 change default values for event synch 2018-11-16 11:27:32 +01:00
fbsanchez 2a110e11c8 retried db query on error 1205 - lock 2018-11-16 10:28:49 +01:00
daniel e6cd8c5471 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-16 09:11:49 +01:00
artica a0fde9503f Auto-updated build strings. 2018-11-16 00:01:29 +01:00
daniel e21fde537a fixed css errors custom field view and new features 2018-11-15 19:16:49 +01:00
vgilc a00c10a136 Merge branch '2166-Hide-not-init-agents-2' into 'develop'
removed hide not init modules from sla and availability report

See merge request artica/pandorafms!1976
2018-11-15 17:20:00 +01:00
vgilc 73590705e9 Merge branch '3079-Alertas_php7' into 'develop'
3079 alertas php7

See merge request artica/pandorafms!1980
2018-11-15 15:41:16 +01:00
daniel 7700ee85ca Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7 2018-11-15 15:34:08 +01:00
vgilc 151cba3cbf Merge branch '3072-Problemas_jquery' into 'develop'
3072 problemas jquery

See merge request artica/pandorafms!1979
2018-11-15 15:33:46 +01:00
daniel d12a25866d fixed translate php7 warning 2018-11-15 15:33:46 +01:00
daniel 1edb7fda03 Merge remote-tracking branch 'origin/develop' into 3072-Problemas_jquery 2018-11-15 15:20:02 +01:00
daniel 34ea7cfbcb fixed position select autocomplete agent jqui 2018-11-15 15:19:43 +01:00
vgilc da410c9394 Merge branch '3079-Alertas_php7' into 'develop'
3079 alertas php7

See merge request artica/pandorafms!1978
2018-11-15 14:17:26 +01:00
daniel aee12e6bf9 Merge remote-tracking branch 'origin/develop' into 3079-Alertas_php7 2018-11-15 13:23:09 +01:00
daniel b78c52caa4 fixed error Acess for Access 2018-11-15 13:22:54 +01:00
nramon cc72416333 Merge branch 'ent-3037-rw341132-snmp-trap-generator-questions' into 'develop'
Fixed snmptrap binary in windows trap generator

See merge request artica/pandorafms!1977
2018-11-15 13:19:43 +01:00
fermin831 b786c6c3ab Fixed snmptrap binary in windows trap generator 2018-11-15 13:04:35 +01:00
alejandro-campos a1846a6e22 removed hide not init modules from sla and availability report 2018-11-15 12:00:25 +01:00
vgilc 614efef0c4 Merge branch '3079-Alertas_php7' into 'develop'
create alert php7

See merge request artica/pandorafms!1975
2018-11-15 09:46:27 +01:00
artica e9e132589c Auto-updated build strings. 2018-11-15 00:01:29 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00