12160 Commits

Author SHA1 Message Date
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 6460d22c572b62d4b8363d1f8e9226f18b3307a7)
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 7e33abcbd44eb495de906c7d3474a8b24a2d8b81)
2016-09-16 10:44:05 +02:00
cesar991
aa3d57f438 Add asserts in test F Bulk_operations.py file
(cherry picked from commit b6f863353c050d4be50c91b4d02f5a5938661746)
2016-09-16 10:40:17 +02:00
Daniel Maya
222f5ff63d Changes in the types of format accepted.Ticket #4032.
(cherry picked from commit 24d466e185ceee204871ae1e9e7a650c34043c06)
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 a3cd8a7c869f2274eba2523409c53ab7601f45d4)
2016-09-15 15:50:43 +02:00
m-lopez-f
c12f0dba1c Fixed javascript problems when configure ACL permmisions
(cherry picked from commit 67e366cc9d8bfefa14e34e903c3cef6941fcda24)
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 7c2301fde614b147aa948775f7472c60de32bcc8)
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 885854ab93e4c9d467ee578d0dc40ed220cf5ead)
2016-09-13 12:08:28 +02:00
cesar991
9c88d21b08 Add new test, edit agent description with bulk operation
(cherry picked from commit f6afd533dc616f5c0d58ec2497a7042f41da6ac6)
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 a804040d7973fdc7c02d072526586496cba61b70)
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 0523a3d984b377b4c10ddd29a72d2ddc9e2cf7a0)
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
Arturo Gonzalez
9ea430cfc1 Revert "Fixed monitor details search by module name and module group. Ticket #4025"
This reverts commit ed4693a6fe7053fe73bbe4f7d78ed8fabfa26c54.
2016-09-12 12:06:38 +02:00
Arturo Gonzalez
2de8122edc Merge branch 'pandora_6.0' of https://brutus.artica.lan:8081/artica/pandorafms into pandora_6.0 2016-09-12 11:58:29 +02:00
Arturo Gonzalez
ed4693a6fe Fixed monitor details search by module name and module group. Ticket #4025
(cherry picked from commit dbb5aeee4c79802d2a7861d6e7582219b983c388)
2016-09-12 11:58:20 +02:00
Junichi Satoh
89d32c884f Fixed missing gettext.
(cherry picked from commit 51519053b852333862dd3621829c1ff2d441f3dd)
2016-09-12 14:29:28 +09:00
Junichi Satoh
e97971485a Updated Japanese translations. 2016-09-12 14:11:50 +09:00
Hirofumi Kosaka
efae460ee2 Fixed a bug that pandora_db.pl had done an unnecessary repeat of 'UPDATE'. 2016-09-12 12:39:31 +09:00
artica
b82fbe2c53 Auto-updated build strings. 2016-09-12 00:01:31 +02:00
artica
44e2fec1be Auto-updated build strings. 2016-09-10 00:01:30 +02:00
m-lopez-f
4c5d3b2736 Fixed problems with style and format text in visual consoles. Issue #40 2016-09-09 09:46:37 +02:00
Daniel Maya
fc213ffde3 Ticket #3316
(cherry picked from commit 95030c5da55200413f946f8d8ac71c2d8905eb81)
2016-09-09 09:39:20 +02:00
Daniel Maya
b925226ab2 Fixed bug.ticket #3316
(cherry picked from commit 39c2cb3bad8ebc0c8cde527cf445037064e70e2a)
2016-09-09 09:39:20 +02:00
Daniel Maya
8ada33731a Added new feature. Added font and fotn size in custom graph. Ticket #3316.
(cherry picked from commit 203689a5c15232259eddd9002e079d7fa89bf9d1)
2016-09-09 09:39:20 +02:00
m-lopez-f
b36b1b2113 Merge branch 'pandora_6.0' of https://192.168.50.5:8081/artica/pandorafms into pandora_6.0 2016-09-09 09:37:26 +02:00
m-lopez-f
42c3e83578 Fixed problems with style and format text in visual consoles. Issue #40
(cherry picked from commit c7df9a7d688579e886b5004b7529195d3eae2ca4)
2016-09-09 09:37:17 +02:00
artica
a17737206d Auto-updated build strings. 2016-09-09 00:01:31 +02:00