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

7018 Commits

Author SHA1 Message Date
artica a4084db68d Auto-updated build strings. 2015-03-20 00:01:07 +01:00
artica b5eed86c42 Auto-updated build strings. 2015-03-19 00:01:10 +01:00
Vanessa Gil 819ee73a28 Fixed bug #2007 2015-03-18 18:07:14 +01:00
mdtrooper c525de71fd Fixed the delete events in metaconsole. TICKET: #2016 2015-03-18 17:57:04 +01:00
m-lopez-f c287a2064a Changed style to visualice data in 'Group view' tiquet: #1879 2015-03-18 13:11:30 +01:00
m-lopez-f 6c1b434565 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-18 11:46:49 +01:00
m-lopez-f 912462c71a Solvented visualization of group in few views, tiquet: #1946 2015-03-18 11:46:27 +01:00
mdtrooper 868d1d5b39 Cleaned source code style. 2015-03-18 10:58:31 +01:00
Alejandro Gallardo Escobar a19f3939e9 Fixed an SQL error when serving the agent status tooltip 
(cherry picked from commit 554fb7aa2c)
 2015-03-18 12:27:25 +01:00
artica d967b4eed9 Auto-updated build strings. 2015-03-18 00:01:12 +01:00
mdtrooper 5f57ca716b Change some code for the future fixed in PHP about the try catch in the includes. TICKET: #1791 (still open thanks PHP) 2015-03-17 16:48:52 +01:00
m-lopez-f e0e531bf05 Add field to custom line widht to custom graph tiquet: #1875 2015-03-17 15:36:24 +01:00
Alejandro Gallardo Escobar f0dc044d37 Removed the the event checkboxes 
(cherry picked from commit aad9e08700)
 2015-03-17 14:22:32 +01:00
Vanessa Gil 9512be8483 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-17 12:36:28 +01:00
Vanessa Gil 7f542c1093 Fixed bug in event list. 2015-03-17 12:36:10 +01:00
m-lopez-f 41863d37e8 Increase maxlenght of field custom raw url, tiquet: #1798 2015-03-17 10:09:28 +01:00
artica a67d1444c9 Auto-updated build strings. 2015-03-17 00:01:10 +01:00
mdtrooper 1b5779eb57 Fixed the bug when the group name is showed instead the icon 2015-03-16 17:47:19 +01:00
m-lopez-f c873fd6993 Delete includes of javascript because this includes are exists in header, tiquet #1878 2015-03-16 15:21:18 +01:00
Alejandro Gallardo Escobar d58493a2b7 Minor fix 2015-03-16 14:50:06 +01:00
mdtrooper c57f1cac33 Fixed the massive edition of modules with white spaces in name modules. TICKET: #1832 
(cherry picked from commit 35a9e7c591)
 2015-03-16 12:52:35 +01:00
mdtrooper 2646d92b86 Added the function 'modules_is_disable_agent' and fixed the show disabled agents in reports into items 'general' 'sla'. 
(cherry picked from commit cf9c53f220)
 2015-03-16 11:59:11 +01:00
m-lopez-f b58bd83523 Fixed problems when filter by 'Specify time range' and lost filter and not show data 2015-03-16 11:58:12 +01:00
m-lopez-f 93a2d15b2c display data changed depending if compare dates or show date directly in the tree view #1976 2015-03-16 11:47:12 +01:00
artica 763f291ee9 Auto-updated build strings. 2015-03-16 00:01:10 +01:00
artica c7beabc9d4 Auto-updated build strings. 2015-03-15 00:01:11 +01:00
artica a0b924218e Auto-updated build strings. 2015-03-14 00:01:12 +01:00
Alejandro Gallardo Escobar 8fd7830856 Fixed a timepicker include 2015-03-13 14:57:58 +01:00
Alejandro Gallardo Escobar 7fda8a296d Now some monitor graphs are shown in 'only average' mode when accessing it from the metaconsole 2015-03-13 14:43:30 +01:00
Alejandro Gallardo Escobar bc6495412e Minor fixes 2015-03-13 14:41:47 +01:00
Vanessa Gil b1ebd56a1c Fixed search by group. 2015-03-13 12:56:28 +01:00
Alejandro Gallardo Escobar 5a07aabecd Now the monitor graphs of the tree view modules are 'only average' on the metaconsole 2015-03-13 14:18:15 +01:00
Alejandro Gallardo Escobar ba6c8809de Fixed the agent status filter for the strict ACL users 2015-03-13 13:54:09 +01:00
m-lopez-f 01600cffb2 Changed visual of metaconsole 2015-03-13 10:52:49 +01:00
artica 1fb32cfd07 Auto-updated build strings. 2015-03-13 00:01:10 +01:00
Alejandro Gallardo Escobar 24a67be19e Error fixes on the agent counter functions 2015-03-12 17:30:29 +01:00
Vanessa Gil 8e3ccd84bc Fixed bug #1958. 2015-03-12 15:32:33 +01:00
Alejandro Gallardo Escobar 1bea97c9c4 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-12 15:08:37 +01:00
Alejandro Gallardo Escobar 59de2a0597 Fixed on the agent counters for the strict ACL users 2015-03-12 15:06:40 +01:00
Alejandro Gallardo Escobar b84bef8547 Fixes on the agent and monitor counter functions 2015-03-12 15:05:54 +01:00
Alejandro Gallardo Escobar 28c9f19320 Added the monitor filter to the strict ACL users 2015-03-12 15:04:12 +01:00
Vanessa Gil 90c4be1b50 Merge branch 'feature/1932' into develop 2015-03-12 13:28:59 +01:00
Vanessa Gil 21d2cae717 Fixed ticket #1932. 2015-03-12 13:28:24 +01:00
mdtrooper acb37f591c Fixed the event with filter EVENT_CRIT_WARNING_OR_CRITICAL in function 'events_get_events'. TICKET: #1909 2015-03-12 12:31:15 +01:00
Vanessa Gil 17a1fd38a9 Fixed ticket #1953. 2015-03-12 12:18:01 +01:00
m-lopez-f 8096cbfa19 Fixed progragate acl tags, children not get tags to father, Tickets #1939 2015-03-12 10:55:06 +01:00
m-lopez-f d673737e2d Changed visual of metaconsole 2015-03-12 10:27:28 +01:00
artica db80f1c2b3 Auto-updated build strings. 2015-03-12 00:01:13 +01:00
Alejandro Gallardo Escobar e664e34dbe Now the agent counters have urls in the metaconsole too 2015-03-11 22:04:39 +01:00
Alejandro Gallardo Escobar 89c307bd5d Fixed a status filter error 2015-03-11 21:24:58 +01:00
Alejandro Gallardo Escobar ecb5a4097f A lot of changes into the agents and modules counters 2015-03-11 21:06:16 +01:00
m-lopez-f 7e1b707b64 Changed visual of metaconsole 2015-03-11 15:57:05 +01:00
mdtrooper 674a4f2697 Fixed the lost units in the 'general' item in reports. 
(cherry picked from commit 86424849c6)
 2015-03-11 14:44:07 +01:00
mdtrooper 01e6fd70a1 Fixed the item 'general' in reports. TICKET: #1902 
(cherry picked from commit 3e31951c46)
 2015-03-11 11:44:23 +01:00
m-lopez-f 6986fe0993 Changed visual of metaconsole 2015-03-11 11:31:46 +01:00
artica 1767993c84 Auto-updated build strings. 2015-03-11 00:01:11 +01:00
Vanessa Gil 041e9c00bc Fixed bug #1913. 2015-03-10 17:09:31 +01:00
mdtrooper db6e59c9bb Fixed the preview alert action in the form editor. TICKET: #1944 
(cherry picked from commit b7264f61c3)

Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/configure_alert_action.php
 2015-03-10 15:38:56 +01:00
mdtrooper 7883e08af5 Working in the files for the next cherry pick. 2015-03-10 15:36:23 +01:00
Alejandro Gallardo Escobar de78ae6542 Fixed the agents ok counter for strict acl users 2015-03-10 14:30:27 +01:00
mdtrooper 2798b2230a Fixed. Added lost result message in the api call create tag 2015-03-10 12:35:31 +01:00
Alejandro Gallardo Escobar e7f55390a1 Removed debug traces 2015-03-10 13:37:10 +01:00
Vanessa Gil 23b8a1930b Fixed bug #1914. 2015-03-10 11:37:46 +01:00
Vanessa Gil 717d32ecca Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-10 11:20:47 +01:00
Vanessa Gil 73049cf0d1 Fixed bug #1918. 2015-03-10 11:16:28 +01:00
mdtrooper 6c6a866047 Fixed the user with strict acl tags does show any tag when the groups has not any tag. TICKET: #1921 2015-03-10 11:13:46 +01:00
artica ac6d1c424b Auto-updated build strings. 2015-03-10 00:01:13 +01:00
Alejandro Gallardo Escobar d0dff23658 Added tag/group filter support to the metaconsole 2015-03-09 21:12:57 +01:00
Alejandro Gallardo Escobar 79b77a6ecf Error fixes (again) 2015-03-09 20:43:41 +01:00
Alejandro Gallardo Escobar eab7e8dc66 Error fixes 2015-03-09 20:41:23 +01:00
Alejandro Gallardo Escobar d04d44c518 Added an alias to the "html_debug_print" function 2015-03-09 20:20:37 +01:00
Alejandro Gallardo Escobar d8ead991c8 Error fixes 2015-03-09 20:19:55 +01:00
Alejandro Gallardo Escobar 4e76794f90 Minor fix 2015-03-09 19:37:29 +01:00
Alejandro Gallardo Escobar 756cf4cbf7 Added the posibility to filter by 1 group or tag. Useful when accessing the tree view from the group view 2015-03-09 19:29:45 +01:00
m-lopez-f e38f31caaa Changed visual of metaconsole 2015-03-09 16:33:27 +01:00
mdtrooper d2accaae68 Fixed the update of alert command usability. 
(cherry picked from commit f475dc80bd)

Conflicts:
	pandora_console/godmode/alerts/configure_alert_command.php
 2015-03-09 16:25:58 +01:00
mdtrooper 18fd20c078 Show group name instead the icon in metaconsole. TICKET: #1501 
(cherry picked from commit 1141127a34)
 2015-03-09 15:14:33 +01:00
mdtrooper dba729a272 Fixed the lines in visualmaps with service items. TICKET: #1896 
(cherry picked from commit 80bd7b0db2)

Conflicts:
	pandora_console/operation/visual_console/public_console.php
	pandora_console/operation/visual_console/render_view.php
 2015-03-09 13:16:53 +01:00
Alejandro Gallardo Escobar c6f74233f0 Removed debug traces 2015-03-09 14:25:00 +01:00
Alejandro Gallardo Escobar 20dc72424a Improved and fixed the functions to count the agents 2015-03-09 13:50:41 +01:00
mdtrooper 37bff59e85 Fixed, now the tab of remote configuration is not visible. TICKET: #1884 2015-03-09 12:08:26 +01:00
m-lopez-f 59cfc6bdc7 Changed visual of metaconsole 2015-03-09 09:56:44 +01:00
m-lopez-f 64c25571ed Changed visual of metaconsole 2015-03-09 09:52:36 +01:00
artica 6e4f1d3ba9 Auto-updated build strings. 2015-03-09 00:01:09 +01:00
artica f7a169122f Auto-updated build strings. 2015-03-08 00:01:08 +01:00
artica e0eec05ce5 Auto-updated build strings. 2015-03-07 00:01:11 +01:00
Ramon Novoa 0c0c823118 Merge branch 'feature/password-encryption' into develop 2015-03-06 17:10:25 +01:00
mdtrooper 178db6316b Fixed the counts and other things in the tactical view in metaconsole. TICKET: #1886 2015-03-06 16:58:21 +01:00
m-lopez-f 84de8b6a45 Fixed error php 2015-03-06 15:16:56 +01:00
m-lopez-f a926ab1e64 Fixed error php 2015-03-06 15:14:10 +01:00
m-lopez-f 13bcd6bcb1 Changed visual of metaconsole 2015-03-06 14:37:38 +01:00
m-lopez-f f3b1351f8d Fixed error php 2015-03-06 13:49:04 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
Alejandro Gallardo Escobar c9a56639a7 Now in strict mode the agent counters are realtime 2015-03-06 13:52:40 +01:00
Alejandro Gallardo Escobar e879757760 The module count functions now can be filtered with an agent id 2015-03-06 13:51:17 +01:00
Alejandro Gallardo Escobar 3c600fe29d Added a new constant: 'AGENT_MODULE_STATUS_ALL' 2015-03-06 13:45:54 +01:00
Alejandro Gallardo Escobar bf70b9bfba Minor fix 2015-03-06 11:58:46 +01:00
artica a68512ae0c Auto-updated build strings. 2015-03-06 00:01:10 +01:00
Alejandro Gallardo Escobar 7959675309 Fixed hierarchy errors when the user has the strict ACL enabled 2015-03-05 19:43:19 +01:00
Alejandro Gallardo Escobar c2e6977051 Critical ACL fixes 2015-03-05 19:42:11 +01:00