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

7966 Commits

Author SHA1 Message Date
vgilc 39bd9a47d8 Merge branch '1719-Subgrupos-bloqueados-si-solo-existe-un-grupo-dev' into 'develop' 
Fixed blocked group in group_list

See merge request artica/pandorafms!1223
 2018-01-05 09:20:40 +01:00
artica 5bf8262171 Auto-updated build strings. 2018-01-05 00:01:14 +01:00
danielmaya 43ec1cb7f4 Fixed blocked group in group_list 2018-01-04 16:34:40 +01:00
artica 932f6ce0cf Auto-updated build strings. 2018-01-04 00:01:15 +01:00
daniel e2ee8a555d add fullscale container graph 2018-01-03 15:53:49 +01:00
enriquecd e0b3d6128e Add enable link checkbox to group item editor - #1253 2018-01-03 13:32:02 +01:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
artica 6c48e6544a Auto-updated build strings. 2018-01-03 00:01:16 +01:00
vgilc 78899cc1c7 Merge branch '1708-CARREFOUR_Cambio_de_comportamiento_en_Consolas_Visuales_favoritas' into 'develop' 
add new funtionality view favourite console visual

See merge request artica/pandorafms!1211
 2018-01-02 10:31:31 +01:00
vgilc 547a7c0d3d Merge branch '1724-Aplicar-efecto-visual-a-pantalla-de-login' into 'develop' 
Add visual effect to login page - #1724

See merge request artica/pandorafms!1204
 2018-01-02 10:28:46 +01:00
vgilc d34aad4a30 Merge branch 'fix-html-entities-in-networkmap-relations' into 'develop' 
[Console > Network map] Fix the output of content with html entities

See merge request artica/pandorafms!1120
 2018-01-02 10:02:28 +01:00
vgilc b3f23b53c2 Merge branch '1706-REDIRIS-No-se-realiza-la-conversión-de-traducción-de-texto' into 'develop' 
Let use translate strings extension in login page - #1706

See merge request artica/pandorafms!1192
 2018-01-02 10:01:25 +01:00
vgilc 58fe8d7f23 Merge branch '1697-Autenticación-LDAP-dev' into 'develop' 
Autenticación LDAP

See merge request artica/pandorafms!1202
 2018-01-02 09:42:19 +01:00
artica 43284ea834 Auto-updated build strings. 2018-01-02 00:01:13 +01:00
artica 70eb1dcce0 Auto-updated build strings. 2018-01-01 00:01:12 +01:00
artica 42c5c2d77a Auto-updated build strings. 2017-12-31 00:01:12 +01:00
artica eaaec1a902 Auto-updated build strings. 2017-12-30 00:01:14 +01:00
artica 94fadf48df Auto-updated build strings. 2017-12-29 00:01:13 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
artica dfba134905 Auto-updated build strings. 2017-12-28 00:01:14 +01:00
artica c0e812b2b2 Auto-updated build strings. 2017-12-27 00:01:14 +01:00
artica a50ae465e7 Auto-updated build strings. 2017-12-26 00:01:13 +01:00
artica 7811257f8f Auto-updated build strings. 2017-12-25 00:01:13 +01:00
artica 335be09a89 Auto-updated build strings. 2017-12-24 00:01:12 +01:00
artica a0ef8c4ca3 Auto-updated build strings. 2017-12-23 00:01:13 +01:00
artica 8d144bc085 Auto-updated build strings. 2017-12-22 00:01:15 +01:00
enriquecd 516c3b8d47 Fix pagination - #1728 2017-12-21 17:01:19 +01:00
daniel 7ea42dc5c5 add new filter tree view 2017-12-21 16:37:19 +01:00
enriquecd 5747299d8e Add visual effect to login page - #1724 2017-12-21 13:45:57 +01:00
fermin831 5b3408bae5 Added some lost help macros 2017-12-21 13:11:45 +01:00
fermin831 8e2616e642 Merge branch 'develop' into ent-1536-macro-para-id-extra 2017-12-21 12:18:58 +01:00
danielmaya 9c764dcf94 Autenticación LDAP 2017-12-21 11:35:02 +01:00
fermin831 9a43f1fa7d Merge branch 'develop' into ent-1536-macro-para-id-extra 
Conflicts resolved:
	pandora_console/include/help/en/help_alert_config.php
	pandora_console/include/help/en/help_alert_macros.php
	pandora_console/include/help/es/help_alert_config.php
	pandora_console/include/help/es/help_alert_macros.php
	pandora_console/include/help/ja/help_alert_config.php
	pandora_console/include/help/ja/help_alert_macros.php
 2017-12-21 11:10:38 +01:00
vgilc 6ac8571b2d Merge branch '979-CLI/API-Para-sincronizar-la-metaconsola' into 'develop' 
Metaconsole synchronization for api - #979

See merge request artica/pandorafms!1057
 2017-12-21 11:00:09 +01:00
vgilc db55901bf5 Merge branch '1437-Mejorar-pantalla-de-introducción-de-licencia-open' into 'develop' 
Change license windows style - #1437

See merge request artica/pandorafms!1048
 2017-12-21 10:58:46 +01:00
vgilc 5332236a10 Merge branch 'ent-1445-ficheros-orig' into 'develop' 
Delete orig repo files

See merge request artica/pandorafms!1069
 2017-12-21 10:58:09 +01:00
vgilc d9884fd431 Merge branch 'actualizar-el-cliente-de-ehorus' into 'develop' 
Resolve: "Actualizar el cliente de eHorus"

See merge request artica/pandorafms!1055
 2017-12-21 10:57:15 +01:00
vgilc e6d7cc1632 Merge branch '1253-Error-en-icono-grupo-Consola-Visual-metaconsola' into 'develop' 
Change group items url links in metaconsole - #1253

See merge request artica/pandorafms!1066
 2017-12-21 10:53:03 +01:00
vgilc 8ea951a4bb Merge branch 'ent-1520-error-en-grafica-de-agente-no-dinamica' into 'develop' 
Fixed non interactive status graphs

See merge request artica/pandorafms!1063
 2017-12-21 10:48:17 +01:00
vgilc b8615d8a29 Merge branch '1574-Fallo-JS-con-cabeceras-POST' into 'develop' 
Apply safe input to ui_get_url_refresh return - fix text form inputs js error - #1574

See merge request artica/pandorafms!1084
 2017-12-21 10:47:08 +01:00
vgilc 097bc3df32 Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop' 
Added resize functionality to flot graphs and fix overview in container graphs

See merge request artica/pandorafms!1068
 2017-12-21 10:46:42 +01:00
vgilc 60486c8a1e Merge branch '1659-Informe-de-eventos-de-módulos-en-plantillas-de-informes-de-la-metaconsola--Carrefour]-dev' into 'develop' 
Fixed reporting_event_report_module in metaconsole

See merge request artica/pandorafms!1128
 2017-12-21 09:53:47 +01:00
vgilc 45c642a6a0 Merge branch 'ent-1435-incluir-macros-en-event-responses' into 'develop' 
Ent 1435 incluir macros en event responses

See merge request artica/pandorafms!1100
 2017-12-21 09:46:55 +01:00
vgilc e89363582a Merge branch '1596-4876-Dropdown-menus-por-orden-de-ID' into 'develop' 
Order by name group select in manage agent view - #1596

See merge request artica/pandorafms!1078
 2017-12-21 09:06:21 +01:00
vgilc 349a9bbd35 Merge branch '1613-4894-No-aparece-fecha-final-en-las-graficas-24h-de-los-agentes' into 'develop' 
Change time format in agent events 24h bar view and show the last start time - #1613

See merge request artica/pandorafms!1089
 2017-12-21 09:04:55 +01:00
vgilc 4f0a451ba1 Merge branch '1576-Permisos-sobre-gráficas-no-permite-ver-graph-containers-4863-media-open' into 'develop' 
1576 permisos sobre gráficas no permite ver graph containers 4863 media open

See merge request artica/pandorafms!1072
 2017-12-21 08:59:36 +01:00
artica 9b40ee6422 Auto-updated build strings. 2017-12-21 00:01:25 +01:00
artica 6db5ced911 Auto-updated build strings. 2017-12-20 00:01:11 +01:00
enriquecd ff462e7b44 Translations - #1257 2017-12-19 16:11:35 +01:00
daniel a335732267 fixed errors in graphs webproc and keep alive 2017-12-19 13:13:42 +01:00