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

12825 Commits

Author SHA1 Message Date
enriquecd 775644c247 Change menu header title truncate 2016-09-20 11:21:15 +02:00
Arturo Gonzalez 249f81da7e New networkmaps in progress... (Fixed refresh holding area action in js) 2016-09-20 10:40:23 +02:00
artica 6b7a9f9eac Auto-updated build strings. 2016-09-20 00:01:19 +02:00
enriquecd 4516a88f4f Modify module template popup - ticket 68 
(cherry picked from commit a051243b64)
 2016-09-19 17:11:25 +02:00
Arturo Gonzalez 038470793d New networkmaps in progress... (Fixed holding area) 2016-09-19 17:03:31 +02:00
daniel 653da41402 Ticket integria:3621 fixed image in mail #75 2016-09-19 16:43:46 +02:00
enriquecd a051243b64 GUI improvement, add enterprise edition popup - ticket gitlab 49/68 2016-09-19 16:20:18 +02:00
Ramon Novoa 1d708c5622 Added a missing dependency. 2016-09-19 15:24:34 +02:00
Ramon Novoa ec352d16e1 Run console tests inside the Docker image. 2016-09-19 15:14:01 +02:00
Arturo Gonzalez 5adcdd9b5f New networkmaps in progress... (Fixed the node and fictional node adition) 2016-09-19 14:47:02 +02:00
Ramon Novoa 254a5ef1f8 Fixed some file permissions. 2016-09-19 14:14:49 +02:00
Ramon Novoa 0f13fb9c43 Run Selenium tests against port 8080 to avoid conflicts. 2016-09-19 14:14:49 +02:00
Arturo Gonzalez b8ad4a0fa3 New networkmaps in progress... (Added menu control) 2016-09-19 12:05:38 +02:00
daniel 89e3149479 fixed minor errors query view agents 2016-09-19 12:00:13 +02:00
Arturo Gonzalez 55747ce557 New networkmaps in progress... (fixed node details function) 2016-09-19 11:44:03 +02:00
m-lopez-f 2437b0b81f Delete log lines 2016-09-19 10:46:12 +02:00
artica b84acc2abc Auto-updated build strings. 2016-09-19 00:01:12 +02:00
artica 0234bc51f8 Auto-updated build strings. 2016-09-18 00:01:15 +02:00
artica e339b54a2f Auto-updated build strings. 2016-09-17 00:01:21 +02:00
Arturo Gonzalez 040bfc5532 New networkmaps in progress... (Fixed map id in node objects and the ntwmap popup path) 2016-09-16 13:56:51 +02:00
Arturo Gonzalez 7a513db06b New networkmaps in progress... (Fixed "erase node" function and more things) 2016-09-16 13:21:59 +02:00
cesar991 df4357054e Delete test_G in Bulk_operation file 2016-09-16 12:53:15 +02:00
Ramon Novoa f2d8d8b718 Made display a class attribute. 2016-09-16 12:27:15 +02:00
Ramon Novoa d5a9d916e6 Start Xvfb on the Travis CI environment. 2016-09-16 12:19:36 +02:00
Arturo Gonzalez 67a4d5e75e New networkmaps in progess... (Added central node and fixed some things) 2016-09-16 11:56:18 +02:00
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
Arturo Gonzalez 53d94843b9 New networkmaps in progress... (Now the map generate nodes) 2016-09-16 10:12:40 +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
Arturo Gonzalez 831e7ca314 New networkmap in progess... (Changed db structure and more important things) 2016-09-15 16:41:05 +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
Arturo Gonzalez 37fb0a2ed1 New networkmaps in progress... (Transfer e code to Open version 2.0) 2016-09-14 11:21:53 +02:00
Arturo Gonzalez 17e3f38aca New networkmaps in progress... (Transfer e code to Open version) 2016-09-14 11:18:26 +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
Arturo Gonzalez 9f70d5081b New networkmaps in progress... (Traspassing the code from E to O) 2016-09-13 16:39:21 +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