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

3176 Commits

Author SHA1 Message Date
fermin831
e19f116637 Fixed add particular agents to GIS layers 2018-06-22 13:33:04 +02:00
fermin831
16cff75242 Revert "Recover critical status the SNMPTrap on SNMP console actions" 
This reverts commit 8ef8f31f67278c4ee0c2bfd7879e60ac7ade794a.
 2018-06-22 13:30:10 +02:00
fermin831
6a53e924bb Fixed agents display on GIS maps 2018-06-22 13:28:39 +02:00
fermin831
8ef8f31f67 Recover critical status the SNMPTrap on SNMP console actions 2018-06-21 19:27:33 +02:00
manuel.montes
09ed3fa7c3 Fixed visual bug 2018-06-21 14:21:22 +02:00
fermin831
288d2bafb6 Added in progres selected button to events view 2018-06-20 18:56:44 +02:00
daniel
46c23f9deb fixed minor errors in graphs: tree, labels, tocken meta 2018-06-14 12:17:16 +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
enriquecd
632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
vgilc
24ec62b807 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed errors agent access and other fix

See merge request artica/pandorafms!1525
 2018-06-12 12:13:46 +02:00
daniel
6eba3250da fixed errors agent access and other fix 2018-06-12 12:08:04 +02:00
vgilc
fdbe03ef83 Merge branch 'ent-639-add-user-defined-timezones' into 'develop' 
Add user defined timezones

See merge request artica/pandorafms!1462
 2018-06-12 10:20:31 +02:00
manuel.montes
bcd937b1ba Fixed bug in pandorafms 2018-06-11 17:42:12 +02:00
Alejandro Gallardo Escobar
f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar
fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831
c949ab3dc7 Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-11 15:55:48 +02:00
daniel
f85a8b513a fixed errors 2018-06-08 14:30:15 +02:00
daniel
eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
Fermin
2e1bb2ac9c Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-07 11:38:37 +02:00
fermin831
0afd436cea [ACL API] Added ACL to some get api calls and refactorized agent count 2018-06-06 15:04:30 +02:00
daniel
badfd83b0d 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
 2018-06-06 11:57:02 +02:00
daniel
89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
vgilc
a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
vgilc
dbb802fb31 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop' 
New graph thermometer - #2214

See merge request artica/pandorafms!1465
 2018-06-04 10:19:21 +02:00
vgilc
4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop' 
Fixed sources in log report

See merge request artica/pandorafms!1508
 2018-06-04 10:17:17 +02:00
daniel
47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
fermin831
6bd672fd38 Fixed free search in events view 2018-05-31 20:32:04 +02:00
danielmaya
04f117523b Fixed sources in log report 2018-05-31 17:33:51 +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
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