tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,852 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

16852 Commits

Author SHA1 Message Date
artica 520e968500 Auto-updated build strings. 2018-02-07 00:01:14 +01:00
vgilc 23be1a9921 Merge branch '1882-Reinicio-de-las-sesiones-de-Pandora-a-través-de-un-F5-AON' into 'develop' 
Filter config_prepare_session when use F5 balancer - #1882

See merge request artica/pandorafms!1276
 2018-02-06 17:16:15 +01:00
enriquecd 16f5b047d6 Filter config_prepare_session when use F5 balancer - #1882 2018-02-06 17:10:59 +01:00
vgilc dc44db428f Merge branch '1862-Instrucciones-de-módulo-no-aparecen-en-evento-CEPSA' into 'develop' 
Add module critical instructions when create an event - #1862

See merge request artica/pandorafms!1275
 2018-02-06 16:35:41 +01:00
enriquecd 5c0f0de1e4 Add module critical instructions when create an event - #1862 2018-02-06 16:01:32 +01:00
vgilc 26de4f6517 Merge branch 'ent-1644-fallo-en-ayuda-de-agent-mode' into 'develop' 
Fixed module definition help and add autodisable mode to bulk operations

See merge request artica/pandorafms!1129
 2018-02-06 12:17:14 +01:00
fermin831 d625652f9a Removed unwanted git merge traces (sorry) 2018-02-06 12:06:21 +01:00
fermin831 378186cadf Merge branch 'develop' into ent-1644-fallo-en-ayuda-de-agent-mode 
Conflicts:
	pandora_console/include/help/en/help_module_definition.php
	pandora_console/include/help/es/help_module_definition.php
	pandora_console/include/help/ja/help_module_definition.php
 2018-02-06 12:01:33 +01:00
vgilc fe4b1da1e3 Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop' 
Make help and support links in login page customizables - #1709

See merge request artica/pandorafms!1201
 2018-02-06 11:57:23 +01:00
vgilc ae9db8bfd8 Merge branch '1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1' into 'develop' 
Change system audit log extended info to table format with change info - #1571

See merge request artica/pandorafms!1115
 2018-02-06 11:56:48 +01:00
vgilc b6d145992c Merge branch '1699-Ordenar-alfabéticamente-los-grupos-de-agentes' into 'develop' 
Alphabetic order in group selects - #1699

See merge request artica/pandorafms!1197
 2018-02-06 11:56:17 +01:00
vgilc 6194f84f13 Merge branch '1403-Db-changes-for-clocks-in-visual-console-MR' into 'develop' 
MR 12 changes for animation clock ticket - #1403

See merge request artica/pandorafms!1274
 2018-02-06 11:02:05 +01:00
vgilc acd1d97a94 Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-dbchanges' into 'develop' 
Db changes for clocks in visual console - #1403

See merge request artica/pandorafms!1150
 2018-02-06 11:01:45 +01:00
enriquecd 65dccd3935 MR 12 changes for cnimation clock ticket - #1403 2018-02-06 10:52:49 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
enriquecd bf1ad29b6b Merge branch 'develop' into 1699-Ordenar-alfabéticamente-los-grupos-de-agentes 
Conflicts:
	pandora_console/include/functions_users.php
 2018-02-06 10:43:33 +01:00
vgilc 0e7b262511 Merge branch 'Updated-dated_current_package_enterprise-719-and-MR12-dev' into 'develop' 
Updated current_package_enterprise 719 and MR12

See merge request artica/pandorafms!1273
 2018-02-06 10:35:08 +01:00
danielmaya fb39c1e39b Updated current_package_enterprise 719 and MR12 2018-02-06 10:27:07 +01:00
vgilc 0f01fcbd20 Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop' 
Added type graph selection in container graph

See merge request artica/pandorafms!1113
 2018-02-06 09:55:36 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
artica be5adb4635 Auto-updated build strings. 2018-02-06 00:01:13 +01:00
vgilc 024367d601 Merge branch '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev' into 'develop' 
Fixed element size of type icon, group and static graph

See merge request artica/pandorafms!1247
 2018-02-05 16:39:02 +01:00
vgilc 48b6dc56fd Merge branch '1676-Tags-y-vista-de-alertas-2' into 'develop' 
Show all alerts when select all tags filter - #1676

See merge request artica/pandorafms!1271
 2018-02-05 15:57:40 +01:00
vgilc 160daa836c Merge branch 'develop' into '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2018-02-05 15:55:56 +01:00
vgilc ce43dd91d8 Merge branch '1301-Macro-para-nombre-de-evento-dev' into 'develop' 
Added _event_description_ in help_alert_macros.php

See merge request artica/pandorafms!1110
 2018-02-05 15:42:14 +01:00
enriquecd 064a9d58b9 Show all alerts when select all tags filter - #1676 2018-02-05 15:30:28 +01:00
danielmaya da8c1e4f46 resolved conflicts 2018-02-05 09:41:27 +01:00
artica b819f76c58 Auto-updated build strings. 2018-02-05 00:01:13 +01:00
artica 084bea27cc Auto-updated build strings. 2018-02-04 00:01:13 +01:00
artica 0614e5a492 Auto-updated build strings. 2018-02-03 00:01:14 +01:00
enriquecd d59289db62 Change builder style - #1748 2018-02-02 14:56:33 +01:00
enriquecd 47f0a90cab Show not init monitors - #1748 2018-02-02 14:10:03 +01:00
enriquecd 768e6e605f Fix bugs - #1748 2018-02-02 13:05:36 +01:00
danielmaya 1f47f2f1a9 Added refresh in cluster_view 2018-02-02 11:49:53 +01:00
artica 3c6e71dbed Auto-updated build strings. 2018-02-02 00:01:18 +01:00
enriquecd 88fddf3032 Add permissions - #1748 2018-02-01 17:49:37 +01:00
vgilc 7eeb5fad70 Merge branch '1855-opennebula-datos-como-array' into 'develop' 
Fix PluginTools datalist modules

See merge request artica/pandorafms!1269
 2018-02-01 15:04:14 +01:00
fbsanchez c02237a27f Fix PluginTools datalist modules 2018-02-01 13:59:22 +01:00
enriquecd e1669ded9d Change branch to enterprise - #1748 2018-02-01 11:35:23 +01:00
enriquecd 389c6aeada Change last update text when not init - #1748 2018-02-01 10:54:17 +01:00
enriquecd 4858213fd1 Add tcp port to AA modules - #1748 2018-02-01 10:42:11 +01:00
artica 0d944f0322 Auto-updated build strings. 2018-02-01 00:01:13 +01:00
enriquecd dcb7c92cea Add search bar to cluster list - #1748 2018-01-31 19:41:56 +01:00
danielmaya 3c1025a146 Changes visual style in cluster map and added autorefresh 2018-01-31 16:40:38 +01:00
enriquecd ee4db9b01b Fix bugs view and wizard - #1748 2018-01-31 15:39:06 +01:00
vgilc 3cad7be4a5 Merge branch '1749-sistena-cache-de-acl-s-de-la-consola' into 'develop' 
Modified users_get_groups

See merge request artica/pandorafms!1244
 2018-01-31 15:15:50 +01:00
vgilc 08623ac5f3 Merge branch '1834-Filtrado_de_eventos_erroneo' into 'develop' 
add propagate groups in list events

See merge request artica/pandorafms!1267
 2018-01-31 15:15:13 +01:00
vgilc 1d9759fc9e Merge branch '1620-Parametros_que_no_estan_o_sobran_en_el_pandora_server_conf_2' into 'develop' 
Add news token server conf

See merge request artica/pandorafms!1153
 2018-01-31 15:14:39 +01:00
enriquecd f9edfcb893 finalized Wizard, new styles, editor mode - #1748 2018-01-31 14:42:37 +01:00
daniel 137f4a1b69 resolve confict 2018-01-31 13:34:43 +01:00