tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,881 Commits 34 Branches 30 Tags
Commit Graph

9881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mdtrooper
f84863540f Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +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 6f71a01b0c4cabdb14e2953239b1330c12f5ec26)
 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
hkosaka
f005b00eb6 Use -C to invoke tentacle_server when using SSL proxy mode (see also e8e59f3e3e98). 2015-04-07 13:08:50 +09: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 b63f1cfe817448709561a5d06d99ad89d7e5b68e)
 2015-04-06 13:53:49 +02:00