Commit Graph

9007 Commits

Author SHA1 Message Date
Junichi Satoh 81fe7bd8b6 Removed unused argument from check_acl() and added new option(argument) for
roots up.
Fixed that users_can_manage_group_all() returns true even if user does not
have rights to manage group all.

(cherry picked from commit 11aba4ce63)
2016-07-15 15:54:38 +09:00
artica d2811e57f2 Auto-updated build strings. 2016-07-15 00:01:29 +02:00
artica cc5a16aeb9 Auto-updated build strings. 2016-07-14 00:01:26 +02:00
Arturo Gonzalez f96442ba37 Added some changes to SAML login system.
(cherry picked from commit 318ba4f049)
2016-07-13 15:34:55 +02:00
artica 80a9739f4c Auto-updated build strings. 2016-07-13 00:01:25 +02:00
artica c0605809a6 Auto-updated build strings. 2016-07-09 00:01:23 +02:00
artica afb6d566fb Auto-updated build strings. 2016-07-08 00:01:25 +02:00
artica faa2a02ba8 Auto-updated build strings. 2016-07-07 00:01:24 +02:00
Daniel Maya cfcd09b7ba New icon in shortcut bar. Ticket #3018.
(cherry picked from commit 0346516129)
2016-07-06 12:34:26 +02:00
artica b2677386ed Auto-updated build strings. 2016-07-06 00:01:25 +02:00
fbsanchez 2cc6d2e3f9 minor fix 2016-07-04 10:50:26 +02:00
fbsanchez b954f78542 Fixed: File upload (mib upload)i
> safe_output on field and php warning
2016-07-04 10:49:29 +02:00
axl89 5a68d2a065 Fixed french translation 2016-07-01 13:10:00 +02:00
artica 9ab625b2a6 Auto-updated build strings. 2016-07-01 00:01:28 +02:00
Daniel Maya d4cae402ed Fixed labels in pie custom graphs. Ticket #3873.
(cherry picked from commit 834612f125)
2016-06-30 10:49:31 +02:00
Daniel Maya a770d51c73 Added pagination in custom graphics. Ticket #3886.
(cherry picked from commit 00b17f5eda)
2016-06-30 08:50:04 +02:00
artica 6ee0cf2320 Auto-updated build strings. 2016-06-30 00:01:29 +02:00
axl89 b6919492c7 Fixed translations to Spanish 2016-06-29 15:19:42 +02:00
Axel 38af0fe510 Update menu.php
Fixed a call to the translation function
2016-06-29 15:14:31 +02:00
Daniel Maya 6bb5b93a7f show unknown and not init modules. Ticket #3844.
(cherry picked from commit e4cdef363e)
2016-06-29 10:44:00 +02:00
artica 3277b6e47e Auto-updated build strings. 2016-06-29 00:01:26 +02:00
Daniel Maya e9dc54360e Fixed issue. Ticket #3844.
(cherry picked from commit 2f5457d938)
2016-06-28 16:11:45 +02:00
Daniel Maya 60834ec44d Changed Server Help. Ticket #2932.
(cherry picked from commit c0ec08d23b)
2016-06-28 15:43:15 +02:00
Daniel Maya ee35e98fed New filter actions. Ticket #3893.
(cherry picked from commit ec073eb8b4)
2016-06-28 15:34:45 +02:00
artica 69796812c4 Auto-updated build strings. 2016-06-28 00:01:27 +02:00
Ramon Novoa c22ea46899 Fixed a regexp in functions_api.php. Sometimes img tags are not properly
closed!
2016-06-27 13:37:40 +02:00
m-lopez-f a8b4f7f535 Fixed help of action alerts. Tiquet: #3889
(cherry picked from commit 04c1304a5d)
2016-06-27 13:10:07 +02:00
Daniel Maya 4b84d63ef8 Fixed path. Ticket #3364.
(cherry picked from commit d6b614199a)
2016-06-27 11:58:31 +02:00
Daniel Maya 5b47b9a323 redirect mobile. Ticket #3364.
(cherry picked from commit a75e416b8c)

Conflicts:
	pandora_console/index.php
2016-06-27 11:23:44 +02:00
artica 2c0ffb3453 Auto-updated build strings. 2016-06-27 00:01:24 +02:00
artica af29615d17 Auto-updated build strings. 2016-06-26 00:01:29 +02:00
Sancho Lerena b1f064956c Added help about how to include a graph in the email 2016-06-25 10:39:14 +02:00
Sancho Lerena b51f25d2aa Added help about how to include a graph in the email 2016-06-25 10:37:41 +02:00
artica 506543363a Auto-updated build strings. 2016-06-25 00:01:29 +02:00
m-lopez-f e314332320 Fixed problems with clippy styles 2016-06-24 12:23:23 +02:00
artica 94c0c2dffd Auto-updated build strings. 2016-06-24 00:01:24 +02:00
artica 995d826b1b Auto-updated build strings. 2016-06-23 00:01:30 +02:00
Alejandro Gallardo Escobar 8b0ee05bb7 Changed the name of an ehorus integration tab 2016-06-22 16:10:38 +02:00
m-lopez-f fa4d2f165d Fixed styles
(cherry picked from commit e3701608fa)
2016-06-22 16:02:22 +02:00
Alejandro Gallardo Escobar b74267676d Fixes on the ehorus integration ACL 2016-06-22 15:28:32 +02:00
Alejandro Gallardo Escobar 55fee7bf8f Improved the ACL of the ehorus integration 2016-06-22 14:50:57 +02:00
axl89 9f3a106660 Added eHorus translations 2016-06-22 12:18:58 +02:00
fermin831 c2f2258466 Changed newsletter wizard width 2016-06-22 11:30:16 +02:00
fermin831 87af9708a9 Added some translation handles to wizard buttons 2016-06-22 11:28:32 +02:00
axl89 69ada0c728 Updated translations 2016-06-22 11:08:52 +02:00
Daniel Maya c565fa42f6 Fixed allow create planned downtimes in the past. Ticket #3454.
(cherry picked from commit c24b118398)
2016-06-22 09:52:20 +02:00
artica a65d355cf0 Auto-updated build strings. 2016-06-22 00:01:27 +02:00
Alejandro Gallardo Escobar 152812fdcb Updated the eHorus client assets 2016-06-21 18:41:21 +02:00
Alejandro Gallardo Escobar bfa028cc2d Now the permission to access the eHorus client is Agents Manager (AM)
(cherry picked from commit 8af8b6a480)
2016-06-21 18:32:35 +02:00
Alejandro Gallardo Escobar ddb082a6a2 Now the eHorusID custom field is created automatically when the feature is enabled
(cherry picked from commit 16454c30a1)
2016-06-21 18:32:26 +02:00
Alejandro Gallardo Escobar 67fc5ab762 Added a variant of the ehorus logo
(cherry picked from commit bc9bd99f23)
2016-06-21 18:32:19 +02:00
Alejandro Gallardo Escobar 7a0a540314 Now the eHorus ID custom field name has a default value
(cherry picked from commit df99cf9f64)
2016-06-21 18:32:12 +02:00
Alejandro Gallardo Escobar 8fdfd8891e Added a menu entry for the eHorus setup
(cherry picked from commit 8bb9a31a28)
2016-06-21 18:32:03 +02:00
Alejandro Gallardo Escobar 5548e838e0 Minor text fix
(cherry picked from commit 9e9c45d031)
2016-06-21 18:31:57 +02:00
Alejandro Gallardo Escobar 8943ffd7b2 Changed the temporal images of the menus for eHous with their definitive version
(cherry picked from commit 853ef78168)
2016-06-21 18:31:51 +02:00
Alejandro Gallardo Escobar 432d4408eb Added a set of images for the eHorus integration
(cherry picked from commit b9fb8a8f47)
2016-06-21 18:31:43 +02:00
Alejandro Gallardo Escobar da25a05b28 Updated the eHorus client assets
(cherry picked from commit 2861b877f6)
2016-06-21 18:31:36 +02:00
Alejandro Gallardo Escobar faaf3df492 Added a token expiration check to warn users they should request another
(cherry picked from commit 2b88b58448)
2016-06-21 18:31:27 +02:00
Alejandro Gallardo Escobar 557d98c540 Updated the eHorus client sources to fix an error with the header
(cherry picked from commit 82bd565f5d)
2016-06-21 18:31:20 +02:00
Alejandro Gallardo Escobar df4817e2cf Updated the eHorus client assets
(cherry picked from commit 8c0d2b1614)
2016-06-21 18:31:12 +02:00
Alejandro Gallardo Escobar 7e3f7adff4 Almost finished the eHorus integration
(cherry picked from commit efc5642aa2)
2016-06-21 18:31:05 +02:00
Alejandro Gallardo Escobar 29420c7141 Added subtabs for the ehorus tab
(cherry picked from commit 63fb20ed95)
2016-06-21 18:30:59 +02:00
Alejandro Gallardo Escobar 70e127cb95 Fixed a style rule
(cherry picked from commit 9ef5ab0fec)
2016-06-21 18:30:51 +02:00
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