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

11875 Commits

Author SHA1 Message Date
m-lopez-f 5c1fd7f962 add lost lines of fixed old problem. Ticket: #3912 2016-09-22 09:09:49 +02:00
artica 68f01e9843 Auto-updated build strings. 2016-09-22 00:02:20 +02:00
artica 39804adda3 Auto-updated build strings. 2016-09-21 00:01:41 +02:00
enriquecd 95d73ceb88 visually enhance dialog box events, assignment alerts, alert list #58#52#57 2016-09-20 17:08:02 +02:00
cesar991 1ae453d8bc Add copy modules in bulk function 
(cherry picked from commit 03a2e16015)
 2016-09-20 15:44:04 +02:00
cesar991 58de8a8fbf Add new test in Bulk_operations file and repair errors 
(cherry picked from commit bb686bcbd7)

Conflicts:
	tests/console/Bulk_operations.py
 2016-09-20 13:41:45 +02:00
enriquecd b4f8926e75 Change menu header title truncate 
(cherry picked from commit 775644c247)
 2016-09-20 11:28:38 +02:00
artica e457deaaf1 Auto-updated build strings. 2016-09-20 00:01:39 +02:00
enriquecd 7b75b41f5b Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-19 17:15:32 +02:00
enriquecd b1353845c8 change module template popup - ticket 68 2016-09-19 16:56:15 +02:00
daniel dcb67e2207 Ticket integria:3621 fixed image in mail #75 
(cherry picked from commit 653da41402)
 2016-09-19 16:45:15 +02:00
enriquecd e66a06aac6 GUI improvement, add enterprise edition popup - ticket gitlab 49/68 
(cherry picked from commit a051243b64)
 2016-09-19 16:31:12 +02:00
daniel 4846af1049 fixed minor errors query view agents 
(cherry picked from commit 89e3149479)
 2016-09-19 12:07:18 +02:00
daniel 8a1deb4b87 add graph agent new feature ticket integria: 3722 
(cherry picked from commit dcb18bcbd2)
 2016-09-19 11:51:36 +02:00
m-lopez-f 8b5aa318a3 Delete log lines 
(cherry picked from commit 2437b0b81f)
 2016-09-19 10:47:08 +02:00
m-lopez-f 3a63aa9589 Fixed error in pandora.js 2016-09-19 10:36:09 +02:00
artica 5fc245041d Auto-updated build strings. 2016-09-19 00:01:33 +02:00
artica 7e0f1a8966 Auto-updated build strings. 2016-09-18 00:01:34 +02:00
artica 9bf96ebc5f Auto-updated build strings. 2016-09-17 00:01:39 +02:00
cesar991 a6068d43bf Delete test_G in Bulk_operations.py 2016-09-16 12:56:12 +02:00
Ramon Novoa f16fbf5a6e Temporarily disabled the saucelab integration (the tunnel keeps failing). 
(cherry picked from commit 6460d22c57)
 2016-09-16 11:22:32 +02:00
m-lopez-f 6f89eba519 Change transparency of colors in graphs. Ticket: #4046 2016-09-16 11:19:52 +02:00
cesar991 afc267dc59 Repair error in test_G 2016-09-16 10:48:25 +02:00
cesar991 4c7158b98d Add test_G_edit_module_threshold_in_bulk in Bulk_operations.py 
(cherry picked from commit 7e33abcbd4)
 2016-09-16 10:44:05 +02:00
cesar991 aa3d57f438 Add asserts in test F Bulk_operations.py file 
(cherry picked from commit b6f863353c)
 2016-09-16 10:40:17 +02:00
Daniel Maya 222f5ff63d Changes in the types of format accepted.Ticket #4032. 
(cherry picked from commit 24d466e185)
 2016-09-16 09:27:19 +02:00
artica 7d47304fdc Auto-updated build strings. 2016-09-16 00:01:36 +02:00
cesar991 11b3667f24 Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-15 16:19:03 +02:00
cesar991 7d1de5c922 Add changes in Bulk_operations.py and extend search_module function 2016-09-15 16:18:25 +02:00
Daniel Maya 458e01951a FFixed editing plugins. Ticket #4032. 
(cherry picked from commit a3cd8a7c86)
 2016-09-15 15:50:43 +02:00
m-lopez-f c12f0dba1c Fixed javascript problems when configure ACL permmisions 
(cherry picked from commit 67e366cc9d)
 2016-09-15 13:35:34 +02:00
artica b41c9aace2 Auto-updated build strings. 2016-09-15 00:01:37 +02:00
cesar991 b144225e99 Add test_F_edit_module_umbral_in_bulk in Bulk_operations.py file 2016-09-14 15:14:32 +02:00
m-lopez-f 8c08a8c997 Fixed problems with labels in custom graphs when use this type en reports 2016-09-14 12:27:18 +02:00
m-lopez-f 71a3014ec2 Fixed problems with label and title in simple graph of monitor status 2016-09-14 10:31:35 +02:00
cesar991 98d3401a12 Repair error in Bulk_operations function 2016-09-14 10:11:30 +02:00
cesar991 cad61adcea Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-14 10:10:08 +02:00
cesar991 6e579a55c5 Add edit_module_in_bulk function and edit module group test 2016-09-14 10:09:30 +02:00
Arturo Gonzalez 0f01088bb5 Added autorefresh control when event dialog is open 
(cherry picked from commit 7c2301fde6)
 2016-09-14 09:31:05 +02:00
artica 0ea1ee1eb2 Auto-updated build strings. 2016-09-14 00:01:35 +02:00
m-lopez-f bb5b685508 Fixed problems with label in graphics on monitors view 2016-09-13 15:20:51 +02:00
Hirofumi Kosaka a85b5aed39 Determine eMail's Content-Type "text/html" if message has "<" and ">" at the beginning and the end. 2016-09-13 19:44:25 +09:00
cesar991 0a92781cfd Add delete_module_in_bulk_operation funtion and add test_D in Bulk_operations file 
(cherry picked from commit 885854ab93)
 2016-09-13 12:08:28 +02:00
cesar991 9c88d21b08 Add new test, edit agent description with bulk operation 
(cherry picked from commit f6afd533dc)
 2016-09-13 09:50:53 +02:00
artica 6981aa7ba4 Auto-updated build strings. 2016-09-13 00:01:36 +02:00
m-lopez-f bdba5c4c05 Add label with macros in reports. Ticket: #37 
(cherry picked from commit a804040d79)
 2016-09-12 16:29:27 +02:00
cesar991 ab72824247 Repair error in test B 2016-09-12 15:48:33 +02:00
cesar991 890e7c4514 Add edit_agents_in_bulk functions and test_B_edit_agents_group_bulk_operations in Bulk_operations 
(cherry picked from commit 0523a3d984)
 2016-09-12 15:32:22 +02:00
Hirofumi Kosaka dac4b25b99 Avoid eMail misses new-lines of a message when non-ascii included. 2016-09-12 19:19:56 +09:00
Arturo Gonzalez eaa98269b2 Fixed monitor details search by module name and module group. Ticket #4025 2016-09-12 12:08:25 +02:00