tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-25 11:48:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
34,376 Commits 34 Branches 30 Tags
Commit Graph

5147 Commits

Author SHA1 Message Date
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
fermin831
88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
fermin831
750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
manuel.montes
b28047ae9e Fixed the online-style of submit 2018-05-24 13:56:29 +02:00
fermin831
43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
daniel
16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
 2018-05-23 12:46:12 +02:00
fermin831
e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
Alejandro Gallardo Escobar
dcdce9c8fc Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-05-22 17:58:47 +02:00
Junichi Satoh
cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
fermin831
0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
daniel
78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
daniel
b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
daniel
79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
fermin831
ed18d58676 [Rebranding] Open operation/* 2018-05-14 15:52:51 +02:00
fermin831
fe124bff5f Fixed rss events due to secondary groups 2018-05-14 14:41:11 +02:00
fermin831
80aeded931 [Rebranding] Central node in network maps 2018-05-14 12:58:22 +02:00
vgilc
334d359076 Merge branch 'ent-2244-5710-No-funciona-el-Command-Line-Screenshot-en-v722' into 'develop' 
Fixed snapshots view in string data

See merge request artica/pandorafms!1471
 2018-05-14 11:46:07 +02:00
Fermin
29f56df1fd [Rebranding] Open operation/agents 2018-05-11 15:17:53 +02:00
daniel
123d49d604 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/styles/pandora.css
 2018-05-10 08:52:45 +02:00
daniel
f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
vgilc
220ea8d319 Merge branch 'ent-2103-wms-map-server' into 'develop' 
Added a new GIS map source type called WMS

See merge request artica/pandorafms!1469
 2018-05-09 10:28:30 +02:00
vgilc
c83def806b Merge branch '2231-Vistas-realtime-en-modulos-de-red' into 'develop' 
2231 vistas realtime en modulos de red

See merge request artica/pandorafms!1470
 2018-05-09 10:28:02 +02:00
vgilc
d746af9c28 Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop' 
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso

See merge request artica/pandorafms!1442
 2018-05-09 10:24:19 +02:00
vgilc
96df6938fa Merge branch 'ent-1917-tmb-personalizacion-exportacion-csv-de-eventos' into 'develop' 
Ent 1917 tmb personalizacion exportacion csv de eventos

See merge request artica/pandorafms!1438
 2018-05-09 10:23:38 +02:00
Alejandro Gallardo Escobar
e77b9f35b6 Improved the help of the WMS server connection creation 2018-05-08 17:29:58 +02:00
Alejandro Gallardo Escobar
e1319cb584 Improved the GIS map screen 2018-05-08 10:07:33 +02:00
fermin831
57fb63bd91 Fixed snapshots view in string data 2018-05-07 19:40:38 +02:00
fermin831
fd91ba63f6 Added realtime graph to monitor view 2018-05-07 12:53:12 +02:00
enriquecd
734c52d8bd New graph thermometer - #2214 2018-05-04 11:13:26 +02:00
fermin831
bd3f0712f1 Added separated window view to SNMP realtime graphs 2018-05-04 10:58:37 +02:00
fermin831
7162241ef9 Change the extension of CSV events file to .csv 2018-04-30 15:55:15 +02:00
Alejandro Gallardo Escobar
26338dab4f Add timezone selection to the user profile 2018-04-30 15:34:46 +02:00
fermin831
57c928ec8a [Events] Fixed csv export after secondary groups 2018-04-30 12:38:29 +02:00
Alejandro Gallardo Escobar
cc06dfe876 Added a new GIS map source type called WMS 2018-04-27 12:17:42 +02:00
daniel
27aa2a4632 fixed minor error in monitors view metaconsole filter group 2018-04-27 11:07:54 +02:00
daniel
2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
fermin831
9c9f75152d Added custom confirm dialog to events 2018-04-25 12:34:33 +02:00
daniel
3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
fermin831
112bbac527 Added id to in progress status bin icon (disabled) 2018-04-24 12:11:04 +02:00
fermin831
e09e1c4cd4 Fixed in progress event button in metaconsole and other problems 2018-04-24 11:54:45 +02:00
fermin831
a21eaafc61 Added in progress button to events list 2018-04-23 18:41:44 +02:00
fermin831
cfbe80669a Fixed unloaded includes in interface graphs 2018-04-23 15:48:17 +02:00
enriquecd
b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +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
vgilc
5ee01aa70f Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop' 
Cluster monitoring 2 - #2007

See merge request artica/pandorafms!1378
 2018-04-20 10:31:57 +02:00
fermin831
bc2c92807a Fixed agent view graphs (stat_win.php entry point) 2018-04-19 13:15:13 +02:00
fermin831
32f96c45ba [Events] Added ID to export CSV 2018-04-18 19:50:13 +02:00