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

18693 Commits

Author SHA1 Message Date
vgilc 1973a5fe54 Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 
WUX-UX integration

See merge request artica/pandorafms!1890
 2018-10-26 14:42:23 +02:00
vgilc 7a4b7d4289 Merge branch '2221-Actualizacion_de_Pandora_a_version_7_de_PHP' into 'develop' 
2221 actualizacion de pandora a version 7 de php

See merge request artica/pandorafms!1875
 2018-10-26 14:41:15 +02:00
daniel fee15492fa add php7 to Dockerfile 2018-10-26 14:36:18 +02:00
nramon 3d964364e8 Merge branch 'fix-language-selection-problem' into 'develop' 
Fixed language selection problem at initial setup.

See merge request artica/pandorafms!1902
 2018-10-26 10:51:01 +02:00
nramon 62cf584e44 Merge branch 'update-japanese-help-1025' into 'develop' 
Updated Japanese help files.

See merge request artica/pandorafms!1901
 2018-10-26 10:50:49 +02:00
Junichi Satoh 91ed413b0a Fixed language selection problem at initial setup. 2018-10-26 17:34:49 +09:00
Junichi Satoh ecf5ca3bb2 Updated Japanese help files. 2018-10-26 17:28:24 +09:00
artica dba51e07b3 Auto-updated build strings. 2018-10-26 00:01:33 +02:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
fbsanchez c06bd4207e estilos popup 2018-10-25 16:40:45 +02:00
fbsanchez 172ac187a2 estilos popup 2018-10-25 15:58:06 +02:00
fbsanchez 8619adbf4c estilos popup 2018-10-25 15:42:20 +02:00
fbsanchez 85051924b7 estilos popup 2018-10-25 14:01:12 +02:00
vgilc 3aff162616 Merge branch '2961-Longitud-del-nombre-de-las-plantillas-de-consolas-visuales' into 'develop' 
Changed tlayout_template name table to varchar 600

See merge request artica/pandorafms!1889
 2018-10-25 13:27:25 +02:00
vgilc 2bd6b0c688 Merge branch '1863-Error-en-tipo-de-evento-going-up-critical' into 'develop' 
1863 error en tipo de evento going up critical

See merge request artica/pandorafms!1736
 2018-10-25 13:25:22 +02:00
vgilc d218c586d9 Merge branch '2166-Hide-not-init-agents' into 'develop' 
fixed bug: hide not init agents not working in report item creation

See merge request artica/pandorafms!1742
 2018-10-25 13:23:22 +02:00
vgilc 9aed441246 Merge branch '2452-Fallo-recalculo-custom-graph' into 'develop' 
Changed custom graph item insertion and deletion to fix bug when sorting elements in list

See merge request artica/pandorafms!1782
 2018-10-25 13:20:30 +02:00
vgilc 3ed5b97e1d Merge branch '2455--6064-Error-Insert-data-nombre-de-XML-mal-construido' into 'develop' 
Fixed bug in the construction of the name of the xml file

See merge request artica/pandorafms!1737
 2018-10-25 13:20:05 +02:00
vgilc d1ff778102 Merge branch 'ent-2486-6107-bug-lista-dashbord-con-acl' into 'develop' 
Removed dashboard menu if it is displayed from main page

See merge request artica/pandorafms!1879
 2018-10-25 13:19:33 +02:00
vgilc fcb95a8d8d Merge branch '2510-Checkboxes-y-radio-buttons-en-Config.-visual' into 'develop' 
visuals fix in visual styles

See merge request artica/pandorafms!1731
 2018-10-25 13:16:57 +02:00
vgilc aabd5435d0 Merge branch '2535-Macro-para-unidad-informes' into 'develop' 
Added unit in label graphs

See merge request artica/pandorafms!1874
 2018-10-25 13:12:26 +02:00
vgilc d71257ea1c Merge branch 'ent-2540-Macro-de-IP-del-agente-no-funciona-event-responses-EUComm' into 'develop' 
Fixed macro _agent_adress_ on events responses

See merge request artica/pandorafms!1872
 2018-10-25 13:03:44 +02:00
vgilc 3c548f1c98 Merge branch '6219_Comprobacion_paradas_planificadas' into 'develop' 
Fixed problems in scheduled downtime CLI

See merge request artica/pandorafms!1806
 2018-10-25 13:03:17 +02:00
vgilc 66e662c53e Merge branch '2572-Fallo-visual' into 'develop' 
Database and application_osx icons added to select icon of group - #2572

See merge request artica/pandorafms!1749
 2018-10-25 13:02:08 +02:00
vgilc 3c4f6d3b23 Merge branch '2580-VERSION-OPEN-Línea-divisoria' into 'develop' 
Fixed bug in module manager

See merge request artica/pandorafms!1729
 2018-10-25 13:00:59 +02:00
vgilc f2356a3a9b Merge branch 'ent-2608-mas-problemas-de-vistas-de-grupos-secundarios' into 'develop' 
Ent 2608 mas problemas de vistas de grupos secundarios

See merge request artica/pandorafms!1856
 2018-10-25 12:59:51 +02:00
vgilc 4c4c874553 Merge branch '2630-Exportación-Gráficas-relacionado-con-CSV' into 'develop' 
Fixed bug in csv export graph

See merge request artica/pandorafms!1814
 2018-10-25 12:57:24 +02:00
vgilc 330bdbbce0 Merge branch '2637-Help-en-Event-Viewer' into 'develop' 
Changed Actions column with the right icons - #2637

See merge request artica/pandorafms!1746
 2018-10-25 12:32:37 +02:00
vgilc ea2ed80f05 Merge branch '2655-Audit-log-con-entities' into 'develop' 
Suppress entities in System audit log comments

See merge request artica/pandorafms!1714
 2018-10-25 12:32:07 +02:00
vgilc fb32ea240f Merge branch '2704_SQL_Horizontal_bar_graph_en_informe_corta_los_labels_si_son_muy_largos' into 'develop' 
Fixed SQL graphs in reports

See merge request artica/pandorafms!1791
 2018-10-25 12:11:41 +02:00
vgilc 4b317b573b Merge branch '2708-API-metaconsola-function-get_agent-no-devuelve-nada' into 'develop' 
Added code for function api_get_agent_alias for the API of the metaconsole - #2708

See merge request artica/pandorafms!1816
 2018-10-25 12:11:16 +02:00
vgilc b50f52ae9d Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed bug: admin users not able to log in to node when they are created in…

See merge request artica/pandorafms!1812
 2018-10-25 12:10:58 +02:00
vgilc c14a7d270a Merge branch '2719-Links-desde-tree-view-de-meta' into 'develop' 
Fixed bug: bad link in meta tree view's agent data, using relative path

See merge request artica/pandorafms!1793
 2018-10-25 12:10:32 +02:00
vgilc de0c81b7fa Merge branch '2724-Fallo-en-una-parte-de-replicación-de-eventos3' into 'develop' 
Fixed bug in events replication

See merge request artica/pandorafms!1804
 2018-10-25 12:09:58 +02:00
vgilc 9b4eeb5c84 Merge branch '2723-Fallo-hint-en-eventos' into 'develop' 
new function that adds a border to the image if the status is warning - #2723

See merge request artica/pandorafms!1743
 2018-10-25 12:07:58 +02:00
vgilc 4dd2cd434c Merge branch '2726-Botones-background-en-Visual-consoles' into 'develop' 
Changed colors for buttons - #2726

See merge request artica/pandorafms!1797
 2018-10-25 12:05:56 +02:00
vgilc 48395acfaa Merge branch '2730-Fallo-políticas-desde-la-meta' into 'develop' 
Fixed bug in deleted policies from the metaconsole

See merge request artica/pandorafms!1774
 2018-10-25 12:03:24 +02:00
vgilc af2e49966b Merge branch '2734-6444-Nombre-de-interfaces-en-SNMP-Interface-Wizard2' into 'develop' 
Added horizontal scroll in the interfaces select

See merge request artica/pandorafms!1738
 2018-10-25 11:58:33 +02:00
vgilc 8e1a946836 Merge branch '2738-Autorefresh-falla-en-la-meta' into 'develop' 
Countdown in group view for autorefresh

See merge request artica/pandorafms!1768
 2018-10-25 11:57:53 +02:00
vgilc 5255ced7d1 Merge branch '2762-Poner-capitalizacion-correcta' into 'develop' 
Capital letter in the letter a of audit - #2762

See merge request artica/pandorafms!1766
 2018-10-25 11:55:15 +02:00
vgilc cf9bf2b4e2 Merge branch '2768-Mensajería-interna' into 'develop' 
Fixed borders of tables with classes databox and data - #2768

See merge request artica/pandorafms!1786
 2018-10-25 11:54:50 +02:00
vgilc 50d30e782f Merge branch '2769-Bug-en-la-ayuda-de-Custom-Macros-en-la-creacion-de-un-modulo' into 'develop' 
Fixed bug in custom macros help

See merge request artica/pandorafms!1779
 2018-10-25 11:54:12 +02:00
vgilc 179cd9453f Merge branch 'ent-2770-i6381-comportamiento-anomalo-de-module_crontab' into 'develop' 
Fixed module_crontab in windows agent on minutes wildcard

See merge request artica/pandorafms!1871
 2018-10-25 11:53:26 +02:00
vgilc cab90a4fd3 Merge branch '2783-Falta-de-información-de-Module-Management-en-Last-Activity' into 'develop' 
Added module name and agent name in actions enable and disable module - #2783

See merge request artica/pandorafms!1783
 2018-10-25 11:44:42 +02:00
vgilc 82f6e3cb95 Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop' 
Fixed group and set_center

See merge request artica/pandorafms!1880
 2018-10-25 11:43:38 +02:00
vgilc 67fc03ab6d Merge branch '2814-Create-network-components-desde-SNMP-Walk' into 'develop' 
Changed styles for the button create_network_component - #2814

See merge request artica/pandorafms!1817
 2018-10-25 11:41:35 +02:00
vgilc d0e9875795 Merge branch '2846-Descuadre-en-Windows' into 'develop' 
Added class data to the table for last activity - #2846

See merge request artica/pandorafms!1818
 2018-10-25 11:23:45 +02:00
vgilc 89f0d547b0 Merge branch '2848-Descuadre-en-SNMP-console' into 'develop' 
Added align center for the head of the table - #2848

See merge request artica/pandorafms!1820
 2018-10-25 11:20:37 +02:00
vgilc e0f7d1310b Merge branch '2858-Mensaje-de-error-poco-descriptivo-en-alertas' into 'develop' 
2858 mensaje de error poco descriptivo en alertas

See merge request artica/pandorafms!1825
 2018-10-25 11:14:31 +02:00
vgilc a9949c8ed2 Merge branch '2860-idiomas-en-metaconsola' into 'develop' 
Added option charset to db_connect

See merge request artica/pandorafms!1831
 2018-10-25 11:13:59 +02:00