Commit Graph

9381 Commits

Author SHA1 Message Date
artica ad743d332e Auto-updated build strings. 2018-11-27 00:01:24 +01:00
artica b7546a5019 Auto-updated build strings. 2018-11-26 00:01:25 +01:00
artica 6bfe880dc8 Auto-updated build strings. 2018-11-25 00:01:24 +01:00
artica 53401e1f4d Auto-updated build strings. 2018-11-24 00:01:28 +01:00
vgilc bc70922acf Merge branch 'ent-2221-saml-php7-issues' into 'develop'
Patch to SAML login. It wont pass for pandora session handlers

See merge request artica/pandorafms!2015
2018-11-23 15:04:50 +01:00
vgilc 8f988dfb16 Merge branch 'ent-3144-mobile-console-event-detail-bugfix' into 'develop'
Fixed the event detail view on the mobile console

See merge request artica/pandorafms!2016
2018-11-23 12:42:27 +01:00
Alejandro Gallardo Escobar de08451c84 Bugfix 2018-11-23 12:21:35 +01:00
fermin831 cb9c6e35ba Patch to SAML login. It wont pass for pandora session handlers 2018-11-23 11:37:05 +01:00
vgilc cfeaea57ff Merge branch '3132-No_aparecen_campos_recon_task' into 'develop'
fixed minor error jquery

See merge request artica/pandorafms!2014
2018-11-23 11:11:39 +01:00
daniel 726cabb578 fixed minor error jquery 2018-11-23 10:47:57 +01:00
daniel 557002d7fd fixed error events graphs 2018-11-23 10:32:58 +01:00
artica c8969582a0 Auto-updated build strings. 2018-11-23 00:01:28 +01:00
vgilc b4f3ce251b Merge branch '2615-Bug_Session_Timeout' into 'develop'
fixed errors in session with send mail alerts graph API

See merge request artica/pandorafms!2004
2018-11-22 09:01:47 +01:00
artica de77e52297 Auto-updated build strings. 2018-11-22 00:01:28 +01:00
daniel a5346a7ae3 fixed error login double 2018-11-21 17:38:11 +01:00
daniel 322c76b5e1 Merge remote-tracking branch 'origin/develop' into 2615-Bug_Session_Timeout 2018-11-21 16:52:20 +01:00
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
vgilc 7be5225429 Merge branch '2615-Bug_Session_Timeout' into 'develop'
fixed errors session_start

See merge request artica/pandorafms!2003
2018-11-21 13:13:47 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
vgilc 0344a5c2b0 Merge branch '2615-Bug_Session_Timeout' into 'develop'
fixed minor error session

See merge request artica/pandorafms!2000
2018-11-21 09:41:59 +01:00
daniel 3f6384c690 fixed minor error session 2018-11-21 09:36:37 +01:00
artica fd6d830de3 Auto-updated build strings. 2018-11-21 00:01:25 +01:00
daniel a089a93477 fixed session bugs 2018-11-20 18:07:43 +01:00
vgilc 20cbe0d767 Merge branch 'ent-3109-no-se-ven-los-agentes-en-la-creacion-de-clusters' into 'develop'
Fixed query on function agents_get_group_agents

See merge request artica/pandorafms!1997
2018-11-20 17:37:07 +01:00
vgilc 5ac947c2fd Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop'
Ent 2169 rediris modificacion de comandos en alertas

See merge request artica/pandorafms!1878
2018-11-20 11:33:00 +01:00
fermin831 8a00fe5a30 Fixed query on function agents_get_group_agents 2018-11-20 10:58:58 +01:00
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
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
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
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
fbsanchez b2ed4a9d2c standby software agent while disabling 2018-11-16 14:26:11 +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
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
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