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

8944 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 71a20bd286 More work on the visualization section of the eHorus integration 
(cherry picked from commit 7f72a089e0)
 2016-06-21 18:30:36 +02:00
Alejandro Gallardo Escobar 077420ffd4 Fixed an error in a query 
(cherry picked from commit 5616429f9e)
 2016-06-21 18:30:28 +02:00
Alejandro Gallardo Escobar 5ba9cba911 Added a connection test with the eHorus API and custom fields management 
(cherry picked from commit 142d544ef1)
 2016-06-21 18:30:22 +02:00
Alejandro Gallardo Escobar d990d11970 Added a new agent tab to launch the eHorus Client 
(cherry picked from commit 8fa87e7e1e)
 2016-06-21 18:30:15 +02:00
Alejandro Gallardo Escobar 5191f8658a Added a setup section for ehorus 
(cherry picked from commit e3cfca24ed)
 2016-06-21 18:29:56 +02:00
Alejandro Gallardo Escobar 40b8efc532 Added the function 'agents_get_agent_custom_field' 
(cherry picked from commit e515a1d587)
 2016-06-21 18:28:46 +02:00
Alejandro Gallardo Escobar 62db44de88 Added the eHorus Client assets 
(cherry picked from commit df89969301)
 2016-06-21 18:28:34 +02:00
pandora-release 1259031201 Updated version and build strings for the 6.0SP3 release. 2016-06-21 16:52:39 +02:00
fermin831 08dacd5f43 Login wizard may be displayed on enterprise version 2016-06-21 11:59:35 +02:00
artica 72df262424 Auto-updated build strings. 2016-06-21 00:01:27 +02:00
fermin831 9c0c54ff2e Fixed width and position on logout message 2016-06-20 19:05:21 +02:00
fermin831 68f4086c93 Changed E-mail label into initial wizard 2016-06-20 15:15:36 +02:00
Daniel Maya 1cfd6f71b8 fixed accent mark. Ticket #3845. 
(cherry picked from commit 6370904ba9)
 2016-06-20 10:37:12 +02:00
artica 78df657404 Auto-updated build strings. 2016-06-20 00:01:21 +02:00
artica fde32a1e21 Auto-updated build strings. 2016-06-19 00:01:21 +02:00
artica b5ccac16f7 Auto-updated build strings. 2016-06-18 00:01:23 +02:00
fermin831 8c4a41d504 Solved problems with single quotes when download UM messages 2016-06-17 12:35:33 +02:00
fermin831 840a50bea2 Fixed bug when return button in initial wizard 2016-06-17 10:39:58 +02:00
Daniel Maya ca3f10405c new macro in CLI and API get_module_id. Ticket #3525. 
(cherry picked from commit 0035b74f47)
 2016-06-17 10:28:43 +02:00
fermin831 82a9ebfb7e Now UM notification ball dynamically is updated dynamically 2016-06-17 10:08:06 +02:00
fermin831 b57efa690e Changed display way on um messages view and other changes 2016-06-17 09:29:08 +02:00
artica 7c0c461920 Auto-updated build strings. 2016-06-17 00:01:25 +02:00
Ramon Novoa e84cf3efb0 Temporarily disabled iface info from network maps. 
Network maps became too cluttered when layer 2 interface information was
displayed. They will probably be merged with the network console.
 2016-06-16 19:00:41 +02:00
Ramon Novoa 5363c339bc Only draw module relationships for layer 2 maps. 2016-06-16 19:00:41 +02:00
fermin831 52d15da62e Added email to field1_recovery 2016-06-16 14:49:44 +02:00
fermin831 a5fcab683e Changed Mail to XXX to Mail to Admin and email is retrieved from initial wizard 2016-06-16 12:17:44 +02:00
Daniel Maya d89f8aadc2 added new types of text. Ticket #3435. 
(cherry picked from commit ee4a5f4119)
 2016-06-16 11:53:08 +02:00
artica 5dc523a959 Auto-updated build strings. 2016-06-16 00:01:23 +02:00
fermin831 4547cd105d Hide new update manager menu to all users except PM 2016-06-15 17:56:53 +02:00
Daniel Maya c007e5f14c Fixed help alert command. Ticket #3415. 
(cherry picked from commit b40f0848e0)
 2016-06-15 15:54:27 +02:00
fermin831 4472fc727b Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-15 15:35:39 +02:00
fermin831 ccbd793307 Solved download messages at first time and other visual changes 2016-06-15 15:34:30 +02:00
Daniel Maya 2ff2cc9d90 fixed change url update manager. Ticket #3809. 
(cherry picked from commit da7d8d0773)
 2016-06-15 11:15:31 +02:00
Daniel Maya 390942dcbc button inserted Agent_detail. Ticket #3831. 
(cherry picked from commit 2c0dae13b1)
 2016-06-15 10:55:17 +02:00
artica c32c32b4d4 Auto-updated build strings. 2016-06-15 00:01:21 +02:00
fermin831 e4314cbe8b Definitive messages to update manager and solved some issues. 2016-06-14 18:33:39 +02:00
fermin831 ef32c2ec22 Added language and fixed last_um_check functionality 2016-06-14 16:54:04 +02:00
Daniel Maya 98d266e2f9 fixed update manager. Ticket #3551. 
(cherry picked from commit 04fcccd578)

Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
 2016-06-14 16:46:46 +02:00
fermin831 5e6080c354 Fixed download messages for first time 2016-06-14 15:12:39 +02:00
fermin831 fffa84620f Added function update_manger_get_last_message 2016-06-14 14:51:10 +02:00
fermin831 fcf0f63e26 Fixed update manager submenu position 2016-06-14 12:39:26 +02:00
Daniel Maya 9df12f7aca fixed table filemanager. Ticket #3435. 
(cherry picked from commit 36bb76bebc)
 2016-06-14 12:11:37 +02:00
artica ba0c60ab9b Auto-updated build strings. 2016-06-14 00:01:24 +02:00
fermin831 27cebafd02 Merge branch 'feature/identification_wizard' into pandora_6.0 
Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
 2016-06-13 18:36:35 +02:00
fermin831 a5bb107984 Fixed display newsletter checkbox at first time 2016-06-13 18:18:36 +02:00
fermin831 2ea9b6f97b Added some dafault values 2016-06-13 18:18:12 +02:00
Alejandro Gallardo Escobar 1e732146df Added tooltips to the horizontal and vertical short labels. Ticket #3634 2016-06-13 17:33:26 +02:00
fermin831 a93a6befee Removed some unwanted traces 2016-06-13 17:31:17 +02:00
fermin831 72fbd5e67a Added um messages pop-up and fixed popup order 2016-06-13 17:24:47 +02:00
Alejandro Gallardo Escobar 86ceea13de Reduced the max length of the x and y labels of the vertical and horizontal graphs. Ticket #3634 2016-06-13 17:18:00 +02:00
fermin831 e14e4090d2 Added Mark as read button to update manager messages 2016-06-13 16:47:38 +02:00
fermin831 c9e3fdaa61 Updated menu to put update manager in main menu 2016-06-13 16:30:54 +02:00
Alejandro Gallardo Escobar fb17378abc The service default image is not previewed now. Ticket #3753 2016-06-13 15:43:40 +02:00
Daniel Maya 10849233af change url update manager. Tciket #3809. 
(cherry picked from commit aa4e07cb13)
 2016-06-13 15:38:29 +02:00
fermin831 e578c8ff64 Added some definitive images and fixed several design issues 2016-06-13 13:06:10 +02:00
m-lopez-f d83e6c8443 Fixed Pie charts and legend. Tiquet: #3742 2016-06-13 09:03:18 +02:00
m-lopez-f abac67c1b4 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-13 09:00:57 +02:00
m-lopez-f 583a84b8d7 Fixed Pie charts and legend. Tiquet: #3742 
(cherry picked from commit 54c6de6a41)
 2016-06-13 09:00:48 +02:00
artica b5c95ce4c1 Auto-updated build strings. 2016-06-13 00:01:21 +02:00
artica f44f28b270 Auto-updated build strings. 2016-06-12 00:01:22 +02:00
artica 7a1693fb93 Auto-updated build strings. 2016-06-11 00:01:26 +02:00
Sancho Lerena 1fbe092a48 Show the gauge custom graphs with the defined height. If the user can choose the graph height he should be able to see how is used. 2016-06-10 11:42:37 +02:00
m-lopez-f 2303bc9356 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-10 11:11:23 +02:00
m-lopez-f d058d096d7 Fixed problems when selected no interactive charts or print pdfs. Tiquet: #3742 2016-06-10 11:11:11 +02:00
Daniel Maya 260c27f44a fixed aupdate manager. Ticket #3551. 
(cherry picked from commit 3d1f30ec12)
 2016-06-10 10:51:09 +02:00
artica 54d0a042ef Auto-updated build strings. 2016-06-10 00:01:27 +02:00
fermin831 9fbeab4975 Added notification messages on menu 2016-06-09 18:54:59 +02:00
Alejandro Gallardo Escobar 6e8d57f3be Fixed the error which prevented the opening of the QR dialog on the public console section 2016-06-09 17:00:57 +02:00
Alejandro Gallardo Escobar 4cd2e7750b Fixed the error which prevented the opening of the QR dialog on the public console section 2016-06-09 16:58:32 +02:00
fermin831 cf157c70c1 New update manager specification changes 2016-06-09 16:06:34 +02:00
Alejandro Gallardo Escobar 4434e8f839 Added a style rule to hide the dialog button of the dialogs which use the 'no-close' class 2016-06-09 11:57:05 +02:00
artica 66af262aba Auto-updated build strings. 2016-06-09 00:01:27 +02:00
Alejandro Gallardo Escobar ac5c29b190 Removed the tinyMCE from the agent description and custom fields. Removed the url injection feature from the agent description. Added the url injection feature to the agent custom fields of some sections. Ticket #3783 2016-06-08 19:15:50 +02:00
fermin831 60df86a8d4 Added feedback message when subscription and register 2016-06-08 18:32:15 +02:00
Alejandro Gallardo Escobar d91ebbd4a7 Fixed the custom colors for the vertical bar graphs. Ticket #3784 2016-06-08 15:49:20 +02:00
fermin831 bdbb74e6db Added connection with update manager and some design changes 2016-06-08 13:51:34 +02:00
artica 1e2946c5c7 Auto-updated build strings. 2016-06-08 00:01:24 +02:00
Daniel Maya 7849ebb7b0 Auto-hidden menu.Ticket #3601 
(cherry picked from commit c5e97eb396)
 2016-06-07 14:55:26 +02:00
Alejandro Gallardo Escobar 3daf59701a Reduced the width of the graph to avoid the horizontal overflow. Ticket #3778 2016-06-07 14:48:20 +02:00
Alejandro Gallardo Escobar 679b0c6749 Fixed the huge space between legend elements on the pie graphs. Ticket #3785 2016-06-07 13:10:08 +02:00
Alejandro Gallardo Escobar b32172651d Removed the zoom. Now the graph is loaded with the page width after the page load 2016-06-07 11:39:47 +02:00
Alejandro Gallardo Escobar fb3792645b Added options to print a custom or sparse graphs 2016-06-07 11:38:32 +02:00
Daniel Maya 84865f61ae fixed tab main data. Ticket #3641. 
(cherry picked from commit a15955a9e0)
 2016-06-07 09:05:44 +02:00
artica 1e2f84c314 Auto-updated build strings. 2016-06-07 00:01:28 +02:00
Alejandro Gallardo Escobar 8000b55a68 Now avg_only is enabled by default in stat_win.php and errors fixed. Ticket #3778 2016-06-06 17:01:34 +02:00
Alejandro Gallardo Escobar ce43094d18 Improved the area graphs visualization 2016-06-06 16:57:55 +02:00
Arturo Gonzalez 6ee19c78e6 Fixed icon color when links two visual consoles. Ticket #3776 
(cherry picked from commit 94a9009d72)
 2016-06-06 15:03:43 +02:00
Arturo Gonzalez 25829e8897 Fixed agent name and module name in interfaces module graphs. Ticket #3768 
(cherry picked from commit 9f0208e570)
 2016-06-06 13:30:04 +02:00
m-lopez-f f5304aac0b Reorganizate code for use OS/module groups in metaconsole. Tiquet #3490 
(cherry picked from commit 7ca577ce51)
 2016-06-06 13:05:57 +02:00
fermin831 747e87b87f Solved problems (deletion, edition, creation) on GIS maps Tickets #3762 2016-06-06 12:13:01 +02:00
Daniel Maya e6c4070212 Fixed Default value .Ticket #3601 
(cherry picked from commit 004b5c57b9)
 2016-06-06 11:42:52 +02:00
Daniel Maya 380cafffde New development. Display lateral menus whit left click. 
(cherry picked from commit 0acf4f41eb)
 2016-06-06 11:41:00 +02:00
m-lopez-f d0556f96c3 Fixed url in firts task of custom field 
(cherry picked from commit 18ba1ed374)
 2016-06-06 10:18:06 +02:00
artica ebad98e70a Auto-updated build strings. 2016-06-06 00:01:22 +02:00
artica 4281865011 Auto-updated build strings. 2016-06-05 00:01:23 +02:00
artica f1c4b1a041 Auto-updated build strings. 2016-06-04 00:01:24 +02:00
Alejandro Gallardo Escobar c723a34f2c Improved the visualization of the static graphs which have a little height 2016-06-03 13:29:19 +02:00
Arturo Gonzalez 3c96db8f48 Saml login. Added restiction to admin users and saml button 
(cherry picked from commit 9bc9bb9cc3)
 2016-06-03 12:49:05 +02:00
Arturo Gonzalez 48bc2159fe Fixed agent serarch in metaconsole events. Ticket#3766 
(cherry picked from commit 31fcab0309)
 2016-06-03 11:01:36 +02:00
artica ee45bd15d6 Auto-updated build strings. 2016-06-03 00:01:24 +02:00
Alejandro Gallardo Escobar 03f23f43ec Now the color of the text of the transparent area graphs will be some type of grey. Ticket #3736 2016-06-02 19:02:39 +02:00
Alejandro Gallardo Escobar a15d45fb30 Minor visual fix 2016-06-02 18:08:15 +02:00
Alejandro Gallardo Escobar 038769eae1 Applied a reduction coefficient to the line thickness of the static line graphs. Ticket #3765 2016-06-02 18:03:04 +02:00
Daniel Maya f5799dccf8 fixed special characters output. Ticket #3741. 
(cherry picked from commit 9f2e523136)
 2016-06-02 16:32:47 +02:00
Daniel Maya f6519bca70 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-02 15:15:26 +02:00
Daniel Maya a291eaf143 Fixed menu position. Ticket #3709. 
(cherry picked from commit a42e3a310b)
 2016-06-02 15:14:28 +02:00
Alejandro Gallardo Escobar caac294f6e Fix to print the user lines into the visual maps. Ticket #3746 2016-06-02 15:13:46 +02:00
m-lopez-f 4f9ea2a456 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-02 12:57:46 +02:00
m-lopez-f b549ab6a35 Fixed problems with update setup of update manager and ad Auidt log register when updated pandora fms. Tiquet: #3549 
(cherry picked from commit db8c7cb4f5)
 2016-06-02 12:57:36 +02:00
artica 8844ac8d0f Auto-updated build strings. 2016-06-02 00:01:23 +02:00
fermin831 54cc99140c Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:09:24 +02:00
fermin831 16869aa3a4 Revert "Reformuled users_can_manage_group_all Tickets #3680" 
This reverts commit 417b3faba5.
 2016-06-01 18:02:49 +02:00
fermin831 417b3faba5 Reformuled users_can_manage_group_all Tickets #3680 2016-06-01 18:00:14 +02:00
m-lopez-f 1c53126a4c Fixed problems with reports. Tiquet: #3682 2016-06-01 16:40:35 +02:00
m-lopez-f 46158fedfc Revert "Added the 'automatic custom graphs' in the template reports in metaconsole." 
This reverts commit 447550ed50.
 2016-06-01 15:58:18 +02:00
m-lopez-f ea77a5bb89 Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-06-01 15:56:59 +02:00
mdtrooper 447550ed50 Added the 'automatic custom graphs' in the template reports in metaconsole. 
(cherry picked from commit 8d54a6762a)
 2016-06-01 15:56:37 +02:00
Alejandro Gallardo Escobar 6d55f515d6 Fixed the menu parameter of the area graph function 2016-06-01 15:02:52 +02:00
m-lopez-f 463f96f123 Fixed problems with session in pandora mobile verison. Tiquet: #3656 
(cherry picked from commit decb820659)
 2016-06-01 12:54:39 +02:00
Alejandro Gallardo Escobar 650b42966f Now when using the wizard the value macro are added only to the simple values as expected. Ticket #3751 2016-06-01 12:00:45 +02:00
artica a701221376 Auto-updated build strings. 2016-06-01 00:01:22 +02:00
Alejandro Gallardo Escobar adc2ab3b31 Removed the strange behaviour of the label size when printing a resized map 2016-05-31 17:08:34 +02:00
fermin831 df295dca48 Enlarged the text on plugins fields Tickets #3739 2016-05-31 15:31:00 +02:00
m-lopez-f 5a14da9081 Fixed pandora login in mobile version. Tiquet: #3656 
(cherry picked from commit ef4597ee94)
 2016-05-31 13:13:30 +02:00
Alejandro Gallardo Escobar e4357a1047 Added some space to the bottom of the vertical bars graph 2016-05-31 12:13:42 +02:00
Alejandro Gallardo Escobar 3a7ff0e93d Now the dashboard and visual console area graphs show the last and avg value in their legend 2016-05-31 11:23:47 +02:00
Arturo Gonzalez 9fc7436792 Added a function to dashboard groups checkboxes. Ticket#2598 
(cherry picked from commit a4da4bbc8d)
 2016-05-31 10:06:36 +02:00
artica 7aa7681ac3 Auto-updated build strings. 2016-05-31 00:01:27 +02:00
Alejandro Gallardo Escobar 6e2cddc48d Fixed the custom line thickness of the flot line graphs 2016-05-30 19:31:01 +02:00
Alejandro Gallardo Escobar 7cec21d839 Now all the graphs of the visual console are images by default 2016-05-30 18:53:15 +02:00
Alejandro Gallardo Escobar e5b49240c7 Now the pie graph is bigger 2016-05-30 18:47:05 +02:00
Alejandro Gallardo Escobar a2ba4acb6c Apply the fix of the area graph height only to the dashboard and the visual consoles 2016-05-30 17:55:07 +02:00
Alejandro Gallardo Escobar 2aa420e623 Re-calculate the area graph height with the legend height 2016-05-30 17:33:13 +02:00
Alejandro Gallardo Escobar 90427855fb Now all the graphs of the fullscreen visual console are images 2016-05-30 17:30:24 +02:00
Alejandro Gallardo Escobar 285d7971e0 Improved the graphs behaviour when rendered into the dashboard or the visual console 2016-05-30 15:25:35 +02:00
fermin831 dd6fa27402 Fixed module selection in scheduled downtimes Tickets #3444 2016-05-30 15:24:18 +02:00
fermin831 39ec80731e Added skeleton of new update manager communication functions 2016-05-30 11:55:20 +02:00
Arturo Gonzalez 56ffe00f45 Fixed errors in saml login page 
(cherry picked from commit 9255d87869)
 2016-05-30 10:24:22 +02:00
Arturo Gonzalez df2c51c308 Fixed last value checkbox in reports. Ticket#3685 
(cherry picked from commit 2ce399dd0d)
 2016-05-30 08:59:35 +02:00
Arturo Gonzalez fdbcea32fa New css class to saml button login... 
(cherry picked from commit a5eeb7e4f1)
 2016-05-30 08:14:34 +02:00
artica 621480341d Auto-updated build strings. 2016-05-30 00:01:22 +02:00
artica 263d5704b6 Auto-updated build strings. 2016-05-29 00:01:23 +02:00
artica 8db5a5c4fd Auto-updated build strings. 2016-05-28 00:01:24 +02:00
fermin831 2c197bacec Now messages deleted is not deleted, only mark as deleted to that user 2016-05-27 15:00:21 +02:00
fermin831 0ce116e2fc Merge branch 'pandora_6.0' of https://github.com/pandorafms/pandorafms into pandora_6.0 2016-05-27 14:08:43 +02:00
fermin831 13fd06dda1 Solved problems with availability reports and unknown time (2) 
Tickets #3449
 2016-05-27 14:06:05 +02:00
Arturo Gonzalez 9caeb1e7f8 Added a diferent loging page to saml system. 
(cherry picked from commit 8cb651079a)
 2016-05-27 14:00:30 +02:00
Alejandro Gallardo Escobar a1bad2ecb1 Show only the avg on the legend of the area/line graphs when the graph is inside a dashboard or a visual map 2016-05-27 11:43:47 +02:00
artica e9af4b5d75 Auto-updated build strings. 2016-05-27 00:01:26 +02:00
fermin831 c91a473748 Solved newsletter display if forced. Delete all required when return 2016-05-26 18:41:38 +02:00