Commit Graph

18854 Commits

Author SHA1 Message Date
daniel 3bf215782e fixed minor error slicebar 2018-11-29 17:00:55 +01:00
artica 4b1649d5f8 Auto-updated build strings. 2018-11-29 00:01:26 +01:00
nramon 8e0c974b86 Merge branch 'fix/event-replication-offline' into 'develop'
Fix event replication for offline win32 nodes.

See merge request artica/pandorafms!2024
2018-11-28 13:39:03 +01:00
Ramon Novoa 35cd33e446 Fix event replication for offline win32 nodes.
Ref pandora_enterprise#3030.
2018-11-28 13:33:15 +01:00
artica c48a0ffc49 Auto-updated build strings. 2018-11-28 00:01:25 +01:00
vgilc 9db7bb6b17 Merge branch '3155-Pete_de_permisos_en_cron_job' into 'develop'
fixed warnings and font chart for pdf report

See merge request artica/pandorafms!2020
2018-11-27 17:49:20 +01:00
daniel 0460b465f0 fixed warnings and font chart for pdf report 2018-11-27 17:43:59 +01:00
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 a5f6bfe84f Merge branch 'ent-3147-mobile-console-pagination-bugfix' into 'develop'
Mobile console pagination bugfix

See merge request artica/pandorafms!2017
2018-11-23 12:54:53 +01:00
Alejandro Gallardo Escobar a7e78c30f3 Bugfix 2018-11-23 12:47:00 +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
vgilc 9fef25c9a4 Merge branch '3137-Pete_jquery_en_tree_view_metaconsola' into 'develop'
fixed error events graphs

See merge request artica/pandorafms!2013
2018-11-23 10:51:06 +01:00
vgilc 47a1635916 Merge branch 'ent-3143-mobile-console-session-unserialize-bugfix' into 'develop'
Fixed an object unserialize from the session

See merge request artica/pandorafms!2012
2018-11-23 10:49:58 +01:00
daniel 726cabb578 fixed minor error jquery 2018-11-23 10:47:57 +01:00
Alejandro Gallardo Escobar ba0b2d8bd4 Fixed an object unserialize from the session 2018-11-23 10:33:18 +01:00
daniel 557002d7fd fixed error events graphs 2018-11-23 10:32:58 +01:00
vgilc ec2d65995d Merge branch '3140-Bug_jquery_en_el_setup_de_visual_styles' into 'develop'
fixed error log js and warning php visual style

See merge request artica/pandorafms!2011
2018-11-23 10:02:56 +01:00
daniel 1b78c1a78d fixed error log js and warning php visual style 2018-11-23 09:21:22 +01:00
artica c8969582a0 Auto-updated build strings. 2018-11-23 00:01:28 +01:00
nramon 3586403a08 Merge branch 'fix/win32-set-names' into 'develop'
Fix encoding related issues.

See merge request artica/pandorafms!2009
2018-11-22 12:34:24 +01:00
Ramon Novoa 1abe45c662 Fix encoding related issues.
Ref pandora_enterprise#3031.
2018-11-22 12:29:41 +01:00
nramon 0b4b60dec9 Merge branch 'fix/win32-set-names' into 'develop'
Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro!

See merge request artica/pandorafms!2008
2018-11-22 11:02:47 +01:00
Ramon Novoa c8f94e6756 Pandora's DB does not default to utf8 on win32 anymore. Thanks koichiro!
Ref pandora_enterprise#3031.
2018-11-22 10:49:56 +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
vgilc e3aaabd17e Merge branch '3128-Problema_cuadro_alerta_de_dialogo_de_exceso_de_numero_de_agentes' into 'develop'
fixed error login double

See merge request artica/pandorafms!2006
2018-11-21 17:51:13 +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
Ramon Novoa 2480de2f9f Fix a typo in pandora_exec. 2018-11-21 16:20:26 +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
nramon d63defff15 Merge branch 'fix/encode-cn' into 'develop'
Include Encode::CN, needed for cp936 support.

See merge request artica/pandorafms!2002
2018-11-21 12:40:55 +01:00
Ramon Novoa d912812127 Include Encode::CN, needed for cp936 support.
Ref pandora_enterprise#3031.
2018-11-21 12:17:22 +01:00
nramon 8735adc252 Merge branch 'feature/offline-license' into 'develop'
Add support for offline licenses.

See merge request artica/pandorafms!2001
2018-11-21 12:10:13 +01:00
Ramon Novoa 054546fd0f Add support for offline licenses.
Ref pandora_enterprise#3098.
2018-11-21 12:05:20 +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
vgilc ffd3718533 Merge branch '2615-Bug_Session_Timeout' into 'develop'
fixed session bugs

See merge request artica/pandorafms!1999
2018-11-20 18:14:16 +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