Commit Graph

7158 Commits

Author SHA1 Message Date
Vanessa Gil 6ed03f09dd Merge branch 'feature/sessions' into develop 2015-04-13 11:28:08 +02:00
Vanessa Gil 8600863d22 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-13 11:27:55 +02:00
Vanessa Gil a7f748b7be Ticket #1354. 2015-04-13 11:27:23 +02:00
m-lopez-f 4158afde8c Merge branch 'develop' into feature/NewView 2015-04-13 09:09:04 +02:00
m-lopez-f eac0f87405 Fixed menu and add new option in events sub_menu 2015-04-13 09:07:52 +02:00
artica 4498d1f842 Auto-updated build strings. 2015-04-13 00:01:09 +02:00
artica a171f76ff2 Auto-updated build strings. 2015-04-12 00:01:09 +02:00
artica ec514cd27e Auto-updated build strings. 2015-04-11 00:01:12 +02:00
Alejandro Gallardo Escobar 7d7b6ef02f Updated the help info 2015-04-10 19:16:06 +02:00
Alejandro Gallardo Escobar ddfb4ed2c4 Fixed a visual error 2015-04-10 14:10:12 +02:00
Alejandro Gallardo Escobar ae080dc33b Merge branch 'feature/ticket#2047-New-acl-bits' into develop 2015-04-10 14:06:35 +02:00
Alejandro Gallardo Escobar 03f9f94e04 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-10 14:06:27 +02:00
m-lopez-f a02acad7c4 Change visual of menu and funcionality 2015-04-10 13:43:02 +02:00
Alejandro Gallardo Escobar 10c94d51d9 Error fixes 2015-04-10 12:34:42 +02:00
Alejandro Gallardo Escobar 488c4976b0 ACL fixes 2015-04-10 12:34:19 +02:00
m-lopez-f e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +02:00
m-lopez-f 91556f8096 Add new funcionality to menu and fixed other problems 2015-04-10 09:29:33 +02:00
artica 7286bd012f Auto-updated build strings. 2015-04-10 00:01:10 +02:00
m-lopez-f 01149f214a Changed lateral menu, order options and eliminate options 2015-04-09 15:04:23 +02:00
Alejandro Gallardo Escobar d25c32b76d Added some lost columns to check the ACL permissions 2015-04-09 15:03:26 +02:00
m-lopez-f a6af8ab18d Merge branch 'develop' into feature/NewView 2015-04-09 14:47:06 +02:00
Alejandro Gallardo Escobar ae8789db9e Changes and improvements on the ACL checks 2015-04-09 14:05:23 +02:00
Alejandro Gallardo Escobar d28cd4c172 Changes on the functionality and the ACL checks. Great improvements on the ACL management 2015-04-09 14:00:37 +02:00
Akihiro Uchida 4e7fdcda53 Fixed codes to disable input datepicker. 2015-04-09 20:17:39 +09:00
artica 9353bdcdcb Auto-updated build strings. 2015-04-09 00:01:11 +02:00
Alejandro Gallardo Escobar 57e8032b20 Added info about the new visual console and networkmap bits 2015-04-08 20:07:16 +02:00
Miguel 0781d1f981 Merge pull request #12 from uchida/enable-to-postpone-planned-downtime
Enable to postpone planned downtime when in execution and its type is once
2015-04-08 16:25:29 +02:00
Akihiro Uchida 7e5bd7e22e Enable to postpone planned downtime when in execution and its type is once
Based on the contribution of Hiroki Shimizu
2015-04-08 17:40:58 +09:00
m-lopez-f 45289330bd Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-08 09:31:58 +02:00
m-lopez-f 2ac3c6f694 if user is strict user only see option all in select servers in filter eventlist, tiquet: #2074 2015-04-08 09:31:45 +02:00
artica da36f04a1a Auto-updated build strings. 2015-04-08 00:01:10 +02:00
mdtrooper f9936267e0 Fixed the separator (sometimes it is other) in the ajax call get_agent_modules_json_for_multiple_agents.
(cherry picked from commit 6f71a01b0c)
2015-04-07 17:20:53 +02:00
m-lopez-f b700dca0a4 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-07 16:29:06 +02:00
m-lopez-f 5be63acffc Fixed html title when click graph in meta and nodo in status monitor, tiquet: #2077 2015-04-07 16:26:57 +02:00
m-lopez-f 878c676c76 Fixed hidden menu and preparated immovable menu 2015-04-07 09:50:46 +02:00
Alejandro Gallardo Escobar 9035eda57d Added the new access bits to the profiles list and editor 2015-04-06 18:51:24 +02:00
Alejandro Gallardo Escobar e61ecd3f73 Added the new 'tperfil' columns to the function "get_acl_column" 2015-04-06 16:54:24 +02:00
Alejandro Gallardo Escobar 533167e46e Added the values of the new access bits to the default profiles 2015-04-06 16:03:23 +02:00
Alejandro Gallardo Escobar a06f8eee09 Added new profile bits to control the access to the visual console and the network maps 2015-04-06 16:03:23 +02:00
Alejandro Gallardo Escobar f6405cb8e0 Reduced the length of the profile types cause they only store 1 or 0 2015-04-06 16:03:23 +02:00
m-lopez-f d04575bec4 Changed visual of console 2015-04-06 15:30:53 +02:00
Vanessa Gil f1593481eb Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-06 15:10:53 +02:00
Vanessa Gil 2635f5ec41 New strings to translate. 2015-04-06 15:10:13 +02:00
m-lopez-f 0e277ad1ef Add new image for tree view, not view in internet explorer
(cherry picked from commit b63f1cfe81)
2015-04-06 13:53:49 +02:00
m-lopez-f b63f1cfe81 Add new image for tree view, not view in internet explorer 2015-04-06 13:49:28 +02:00
m-lopez-f ff7fd3d8a7 Fixed menu and change visual 2015-04-06 12:44:35 +02:00
m-lopez-f da24887922 Merge branch 'develop' into feature/NewView 2015-04-06 12:33:26 +02:00
m-lopez-f 0ab523ca9a Add warning when 'Event Storm protection' is activated, tiquet: #2065 2015-04-06 12:18:14 +02:00
m-lopez-f 790c81a250 Add order in parent select in static graph in visual console, Tiquet: #2067 2015-04-06 10:25:03 +02:00
artica 3cd52be7e9 Auto-updated build strings. 2015-04-06 00:01:07 +02:00
m-lopez-f a55fb5ec72 Change visual of console 2015-04-01 14:13:41 +02:00
m-lopez-f f8c481a3ee Change views and styles in Console 2015-04-01 13:47:45 +02:00
m-lopez-f 0213cd7405 Change views and styles in Console 2015-04-01 13:24:53 +02:00
m-lopez-f acfd2146dc Change views and styles in Console 2015-04-01 12:09:23 +02:00
Vanessa Gil fae014e570 Update translations. 2015-04-01 11:09:04 +02:00
m-lopez-f 0e29cc520e Change visual of node 2015-03-31 17:26:22 +02:00
m-lopez-f 6cec43c5fa Merge branch 'develop' into feature/NewView 2015-03-31 17:23:05 +02:00
m-lopez-f d7f6868217 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-31 17:03:36 +02:00
Alejandro Gallardo Escobar 72af6134a1 Improved a jquery selector 2015-03-31 18:10:13 +02:00
Alejandro Gallardo Escobar 722c95c470 Replaced the old tooltip for the jquery widget version in the networkmaps section 2015-03-31 17:30:53 +02:00
m-lopez-f 7e02141e3f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-31 14:46:58 +02:00
m-lopez-f a756ef1ab5 Fixed filter by name module in tree view, Node and Meta. tiquet: 2056 2015-03-31 14:46:43 +02:00
Alejandro Gallardo Escobar c0bc9ad136 Added a padding to the graph to prevent the text cut 2015-03-31 14:11:17 +02:00
Alejandro Gallardo Escobar 521845ee91 ACL improvements 2015-03-31 13:30:16 +02:00
Alejandro Gallardo Escobar 9bb62f1f43 Added the new way to store the maps in groups and ACL improvements 2015-03-31 12:27:12 +02:00
Alejandro Gallardo Escobar 973f0c3e2e Error fixes and improvements 2015-03-31 12:27:12 +02:00
m-lopez-f e90406abaf Hide data of agent/module when search again or new search. tiquet: #2052 2015-03-31 10:25:43 +02:00
m-lopez-f 92b1be06ab Change visual of Group View 2015-03-31 09:52:27 +02:00
m-lopez-f 16679256e9 Change visual of any views 2015-03-31 09:28:06 +02:00
m-lopez-f 62c940986b Change menu and actions in this menu. 2015-03-31 09:18:46 +02:00
m-lopez-f a9bf3490fb Merge branch 'develop' into feature/NewView 2015-03-31 09:13:51 +02:00
m-lopez-f f23e6ceacf Change label text in save filter events in metaconsole, tiquet: #2053 2015-03-31 08:36:54 +02:00
Alejandro Gallardo Escobar 91b7bf19a5 Added functions to help with the data assign to the variables 2015-03-30 17:28:12 +02:00
Alejandro Gallardo Escobar 9920fa9a3f Fixed a missing tooltip 2015-03-30 12:03:34 +02:00
m-lopez-f ffd099c782 Changed for fixed visual of metaconsole 2015-03-30 10:17:35 +02:00
artica 1d21b164b8 Auto-updated build strings. 2015-03-29 00:01:09 +01:00
Alejandro Gallardo Escobar fd41fba3d8 Changed the behaviour of the network map tooltip info for the strict users 2015-03-27 14:32:31 +01:00
artica c29c47dc09 Auto-updated build strings. 2015-03-27 00:01:12 +01:00
Alejandro Gallardo Escobar 3d84b80c52 Fixed an error on the function 'tags_get_user_module_and_tags' caused by a string=integer comparision 2015-03-26 22:28:18 +01:00
Alejandro Gallardo Escobar 12013f8263 Merge branch 'feature/ticket#2028-network-map' into develop 2015-03-26 21:22:51 +01:00
Alejandro Gallardo Escobar b99e777300 Fixed an error on the function"tags_get_all_user_agents" 2015-03-26 21:17:53 +01:00
Alejandro Gallardo Escobar 63d322244d Added a new parameter to the modules retrieving by tag function 2015-03-26 19:34:56 +01:00
mdtrooper b72af65bd0 Fixed the ajax of get modules when the user have profiles with tags and without tags. 2015-03-26 18:44:16 +01:00
m-lopez-f c7b3104224 In alert command preview is not array but contain data, create textarea instead of select 2015-03-26 15:33:37 +01:00
m-lopez-f 220ad47b3f Change menu and visual any views, tiquets: #1815,#1702 2015-03-26 13:12:48 +01:00
m-lopez-f 7bca421a79 Fixed user list visual in metaconsole tiquet: #2042 2015-03-26 08:48:14 +01:00
artica 7acba25778 Auto-updated build strings. 2015-03-26 00:01:14 +01:00
Alejandro Gallardo Escobar fa58fb25ed Added new columns to the table 'tnetwork_map' 2015-03-25 20:55:02 +01:00
Alejandro Gallardo Escobar f462e38a7f Now the data handling of the function 'events_page_details' id done connected to the node when necessary 2015-03-25 19:57:34 +01:00
Alejandro Gallardo Escobar 08d93c8b28 Now the 'avg_only' option is enabled by default for the metaconsole users 2015-03-25 19:20:48 +01:00
Alejandro Gallardo Escobar 3b06988082 Fixed an ACL error on the 'tags_check_acl' and 'tags_check_acl_events' functions 2015-03-25 19:19:20 +01:00
m-lopez-f 75d9d58c48 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 16:15:04 +01:00
m-lopez-f c7fa8710ec Changed histogram of events in tactical view to metaconsole, tiquet: #2029 2015-03-25 16:14:47 +01:00
mdtrooper 786c6efa4b Fixed the style of status message when edit a filter and added more information in the messages.
(cherry picked from commit 085c4521d0)
2015-03-25 11:24:08 +01:00
Alejandro Gallardo Escobar b945ee8892 ACL improvements for the module graphs 2015-03-25 12:26:16 +01:00
Alejandro Gallardo Escobar de65702f9a Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 12:25:13 +01:00
m-lopez-f 00ae340c87 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-25 10:31:50 +01:00
m-lopez-f 97bfae819c Change message when search and no find data. Tiquet: #2039 2015-03-25 10:31:32 +01:00
Vanessa Gil ede2e3794a Merge branch 'feature/translations' into develop 2015-03-25 10:20:11 +01:00
Vanessa Gil 6987d75b41 Update translations. 2015-03-25 10:18:48 +01:00