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

7213 Commits

Author SHA1 Message Date
artica 1f06f8ec92 Auto-updated build strings. 2015-04-19 00:01:10 +02:00
artica d7b6fb05b4 Auto-updated build strings. 2015-04-18 00:01:11 +02:00
Alejandro Gallardo Escobar 968c179c0c Merge branch 'develop' into feature/meta-agent-cache 2015-04-17 16:16:48 +02:00
Alejandro Gallardo Escobar 8826f0c80c Adapted the code to improve the performance of the tree view on the metaconsole with the 'tmetaconsole_agent' 2015-04-17 16:12:51 +02:00
m-lopez-f eb5180d582 Merge branch 'feature/NewView' into develop 2015-04-17 13:06:20 +02:00
artica 332c5b0af5 Auto-updated build strings. 2015-04-17 00:01:30 +02:00
mdtrooper ec39e664fa Fixed the SLA with a period have a setted a time slots. 
(cherry picked from commit c5b5d60d4c)
 2015-04-16 19:21:13 +02:00
m-lopez-f 44128e3570 Merge branch 'develop' into feature/NewView 2015-04-16 16:00:56 +02:00
mdtrooper 3dbd433285 Fixed the history data in boolean and string charts. 
(cherry picked from commit f24919fe4b)
 2015-04-16 15:38:59 +02:00
m-lopez-f 036538baa9 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 15:18:28 +02:00
m-lopez-f 0df919dcdd Fixed order data to click in show data module in tree view,tiquet: #2080 2015-04-16 15:18:11 +02:00
Alejandro Gallardo Escobar e0165a4ab3 Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 14:23:34 +02:00
Alejandro Gallardo Escobar 190e105baa Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 13:40:42 +02:00
Alejandro Gallardo Escobar 08dd1832ac Found and removed the async ajax calls (finally!). That was a very bad practice. 
Also removed the alert, cause after closing it, the blur event was executed again, with another alert that repeated the process.
 2015-04-16 13:29:23 +02:00
Alejandro Gallardo Escobar a70d751c38 Removed the text of the agent search. 
The text 'All' makes no sense, cause the input searchs for it unnecessarily and the empty texts represents better the lack of filter.
 2015-04-16 13:16:50 +02:00
Vanessa Gil e93da42f5f Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-16 12:38:43 +02:00
Vanessa Gil a0750e2b96 Fixed bug loading ajax. 2015-04-16 12:37:42 +02:00
Ramon Novoa 4f94d5bb50 Do not displayed advanced filters if custom filters are disabled. Small 
fixes.
 2015-04-16 11:35:20 +02:00
m-lopez-f db3e276195 Fixed error when flash_chart is false, colors of pie bad drawn, tiquet: #2107 2015-04-16 10:50:43 +02:00
m-lopez-f 42e81ccc5a Fixed style in menu and views and upload new images 2015-04-15 17:35:36 +02:00
Vanessa Gil 0899805c11 Update translations. 2015-04-15 15:34:54 +02:00
Alejandro Gallardo Escobar afada892fe Modified the 'group_get_data' and 'group_get_group_list' to retrieve the data from the metaconsole's new agent cache table 2015-04-15 15:29:07 +02:00
Vanessa Gil 7225b61530 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 13:14:33 +02:00
Vanessa Gil 802779c2b4 Change titles. 2015-04-15 13:14:03 +02:00
m-lopez-f 2813fac10b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-15 12:40:05 +02:00
m-lopez-f 80144fe8bd Change in event save filter, name of label(META), tiquet: #2075 2015-04-15 12:39:50 +02:00
Vanessa Gil a1c3f2d100 Group filter changed. 2015-04-15 12:22:07 +02:00
m-lopez-f 89fa37578a Changed rowspan size 2015-04-15 12:14:55 +02:00
m-lopez-f 012393d164 Changed javascript code to jquery code and fixed style 2015-04-15 12:13:47 +02:00
m-lopez-f b78f39f420 Delete develop traces 2015-04-15 11:30:50 +02:00
m-lopez-f a77d962590 Modify styles in tactical view and tables is responsibe with window size 2015-04-15 11:28:07 +02:00
m-lopez-f 25277eb550 Fixed menu smtp from agent detail and modify agent 2015-04-15 10:26:48 +02:00
Vanessa Gil 2af12537ed Ticket #2073. 2015-04-15 10:00:42 +02:00
m-lopez-f 2d9168ac8f Changed styles from views in nodo 2015-04-15 09:45:13 +02:00
m-lopez-f aab9628cbd Merge branch 'develop' into feature/NewView 2015-04-15 09:38:00 +02:00
artica df42c4715f Auto-updated build strings. 2015-04-15 00:01:11 +02:00
m-lopez-f 7cb8e9dd16 Changed visual to tree view 2015-04-14 10:12:13 +02:00
m-lopez-f 1a612ff3a8 Changed style in tactical view 2015-04-14 09:56:49 +02:00
m-lopez-f b8dd9705f1 Fixed style when option of submenu is selected 2015-04-14 09:56:04 +02:00
m-lopez-f 50f15dc507 Fixed errors php in menu 2015-04-14 09:37:28 +02:00
m-lopez-f f3de8d5bc8 Changed visual of tactical view 2015-04-14 09:36:41 +02:00
m-lopez-f 21f04e6a3a Update maxlenght to password field in use detail editor, tiquet: #2098 2015-04-14 08:37:11 +02:00
artica 5533100ac4 Auto-updated build strings. 2015-04-14 00:01:14 +02:00
Vanessa Gil 4392958648 Ticket #2044. 2015-04-13 16:58:05 +02:00
m-lopez-f 85b00c080c Draw pie with filter results and changed label, tiquet: #2076 2015-04-13 15:50:49 +02:00
m-lopez-f cc03dcd127 Fixed visual list of servers in administrations servers 2015-04-13 15:05:41 +02:00
m-lopez-f 962e7c9583 Fixed color when menu is selected 2015-04-13 13:57:15 +02:00
m-lopez-f a34b16a938 Merge branch 'develop' into feature/NewView 2015-04-13 13:44:43 +02:00
m-lopez-f 8d8476118f reorganize menu and changed styles of menu 2015-04-13 13:44:29 +02:00
Alejandro Gallardo Escobar 8e733cf019 Merge branch 'develop' into feature/meta-agent-cache 2015-04-13 12:54:39 +02:00
m-lopez-f 9e0e996960 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-13 12:48:28 +02:00
m-lopez-f b533897415 Fixed problems with print pie, show more data that data in list event,Nodo and Meta, tiquet: #2076 2015-04-13 12:47:49 +02:00
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
Ramon Novoa cc1faf5eb9 Added a missing include. 2015-04-07 11:55:18 +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
Ramon Novoa 45ff0d0b6a Merge branch 'develop' into feature/meta-agent-cache 2015-04-06 15:26:51 +02:00
Ramon Novoa 71def9a7fb Implemented an agent cache for the metaconsole. 2015-04-06 15:26:26 +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