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

12543 Commits

Author SHA1 Message Date
m-lopez-f 2e270c7569 Change transparency of colors in graphs. Ticket: #4046 
(cherry picked from commit 6f89eba519)
 2016-09-16 11:20:32 +02:00
cesar991 3c3229c3d2 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-16 10:42:56 +02:00
cesar991 7e33abcbd4 Add test_G_edit_module_threshold_in_bulk in Bulk_operations.py 2016-09-16 10:42:33 +02:00
Ramon Novoa 6460d22c57 Temporarily disabled the saucelab integration (the tunnel keeps failing). 2016-09-16 10:41:28 +02:00
cesar991 2f6bdb9d55 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-16 10:39:16 +02:00
cesar991 b6f863353c Add asserts in test F Bulk_operations.py file 2016-09-16 10:38:12 +02:00
Daniel Maya 24d466e185 Changes in the types of format accepted.Ticket #4032. 2016-09-16 09:23:52 +02:00
artica 80ff1653c3 Auto-updated build strings. 2016-09-16 00:01:19 +02:00
cesar991 605550b315 Repair Bulk_operations.py file 2016-09-15 16:24:53 +02:00
cesar991 c5d486d7d5 Add changes in Bulk_operations.py and extend search_module function 
(cherry picked from commit 7d1de5c922)

Conflicts:
	tests/console/Bulk_operations.py
 2016-09-15 16:20:51 +02:00
Daniel Maya a3cd8a7c86 FFixed editing plugins. Ticket #4032. 2016-09-15 15:47:10 +02:00
m-lopez-f 67e366cc9d Fixed javascript problems when configure ACL permmisions 2016-09-15 13:33:42 +02:00
artica a9f0632a55 Auto-updated build strings. 2016-09-15 00:01:20 +02:00
cesar991 7b59f09eaf Add test_F_edit_module_umbral_in_bulk in Bulk_operations.py file 2016-09-14 15:09:35 +02:00
m-lopez-f 8905b97fbb Fixed problems with labels in custom graphs when use this type en reports 
(cherry picked from commit 8c08a8c997)
 2016-09-14 12:27:57 +02:00
cesar991 02ee7bdb83 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-14 10:19:04 +02:00
cesar991 39d82297b3 Add new function and test 2016-09-14 10:18:47 +02:00
artica 15abb214ef Auto-updated build strings. 2016-09-14 00:01:18 +02:00
m-lopez-f 98715ae341 Fixed problems with images in monitor view 2016-09-13 15:15:48 +02:00
Arturo Gonzalez f9b1954d3e Deleted group All for agents in recontask creation menu 2016-09-13 15:11:17 +02:00
Hirofumi Kosaka 70f1fb159b Determine eMail's Content-Type "text/html" if message has "<" and ">" at the beginning and the end. 2016-09-13 19:43:02 +09:00
cesar991 217c350f12 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-13 12:07:07 +02:00
cesar991 885854ab93 Add delete_module_in_bulk_operation funtion and add test_D in Bulk_operations file 2016-09-13 12:06:27 +02:00
Arturo Gonzalez f11a2ddff6 Added synchronization when updates an agent. Ticket #4017 2016-09-13 10:28:26 +02:00
cesar991 05426b9512 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-13 09:49:05 +02:00
cesar991 f6afd533dc Add new test, edit agent description with bulk operation 2016-09-13 09:48:10 +02:00
artica 8b87ab50bf Auto-updated build strings. 2016-09-13 00:01:20 +02:00
m-lopez-f a804040d79 Add label with macros in reports. Ticket: #37 2016-09-12 16:22:58 +02:00
cesar991 11f1b67abd Repair error in test B 
(cherry picked from commit ab72824247)
 2016-09-12 15:49:19 +02:00
cesar991 4eda7ee241 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2016-09-12 15:30:45 +02:00
cesar991 0523a3d984 Add edit_agents_in_bulk functions and test_B_edit_agents_group_bulk_operations in Bulk_operations 2016-09-12 15:29:55 +02:00
Arturo Gonzalez 7c2301fde6 Added autorefresh control when event dialog is open 2016-09-12 14:40:05 +02:00
Hirofumi Kosaka b188eb6882 Avoid eMail misses new-lines of a message when non-ascii included. 2016-09-12 19:16:39 +09:00
Arturo Gonzalez dbb5aeee4c Fixed monitor details search by module name and module group. Ticket #4025 2016-09-12 11:54:54 +02:00
Junichi Satoh 51519053b8 Fixed missing gettext. 2016-09-12 14:26:45 +09:00
Hirofumi Kosaka 5523735e49 Fixed a bug that pandora_db.pl had done an unnecessary repeat of 'UPDATE'. 2016-09-12 12:36:59 +09:00
artica 83e29ecb67 Auto-updated build strings. 2016-09-12 00:01:13 +02:00
artica 987812c9d3 Auto-updated build strings. 2016-09-10 00:01:14 +02:00
Arturo Gonzalez 26e43e5252 Added new checkbox in massive agents deletion to select only the disabled agents 2016-09-09 16:26:29 +02:00
m-lopez-f 080ec373d7 Fixed problems with style and format text in visual consoles. Issue #40 
(cherry picked from commit 4c5d3b2736)
 2016-09-09 09:47:04 +02:00
Daniel Maya b8cae0b0c3 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-09-09 09:36:58 +02:00
m-lopez-f c7df9a7d68 Fixed problems with style and format text in visual consoles. Issue #40 2016-09-09 09:36:45 +02:00
Daniel Maya 95030c5da5 Ticket #3316 2016-09-09 09:36:40 +02:00
Arturo Gonzalez b574546eeb Merge branch '42-instalacion-simplesamlphp-para-sso-int-4008' into develop 2016-09-09 08:41:02 +02:00
artica 66615561d9 Auto-updated build strings. 2016-09-09 00:01:16 +02:00
Arturo Gonzalez 63b19a6a54 Added new parameter to configure the saml path in authentication setup 2016-09-08 17:36:56 +02:00
Daniel Maya 4fc8cac7fb Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-09-08 16:25:24 +02:00
Daniel Maya 39c2cb3bad Fixed bug.ticket #3316 2016-09-08 16:24:55 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
Daniel Maya 203689a5c1 Added new feature. Added font and fotn size in custom graph. Ticket #3316. 2016-09-08 15:44:36 +02:00