Commit Graph

12447 Commits

Author SHA1 Message Date
m-lopez-f b030e9139f Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-07-22 16:08:58 +02:00
m-lopez-f 2217e9f908 Fixed problems with group agents. Tiquet: #3079 2016-07-22 16:08:45 +02:00
Ramon Novoa 1c6a20d650 Fixed an import.
(cherry picked from commit b6af4629d0)
2016-07-22 14:28:19 +02:00
Ramon Novoa e31dacb6d7 Disabled ENT_PAN11. 2016-07-22 13:37:08 +02:00
cesar991 cce5e23d30 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-07-21 15:44:14 +02:00
cesar991 2065fe76e9 Add create_function import in policy_functions 2016-07-21 15:40:08 +02:00
Arturo Gonzalez 2f462370e8 Added new checkbox to hide agents that its first data time is less than report final time. Ticket 2 Gitlab 2016-07-21 14:57:06 +02:00
m-lopez-f 96d7aca5bf Fixed problems qith html editor in textareas in visual console
(cherry picked from commit 06e37132a8)
2016-07-21 14:49:46 +02:00
cesar991 2720465416 Comment test ENT_PAN10 by failing 2016-07-21 12:43:24 +02:00
Ramon Novoa 42454cd3e2 Set the right OS and version for self-monitoring. 2016-07-21 11:48:51 +02:00
m-lopez-f 53353651c9 Fixed problems with bullet charts. Tiquet: #3822 2016-07-21 11:05:10 +02:00
Hirofumi Kosaka 3a7e5fcf2f Added the handling of agent's address list at new_agent/update_agent API call. 2016-07-21 17:15:22 +09:00
Arturo Gonzalez 29dfd3df9b Fixed gauge graphs in visual console. Ticket 4 (gitlab) 2016-07-21 08:45:52 +02:00
artica d41024451c Auto-updated build strings. 2016-07-21 00:01:20 +02:00
cesar991 59e06f8b50 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-07-20 16:27:07 +02:00
cesar991 f26a89aa12 Added create, search and delete service funtions and add service_functions.py 2016-07-20 16:26:01 +02:00
Arturo Gonzalez 620ff6a324 Added a nice structure to new versions. Ticket #3813 2016-07-20 16:07:56 +02:00
cesar991 dda6e98dc6 Add ENT_PAN11. Collection tests 2016-07-20 16:03:52 +02:00
cesar991 8e1735ec7e Add check taht exists any collection in create_collection functions 2016-07-20 15:36:20 +02:00
cesar991 1e91706ec1 Repair error variable new_name in edit_collection function 2016-07-20 15:20:32 +02:00
cesar991 de9d88f6fd Added search_policy and add_module_policy functions in policy_functions.py 2016-07-20 13:45:51 +02:00
cesar991 75fda5ef04 Add recreate_collection function in collection_function.py 2016-07-20 11:52:52 +02:00
Hirofumi Kosaka 03126045d6 Fixed bug the Trap Generator failed at FreeBSD. 2016-07-20 18:41:51 +09:00
cesar991 a7cab9562d Added create_directoy and create_text functions in collection_functions.py 2016-07-20 11:33:26 +02:00
artica 0db2291cdc Auto-updated build strings. 2016-07-20 00:01:19 +02:00
axl89 05e358373e Fixed Enterprise tests 2016-07-19 17:23:04 +02:00
cesar991 2f5fadf5a3 Fixed enterprise tests 2016-07-19 17:01:27 +02:00
cesar991 e7ef4255db Moar cleaning on the tests directory 2016-07-19 16:44:30 +02:00
cesar991 799a2f4d49 Cleaned the tests directory 2016-07-19 16:39:53 +02:00
cesar991 4e90ba33a8 Add PAN10, policy test 2016-07-19 16:34:58 +02:00
axl89 cfe6aca831 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop 2016-07-19 16:29:30 +02:00
axl89 59c3d21a2b Added Enterprise test capabilities 2016-07-19 16:29:10 +02:00
cesar991 600ff4ee41 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-07-19 16:23:36 +02:00
cesar991 66c6870e01 Repair assert in PAN4 2016-07-19 16:21:42 +02:00
Daniel Maya 4262956711 Fixed CSV export in system audit log. Ticket #3902. 2016-07-19 16:12:00 +02:00
Daniel Maya 5d45420610 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-07-19 15:55:06 +02:00
cesar991 7fcd8317e7 Add edit_collection function 2016-07-19 15:54:23 +02:00
Daniel Maya 24a9eee6e8 Fixed icon in graphs. Ticket #3830. 2016-07-19 15:52:45 +02:00
cesar991 7744d5f052 Change imports in collection_functions 2016-07-19 15:24:20 +02:00
cesar991 4c79a2a6b7 Create collection_functions and added create_collection, search_collection and delete_collection functions 2016-07-19 14:58:48 +02:00
cesar991 44191d8684 Repair error in test PAN4 and PAN9 2016-07-19 13:31:41 +02:00
cesar991 c90f8fe253 Repair errors in PAN4 and PAN9 2016-07-19 13:30:13 +02:00
cesar991 0b316d8311 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-07-19 12:58:22 +02:00
cesar991 70557ff2c5 Repair errors in PAN4, PAN5 and PAN9 2016-07-19 12:55:15 +02:00
Ramon Novoa 059bde216b Testing the integration with GitLab. 2016-07-19 12:13:49 +02:00
cesar991 f1aceec1c8 Added missed import 2016-07-19 12:12:31 +02:00
Ramon Novoa cf4581c866 Testing the integration with GitLab. 2016-07-19 12:02:23 +02:00
cesar991 573bc65905 Change asserts in PAN9 2016-07-19 11:21:55 +02:00
cesar991 df9c54592f Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop 2016-07-19 10:55:11 +02:00
cesar991 ef1ae5be60 Change asserts in PAN4, PAN5 and PAN7 2016-07-19 10:39:07 +02:00