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

168 Commits

Author SHA1 Message Date
Tatiana Llorente 5e0b53e3c2 New menu module graph - #3617 2019-05-08 09:35:28 +02:00
Tatiana Llorente 283be8f632 New menu module graph - #3617 2019-05-07 16:07:07 +02:00
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos 
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
 2019-02-05 09:23:53 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es f5c96b7e5d New organization of CSS files - #3358 
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
 2019-01-24 11:10:49 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
daniel 1c1df4b5f7 fixed errors css jqueryui 2018-11-07 17:09:42 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01: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
daniel ffc7734ebc delete flash_charts and library pchart 2018-10-19 11:31:06 +02:00
manuel.montes 712103c308 Fixed bug in csv export graph 2018-09-27 17:35:52 +02:00
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
fermin831 04cfbe4ef9 Fixed acl in module graph view 2018-08-01 13:16:21 +02:00
daniel c26a50e838 fixed errors in graphs 2018-07-06 11:56:38 +02:00
manuel.montes 5436c64800 Merge branch '2396-fallo-acl-en-vista-de-cluster' of https://brutus.artica.lan:8081/artica/pandorafms into 2396-fallo-acl-en-vista-de-cluster 2018-06-29 08:52:46 +02:00
manuel.montes 4f23407ea8 Fixed for group All 2018-06-28 17:03:02 +02:00
daniel 65eb4744a1 fixed boolean graph no zoom 2018-06-27 16:17:17 +02:00
slerena 99271a4822 Merge branch '1797-Menú-desplegable-de-gráficas-miniaturizado' into 'develop' 
fixed resize in stat_win.php

See merge request artica/pandorafms!1503
 2018-06-25 18:59:09 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
manuel.montes 5021144405 fixed resize in stat_win.php 2018-05-29 13:19:20 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
Fermin 29f56df1fd [Rebranding] Open operation/agents 2018-05-11 15:17:53 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
daniel 2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
daniel e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
fermin831 bc2c92807a Fixed agent view graphs (stat_win.php entry point) 2018-04-19 13:15:13 +02:00
daniel 738776ef7e merge develop 2018-03-01 10:13:55 +01:00
fermin831 6093f6a0d8 [Metaconsole] Fixed img broken links on metaconsole 2018-02-28 12:08:15 +01:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
enriquecd 0fac48d71c Fix only show average graphs checkbox - #1460 2018-01-02 16:43:13 +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 3dad6d1837 Merge branch '1460-4706-No-funciona-token-Mostrar-solo-la-media-en-Visual-Styles' into 'develop' 
Only average token for graphs fix - #1460

See merge request artica/pandorafms!1040
 2017-12-21 10:42:12 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
Alejandro Gallardo Escobar dc579f6bbe [Console] Fixed the graph popup size in Firefox 2017-11-23 13:51:43 +01:00
Alejandro Gallardo Escobar 279a864d82 [Console] Adjustments to the graph popup size 2017-11-23 12:53:54 +01:00
vgilc 68a10343fb Revert "Merge branch…" 
This reverts merge request !1025
 2017-11-10 12:24:33 +01:00
enriquecd 24770c79ac Only average token for graphs fix - #1460 2017-11-08 10:40:03 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
daniel 8fbe360333 fixed minor errors 2017-10-13 14:44:12 +02:00
daniel e912e151a9 fixed errors in setup tip AND prediction modules 2017-10-11 13:17:29 +02:00
Daniel Maya 076e9cfec0 Changed period in functions_html 2017-10-09 12:25:01 +02:00
daniel 45743e2dc5 Merge branch 'develop' into 1335-Configurar_graficas_full_scale_por_defecto 2017-10-06 08:37:56 +02:00
daniel e032f40525 fixed minor error TIP 2017-09-26 12:03:00 +02:00