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

5118 Commits

Author SHA1 Message Date
artica c5aa7997b1 Auto-updated build strings. 2015-11-22 00:01:10 +01:00
artica 2be00cadf4 Auto-updated build strings. 2015-11-21 00:01:10 +01:00
artica 5534805fd4 Auto-updated build strings. 2015-11-20 00:01:12 +01:00
artica ab2e1ed85d Auto-updated build strings. 2015-11-19 00:01:12 +01:00
m-lopez-f 858e3ea202 Fixed problems with performance. Tiquet: #2970 
(cherry picked from commit a57f62e5bf)
 2015-11-18 16:32:20 +01:00
m-lopez-f f774a52d90 Add new token to limit events to replicate in metaconsole. Tiquet: #2979 2015-11-18 15:23:50 +01:00
artica ed2dc8a816 Auto-updated build strings. 2015-11-18 00:01:11 +01:00
m-lopez-f 60dd633649 Add lost changes to lateral meni 
(cherry picked from commit e199a0a013)
 2015-11-17 15:04:51 +01:00
m-lopez-f 0ba80f3d3f Fixed gauges in custom and dashboard. Tiquet: #2967 2015-11-17 15:02:53 +01:00
m-lopez-f 25a3e09895 Move links submenu and add image and style. tiquet: #2960 2015-11-17 12:20:34 +01:00
m-lopez-f 4761d4ad8e Fixed styles of lateral menu and add link in submenu of tools. Tiquet: #2960 2015-11-17 11:20:45 +01:00
m-lopez-f 579793fa66 Fixed problems with bulk actions with modules. Tiquet: #2963 
(cherry picked from commit ca0ec7364c)
 2015-11-17 08:32:45 +01:00
artica 5b4d99a84f Auto-updated build strings. 2015-11-17 00:01:11 +01:00
pandora-release 762ffb8d28 Updated version and build strings. 2015-11-16 17:34:06 +01:00
artica 3d798d424f Auto-updated build strings. 2015-11-16 00:01:10 +01:00
artica 79937a4c93 Auto-updated build strings. 2015-11-15 00:01:10 +01:00
artica c1101c5adc Auto-updated build strings. 2015-11-14 00:01:11 +01:00
artica 264053676d Auto-updated build strings. 2015-11-13 00:01:13 +01:00
artica d194a312aa Auto-updated build strings. 2015-11-12 00:01:10 +01:00
artica 4d536d2086 Auto-updated build strings. 2015-11-11 00:01:11 +01:00
m-lopez-f dabf188970 Add increase line width in pChart graphs 2015-11-10 08:55:34 +01:00
m-lopez-f b3221f39d8 fixed problems with show data in forms 
(cherry picked from commit 494ae94cd9)
 2015-11-10 08:51:39 +01:00
artica afb00bbc2a Auto-updated build strings. 2015-11-10 00:01:11 +01:00
artica 2e46222915 Auto-updated build strings. 2015-11-08 00:01:08 +01:00
artica 99ee666889 Auto-updated build strings. 2015-11-07 00:01:13 +01:00
Junichi Satoh d443309fee Translated. 2015-11-06 19:08:59 +09:00
m-lopez-f f7c2d45210 Fixed custom graphs when include new type of graphs. 2015-11-06 10:34:11 +01:00
artica 38fc306741 Auto-updated build strings. 2015-11-06 00:01:11 +01:00
m-lopez-f 76be952702 Fixed other bug of simple value. Tiquet: #2952 
(cherry picked from commit a136629929)
 2015-11-05 13:48:50 +01:00
artica 71f5b5dc46 Auto-updated build strings. 2015-11-05 00:01:12 +01:00
fermin831 121faf9911 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-11-04 18:41:52 +01:00
fermin831 8eb41da69c Added help to SNMP alert position 2015-11-04 18:40:22 +01:00
m-lopez-f c72f024610 Add new custom graphs and fixed others graphs. 
New graphs:
	Bullet Chart
	Vertical Bars and Horizontal
	Pie
	Gauges
 2015-11-04 17:42:45 +01:00
m-lopez-f 5b78afc360 Translate to spanish from commit Added a new alert and plugin macro, _id_group_. by jsatoh 
(cherry picked from commit e4361bd860)
 2015-11-04 14:53:38 +01:00
m-lopez-f 5ea3f93124 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-11-04 10:11:47 +01:00
m-lopez-f 0826844290 Fixed problems with simple value in visual console. Tiquet: #2952 2015-11-04 10:11:33 +01:00
Junichi Satoh 4437c36995 Added a new alert and plugin macro, _id_group_. 2015-11-04 13:53:13 +09:00
artica 6b4ac60276 Auto-updated build strings. 2015-11-04 00:01:12 +01:00
artica b9559467e9 Auto-updated build strings. 2015-11-03 00:01:13 +01:00
artica 7baaaa72c7 Auto-updated build strings. 2015-11-02 00:01:10 +01:00
artica 34a4a12742 Auto-updated build strings. 2015-11-01 00:01:12 +01:00
artica 7d934f0352 Auto-updated build strings. 2015-10-31 00:01:12 +01:00
artica a75da53f10 Auto-updated build strings. 2015-10-30 00:01:10 +01:00
artica bfbd3ca718 Auto-updated build strings. 2015-10-29 00:01:13 +01:00
artica c6c2bae982 Auto-updated build strings. 2015-10-28 00:01:12 +01:00
artica d57ad5f188 Auto-updated build strings. 2015-10-27 00:01:13 +01:00
Arturo Gonzalez Diaz d54b8eb5e1 Fixed data in db information. Tickets#2851 & #2850 2015-10-26 10:58:31 +01:00
Arturo Gonzalez Diaz d096263bb3 Fixed data in db information 2015-10-26 10:03:42 +01:00
artica 3cd2f87da0 Auto-updated build strings. 2015-10-26 00:01:11 +01:00
artica 9d294b1934 Auto-updated build strings. 2015-10-25 00:01:11 +02:00
artica 32a62e6331 Auto-updated build strings. 2015-10-24 00:01:12 +02:00
Arturo Gonzalez Diaz ba492135ca Added a new option to visual setup that configure the interface unit graphs. Ticket#2620 2015-10-23 12:54:58 +02:00
artica aedd3a0c6b Auto-updated build strings. 2015-10-23 00:01:14 +02:00
fermin831 e026748a6e Fixed Securiry problems into SNMP v3 modules and browser 2015-10-22 19:08:25 +02:00
Arturo Gonzalez Diaz 2428436026 Changed texts in event replication helper 2015-10-22 12:09:12 +02:00
artica ffacbf7304 Auto-updated build strings. 2015-10-22 00:01:13 +02:00
Arturo Gonzalez Diaz 2d4a7b30eb Fixed 'no data' value in modules. Ticket#2925 2015-10-21 17:06:08 +02:00
m-lopez-f aaef69a0d2 Fixed problems with monitor report in custom report. Tiquet: #2848 2015-10-21 17:01:11 +02:00
Arturo Gonzalez Diaz e8cc3ccbf9 Fixed sql problemas in incidents section (oracle). Ticket#2902 2015-10-21 13:57:05 +02:00
Arturo Gonzalez Diaz 7aed427a7a Fixed special days in oracle. Ticket#2904 2015-10-21 13:31:17 +02:00
artica a139291145 Auto-updated build strings. 2015-10-21 00:01:13 +02:00
m-lopez-f 7ca6cff969 Fixed problems with view godmode extensions. Tiquet: #2912 2015-10-20 09:42:34 +02:00
artica b8b01a69d1 Auto-updated build strings. 2015-10-20 00:01:15 +02:00
m-lopez-f 256da3bc3d Add new functions from acl enterprise menu 2015-10-19 15:08:44 +02:00
artica dcc22b984e Auto-updated build strings. 2015-10-19 00:01:11 +02:00
artica 88810cd21a Auto-updated build strings. 2015-10-16 00:01:11 +02:00
Alejandro Gallardo Escobar 5cdfb2fef2 Fixed the uri of the xhr calls 2015-10-15 16:21:52 +02:00
Arturo Gonzalez Diaz 23d459a716 Fixed item colors when the module value is 'not iniciated'. Ticket#2896 2015-10-15 12:33:38 +02:00
m-lopez-f 8bb6cf069d Fixed text and delete text from export data csv. Tiquet: #2868 2015-10-15 11:28:44 +02:00
artica 6efda93c04 Auto-updated build strings. 2015-10-15 00:01:13 +02:00
pandora-release fecceb401f Updated version and build strings for the 6.0 release. 2015-10-14 17:05:51 +02:00
Ramon Novoa f0b2aa23eb Added the Satellite Server to the server's view. 2015-10-14 14:58:34 +02:00
Arturo Gonzalez Diaz 14fab9c05a Fixed area color in boolean graphs. Ticket #2713 2015-10-14 13:36:54 +02:00
m-lopez-f 83a372b317 Fixed style to login when have a problem 2015-10-14 11:29:18 +02:00
Arturo Gonzalez Diaz 67d0a6602e Fixed some things. 2015-10-14 08:38:30 +02:00
artica adebbb8c7d Auto-updated build strings. 2015-10-14 00:01:14 +02:00
Arturo Gonzalez Diaz 6e60292673 Fixed module proc data in tree view(Now respect module types). Ticket #2713 2015-10-13 12:35:40 +02:00
Arturo Gonzalez Diaz e30c210fd6 Fixed module proc data in tree view. Ticket #2713 2015-10-13 12:21:01 +02:00
Arturo Gonzalez Diaz 7edf134ea6 Fixed module proc data in tree view. Ticket #2713 2015-10-13 12:13:17 +02:00
artica 340d14836c Auto-updated build strings. 2015-10-13 00:01:09 +02:00
artica 42bb11e922 Auto-updated build strings. 2015-10-11 00:01:10 +02:00
artica 40365dfbaf Auto-updated build strings. 2015-10-10 00:01:13 +02:00
fermin831 18e3c4a927 Added open files to server remote config 2015-10-09 16:00:34 +02:00
artica 48274bac6d Auto-updated build strings. 2015-10-09 00:01:11 +02:00
m-lopez-f 6c81a0fffe Fixed print of graph. Tiquet: #2854 2015-10-08 16:26:27 +02:00
Arturo Gonzalez Diaz 7d253d0458 Fixed dasboard items dimension when creates a map made by user. Ticket#2816 2015-10-08 14:58:53 +02:00
artica 52f2f20f4c Auto-updated build strings. 2015-10-08 00:01:11 +02:00
Arturo Gonzalez Diaz 838e14f43b Fixed module-relationship table. Ticket#2766 2015-10-07 15:19:08 +02:00
Arturo Gonzalez Diaz d829d34f13 Merge branch 'develop' into new-agent-view 2015-10-07 15:02:02 +02:00
Arturo Gonzalez Diaz 5d9a3a24d3 New visualization of agent view 2015-10-07 09:57:45 +02:00
artica c5069de8ad Auto-updated build strings. 2015-10-07 00:01:13 +02:00
m-lopez-f bea8170120 Fixed problems with function and pass variables. Tiquet: #2856 2015-10-06 15:37:16 +02:00
artica a3f303b503 Auto-updated build strings. 2015-10-06 00:01:18 +02:00
Arturo Gonzalez Diaz c411c026fa Fixed external link images in meta. Ticket#2827 2015-10-05 16:45:49 +02:00
Arturo Gonzalez Diaz c24fd49536 Fixed historical data reports. Ticket#2730 2015-10-05 10:35:02 +02:00
artica fece1ed581 Auto-updated build strings. 2015-10-05 00:01:09 +02:00
artica a8d039576e Auto-updated build strings. 2015-10-04 00:01:10 +02:00
artica e8b2e593e7 Auto-updated build strings. 2015-10-03 00:01:11 +02:00
Arturo Gonzalez Diaz 1951cce831 Fixed general module search, now searches all the modules if the user haven't tags. Tickets #2847 and #2835 2015-10-02 14:24:00 +02:00
m-lopez-f 05f45e2692 Fixed problems with bulk module edit. Tiquet: #2837 2015-10-02 09:10:33 +02:00
artica 03bbdd1ab2 Auto-updated build strings. 2015-10-02 00:01:17 +02:00
Alejandro Gallardo Escobar 38d32af163 Fixed an ACL error which caused an incorrect module filtering (less restrictive) 2015-10-01 16:17:16 +02:00
m-lopez-f 62a1e8b4ed Update translations 2015-10-01 15:45:28 +02:00
Arturo Gonzalez Diaz 29174e6368 Fixed module graphs in visual console. 2015-10-01 13:42:37 +02:00
m-lopez-f a72f6e051b Fixed problems with show comment in events. Tiquet: #2820 2015-10-01 09:26:49 +02:00
Arturo Gonzalez Diaz f432535f07 Fixed services in visual console. Ticket#2745 2015-10-01 09:11:12 +02:00
artica f8a77bde45 Auto-updated build strings. 2015-10-01 00:01:13 +02:00
Alejandro Gallardo Escobar 85f7e49cd5 Modified the access permission to the modules when the user has common ACL 2015-09-30 18:32:55 +02:00
Arturo Gonzalez Diaz 0dd0ae4b4c Fixed module graph problems in visual console. Ticket#2825 2015-09-30 10:52:12 +02:00
m-lopez-f 7d6f03c3c8 Fixed problems with save event filters and dont save agent and module. Tiquet: #2794 2015-09-30 09:26:19 +02:00
artica 9fd7e8d3f1 Auto-updated build strings. 2015-09-30 00:01:14 +02:00
Arturo Gonzalez Diaz 8690f981fb Minor error fixed 2015-09-29 13:00:42 +02:00
fbsanchez 7091eb5aed Reporting - SLA - minor changes 2015-09-28 17:44:16 +02:00
Arturo Gonzalez Diaz a6699190bb Added a message in Simple Value to do it more clear. 2015-09-28 16:44:35 +02:00
m-lopez-f afef30bc75 Fixed when export csv in custom graph and only print one register and add label in export data, tiquet: #2755 2015-09-28 16:17:30 +02:00
Arturo Gonzalez Diaz 39f24f4eef Fixed error with module graph update in visual console. Ticket #2825 2015-09-28 09:55:16 +02:00
artica 56a34e6b27 Auto-updated build strings. 2015-09-28 00:01:10 +02:00
artica a533fae304 Auto-updated build strings. 2015-09-27 00:01:09 +02:00
artica 4e5c512edd Auto-updated build strings. 2015-09-26 00:01:11 +02:00
m-lopez-f 3ca1a4dc0f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-09-25 15:43:55 +02:00
m-lopez-f 4818b01e4f Add system to view instructions in details events. Tiquet: #2805 2015-09-25 15:43:34 +02:00
artica 6d61dd7ce9 Auto-updated build strings. 2015-09-25 00:01:12 +02:00
Arturo Gonzalez Diaz 9bb3ef098b Fixed view error with box item in visual console. Ticket #2744 2015-09-24 10:13:56 +02:00
artica c8a2782496 Auto-updated build strings. 2015-09-24 00:01:11 +02:00
Arturo Gonzalez Diaz 0ffc7eab6c Fixed bug that did not create boxes in visual console. Ticket #2744 2015-09-23 16:52:13 +02:00
m-lopez-f 9f1a301109 Fixed SSH to host response of events. Tiquet: #2792 2015-09-23 15:08:39 +02:00
m-lopez-f 67ee2232cb Fixed problems with filter agents with status not is normal. Tiquet: #2788 2015-09-23 13:40:46 +02:00
m-lopez-f 6858a12c57 Fixed function, and add condition if agent is not init. Tiquet: #2804 
(cherry picked from commit 4d73c6ca7c)
 2015-09-23 13:09:17 +02:00
m-lopez-f df6b3efe1a Fixed function, and add condition if agent is not init. Tiquet: #2804 2015-09-23 12:41:59 +02:00
artica 5c42206f1e Auto-updated build strings. 2015-09-23 00:01:42 +02:00
Alejandro Gallardo Escobar 0b914a39c7 Added a declaration of the function 'hex2bin' for the users that has a PHP version <5.4 2015-09-22 18:10:31 +02:00
Arturo Gonzalez Diaz 616ce1dbad Translations added 2015-09-22 16:04:33 +02:00
Arturo Gonzalez Diaz 4d9589b043 Revert "Translations added. Ticket#2547" 
This reverts commit b02e8aabdc.
 2015-09-22 14:09:54 +02:00
Arturo Gonzalez Diaz b02e8aabdc Translations added. Ticket#2547 2015-09-22 14:06:49 +02:00
Ramon Novoa 786cf45344 Updated update manager URLs. 2015-09-22 12:55:38 +02:00
artica dcacceed67 Auto-updated build strings. 2015-09-22 00:01:13 +02:00
Arturo Gonzalez Diaz 609c0791b7 Fixd lines in visual console (view section). Ticket#2741 2015-09-21 13:42:21 +02:00
artica 122fe19de2 Auto-updated build strings. 2015-09-21 00:01:11 +02:00
Junichi Satoh 907949c03c Added a new help. 2015-09-20 15:12:33 +09:00
artica f6a1384a31 Auto-updated build strings. 2015-09-20 00:01:09 +02:00
artica 32d02dca23 Auto-updated build strings. 2015-09-19 00:01:10 +02:00
artica fa6c625b4c Auto-updated build strings. 2015-09-18 00:01:08 +02:00
artica 0b324eee38 Auto-updated build strings. 2015-09-17 00:01:09 +02:00
artica b971f17822 Auto-updated build strings. 2015-09-16 00:01:11 +02:00
Arturo Gonzalez Diaz e95935244c Modified help message 2015-09-15 18:09:49 +02:00
fbsanchez 83d42bc67c Centered custom graphs 2015-09-15 17:56:26 +02:00
artica 08da51a449 Auto-updated build strings. 2015-09-15 00:01:11 +02:00
Arturo Gonzalez Diaz f413d637a2 Replaced the word that should never be named by "Severity" 2015-09-14 14:25:48 +02:00
Arturo Gonzalez Diaz 8f5cfb877a Replaced the word that should never be named by "Severity" 2015-09-14 14:07:21 +02:00
artica 8b9c2d0925 Auto-updated build strings. 2015-09-14 00:01:09 +02:00
artica a3e1c9e7fc Auto-updated build strings. 2015-09-13 00:01:09 +02:00
artica 75c8abbeeb Auto-updated build strings. 2015-09-12 00:01:10 +02:00
m-lopez-f 39ea3910b0 Fixed network maps when have more data. Tiquet: #2674 2015-09-11 10:57:36 +02:00
artica e45fa52e44 Auto-updated build strings. 2015-09-11 00:01:11 +02:00
m-lopez-f 9e32dd439e Fixed problems with return id generate when insert data with db engine is oracle 2015-09-10 11:34:36 +02:00
artica a52eb82d8d Auto-updated build strings. 2015-09-10 00:01:12 +02:00
m-lopez-f cda76e17c1 Fixed problems of header response of ajax. Tiquet: #2630 2015-09-09 15:01:12 +02:00
Arturo Gonzalez Diaz 2f1ce917c9 Visual parameter ambiguous in the legend of module graph changed. Ticket #2684 2015-09-09 13:10:47 +02:00
Arturo Gonzalez Diaz 3c1c05e493 Fixed broke images in module graphs. Ticket #2684 2015-09-09 12:20:05 +02:00
Arturo Gonzalez Diaz db608b3fb9 Fixed broke images in module graphs. Ticket #2684 2015-09-09 12:17:40 +02:00
artica 2f730fae87 Auto-updated build strings. 2015-09-09 00:01:13 +02:00
m-lopez-f 7f802868b4 Fixed problems with creation templates of network components. Tiquet: #2695 2015-09-08 13:15:21 +02:00
Arturo Gonzalez Diaz bd432db9fd Fixed sql error in statistics (oracle). Ticket #2690 2015-09-08 10:40:12 +02:00
artica ccd17545f3 Auto-updated build strings. 2015-09-08 00:01:12 +02:00
m-lopez-f 835b082450 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-09-07 15:21:38 +02:00
m-lopez-f e3f85ea567 Fixed problems process querys with db engine Oracle, when create wizard sla. Tiquet: #2688 2015-09-07 15:21:21 +02:00
Arturo Gonzalez Diaz 7f3632d098 Updated update message. Ticket #2167 2015-09-07 14:47:14 +02:00
Alejandro Gallardo Escobar e446399edb Added the 'right_align' class 2015-09-07 12:06:30 +02:00
Alejandro Gallardo Escobar bf287dd98b Adapted the tree view to show the elements detail info using the fixed-bottom-box module 2015-09-07 11:54:15 +02:00
Alejandro Gallardo Escobar a14c24aba0 Added a module to manage boxes prepared to show data in a useful way 2015-09-07 11:54:15 +02:00
Alejandro Gallardo Escobar 7bd8c8454c Visual changes to the detail tables 2015-09-07 11:54:15 +02:00
m-lopez-f 0e090c27c5 Fixed list of alerts when dbengine is Oracle. Tiquet: #2699 2015-09-07 11:50:35 +02:00
artica 4d79e00658 Auto-updated build strings. 2015-09-06 00:01:09 +02:00
artica 5848590a9f Auto-updated build strings. 2015-09-05 00:01:11 +02:00
artica f9048fe0ab Auto-updated build strings. 2015-09-04 00:01:10 +02:00
artica 285aba895f Auto-updated build strings. 2015-09-03 00:01:11 +02:00
m-lopez-f ada0f3b20c Fixed problems with selected a network component when create module and lost data in plugins. Tiquet: #2484 2015-09-02 13:02:00 +02:00
m-lopez-f 28e1f0a7c0 Fixed network components when search in db engine Oracle 2015-09-02 10:58:56 +02:00
m-lopez-f ec9a52337d Fixed position of submenus 2015-09-02 10:45:59 +02:00
m-lopez-f 9ee27da75f Fixed position of submenus 2015-09-02 09:30:28 +02:00
artica aaf459790f Auto-updated build strings. 2015-09-02 00:01:10 +02:00
m-lopez-f f8d508b9e1 Change visual option of custom report front to url dinamic, Tiquet: #2660 2015-09-01 12:50:09 +02:00
m-lopez-f f09d8b1fbd Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-09-01 12:21:19 +02:00
m-lopez-f 42a4a3a27b Change orentation of two submenus. Tiquet: #2627 2015-09-01 12:20:37 +02:00
artica b5d878124e Auto-updated build strings. 2015-09-01 00:01:11 +02:00
Alejandro Gallardo Escobar 1dc46f6d67 Fixes to improve the compatibility with oracle 2015-08-31 17:51:59 +02:00
artica 53f029b2d6 Auto-updated build strings. 2015-08-31 00:01:09 +02:00
artica a7958c94a5 Auto-updated build strings. 2015-08-30 00:01:10 +02:00
artica 40befc9e05 Auto-updated build strings. 2015-08-29 00:01:10 +02:00
Arturo Gonzalez Diaz b2ead0c430 Fixed format error in tree view. Ticket#2642 2015-08-28 16:26:43 +02:00
Arturo Gonzalez Diaz add2e74e2b Added new function in functions_api to set cache agent value. 2015-08-28 15:57:53 +02:00
artica 1682816366 Auto-updated build strings. 2015-08-28 00:01:10 +02:00
artica a018d6c6c2 Auto-updated build strings. 2015-08-27 00:01:08 +02:00
mdtrooper 3cdf73e1ca Now the boolean charts is showed as digital signal charts (added in the pchart engine) 
(cherry picked from commit ef85096922)

Conflicts:
	pandora_console/include/graphs/fgraph.php
 2015-08-26 16:09:00 +02:00
Arturo Gonzalez Diaz fdf65ad5da Fixed problem whit simple value. 2015-08-26 13:30:54 +02:00
Arturo Gonzalez Diaz 93ed16b6be Fixed problem with percentile bar label. Ticket #2635 2015-08-26 13:08:54 +02:00
mdtrooper 6507d09792 Fixed the percentile bar. TICKET: #2537 2015-08-26 12:06:44 +02:00
mdtrooper 6d66bb59b7 Reupload the lost changes in own last cherry pick 2015-08-26 12:03:37 +02:00
artica 4bcf7e46d8 Auto-updated build strings. 2015-08-26 00:02:01 +02:00
mdtrooper 1577621b5b Now the boolean charts is showed as digital signal charts (only with dinamic flot charts engine) 
(cherry picked from commit 3d014c6ab5)

Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2015-08-25 13:42:38 +02:00