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

12513 Commits

Author SHA1 Message Date
daniel d2bc062766 fixed errors extensions agent-modules and recursion groups 2018-01-05 10:29:46 +01:00
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
daniel b10e9cfc67 fixed errors in favourite consola visual 2018-01-04 13:10:25 +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 6d3715a25f Merge branch '1611-No-se-envían-los-informes-por-correo-desde-Metaconsola-4881-vodat' into 'develop' 
Fix sending mails for reports an templates reports by cronjobs - #1611

See merge request artica/pandorafms!1162
 2018-01-02 17:08:40 +01:00
enriquecd 9a0438bc36 Merge branch 'develop' into 1611-No-se-envían-los-informes-por-correo-desde-Metaconsola-4881-vodat 
Conflicts:
	pandora_console/extras/mr/10.sql
 2018-01-02 16:56:48 +01:00
enriquecd 0fac48d71c Fix only show average graphs checkbox - #1460 2018-01-02 16:43:13 +01:00
daniel 410ecab211 fixed error in bbdd tsnmp_filter 2018-01-02 14:49:42 +01:00
daniel ff60278060 fixed error in bbdd tsnmp_filter 2018-01-02 13:54:08 +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 66b88f3764 Merge branch 'graph-window-resize-change' into 'develop' 
Resolve: "Graph window resize change"

See merge request artica/pandorafms!1111
 2018-01-02 10:29:49 +01:00
vgilc 768ace94b8 Merge branch '1633-Ventana-modal-de-alertas-del-sistema-muy-fea-2' into 'develop' 
Visual inprovement in alerts system window - #1633

See merge request artica/pandorafms!1108
 2018-01-02 10:29:20 +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 ae995f1923 Merge branch '1704-Cuadro-ENORME-cuando-se-pone-un-número-en-Custom-Value-4985-com1' into 'develop' 
Change Csutom value textarea rows in snmp alert editor - #1704

See merge request artica/pandorafms!1187
 2018-01-02 10:27:20 +01:00
daniel 2ce2a30ee1 fixed minor error snmp_filters 2018-01-02 10:15:44 +01:00
vgilc ef33d10828 Merge branch '1694-Carrefour-Cuando-asignas-una-pantalla-de-inicio-a-un-usuario,-la-URL-que-muestra-el-navegador-no-es-la-correcta' into 'develop' 
Redirect to real url when login - #1694

See merge request artica/pandorafms!1181
 2018-01-02 10:03:28 +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 641a10de0a Merge branch '1725-4995-Com1-Custom-logo-no-se-mantiene' into 'develop' 
Fix default custom logo select value in visual settings for front of reports - #1725

See merge request artica/pandorafms!1205
 2018-01-02 09:50:26 +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
daniel 388834af6d fixed error in snmp filters 2017-12-29 08:11:25 +01:00
artica 94fadf48df Auto-updated build strings. 2017-12-29 00:01:13 +01:00
daniel 6cc0ca51c3 fixed minor errors in select for events 2017-12-28 16:38:47 +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 3ee088da81 Fix default custom logo select value in visual settings for front of reports - #1725 2017-12-21 15:14:22 +01:00
enriquecd 26d115a84e Merge branch 'develop' into 1470-Editar-modulo-web-analysis 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-12-21 14:37:55 +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