7812 Commits

Author SHA1 Message Date
Richard Cordovano
e196f724fd Merge pull request #1168 from sidheshenator/doxygen_ref_python_examples
modDevPython.dox references appropriate files on github
2015-04-02 17:02:08 -04:00
sidheshenator
dd7a602553 modDevPython.dox references appropriate files on github 2015-04-02 16:35:48 -04:00
Richard Cordovano
67522ccb11 Merge pull request #1165 from sidheshenator/build_xml_user_docs_dir_check
dir location checked before copying. No new dir created
2015-04-02 16:11:10 -04:00
sidheshenator
170fdc7a5f dir location checked before copying. No new dir created 2015-04-02 13:20:33 -04:00
Richard Cordovano
9a5744319b Merge remote-tracking branch 'upstream/rc-211' into develop 2015-04-02 13:13:47 -04:00
Richard Cordovano
bef5f8d978 Merge pull request #1164 from sidheshenator/time_diff_independent_regression_test
timing test does not impact overall test
2015-04-02 12:18:46 -04:00
sidheshenator
7a51f102b3 timing test does not impact overall test 2015-04-02 12:16:18 -04:00
Brian Carrier
2069e9b9e8 Fix for image gallery to prevent infinite loop 2015-04-02 12:10:38 -04:00
Richard Cordovano
90d777fe78 Merge pull request #1161 from sidheshenator/interesting_items_fix_rc211
added rule.UUID instead rule.hashCode() to the rules HashMap
2015-04-01 14:51:05 -04:00
sidheshenator
8e5e6af9be added rule.UUID instead rule.hashCode() to the rules HashMap 2015-04-01 14:41:44 -04:00
Richard Cordovano
ead5e80edb Merge pull request #1154 from APriestman/stix_march27
Bug fixes for STIX module.
2015-04-01 09:57:44 -04:00
Richard Cordovano
88418edfd5 Restore ingest_pipeline.PNG 2015-03-31 16:11:47 -04:00
Richard Cordovano
9d0bb85e0e Remove ingest_pipeline.PNG 2015-03-31 16:09:51 -04:00
Richard Cordovano
e628ecf3f4 Delete ingest_pipeline.png
Identical files with differnt capitalization of the extension are checked in. This does not play well with Windows.
2015-03-31 13:19:55 -04:00
Richard Cordovano
da1e0c387d Merge pull request #1158 from sidheshenator/regression-test-fix
In file sorting. Additional file-sortedErrors.txt not created
2015-03-31 13:04:42 -04:00
sidheshenator
82207c31ad In file sorting. Additional file-sortedErrors.txt not created 2015-03-31 12:42:02 -04:00
Richard Cordovano
34e933e299 Merge pull request #1157 from sidheshenator/regression-test-fix
Regression test fix
2015-03-31 12:22:36 -04:00
sidheshenator
41b96b7d27 extra .txt extention removed 2015-03-31 10:14:31 -04:00
sidheshenator
1372de9f73 Reverted BlackboardDumpErrors to SortedErrors. Used newer naming conv in Tskdbdiff.py 2015-03-30 18:00:42 -04:00
sidheshenator
385f86fdf4 fixed naming consistency - BlackboardDumpErrors instead of SortedErrors 2015-03-30 16:25:53 -04:00
APriestman
4d13a207dd Bug fixes for STIX module.
Reset ID maps between files.
Allow for multiple hash values in Hash Object.
2015-03-30 14:04:23 -04:00
Richard Cordovano
b1305d20fa Merge pull request #1150 from rcordovano/rc-211_merge
Rc 211 merge
2015-03-30 10:03:06 -04:00
Richard Cordovano
bcc43af925 Merge in rc-211 branch 2015-03-30 09:36:51 -04:00
Richard Cordovano
b188bab1e0 Merge pull request #1149 from karlmortensen/update_documents
Update documents
2015-03-27 17:10:58 -04:00
Karl Mortensen
46bb20852b grammar fixes 2015-03-27 17:07:46 -04:00
Richard Cordovano
5b9f9c5a36 Merge pull request #1148 from sidheshenator/rename_output_file_names
file names consistent
2015-03-27 15:10:27 -04:00
sidheshenator
a6b58adacc file names consistent 2015-03-27 15:08:52 -04:00
sidheshenator
4d97fb3e2c file names consistent 2015-03-27 15:03:39 -04:00
Richard Cordovano
37451bb6b9 Merge pull request #1147 from sidheshenator/regression_script_striptime_format_string
appropriate format strings used for stripping time
2015-03-27 14:11:55 -04:00
sidheshenator
f5a327f5c9 appropriate format strings used for stripping time 2015-03-27 13:57:26 -04:00
Richard Cordovano
a8ca5773b7 Merge pull request #1146 from sidheshenator/nonstatic_refresh
Nonstatic refresh
2015-03-27 12:36:55 -04:00
sidheshenator
899203b671 changed access modifier of welcomeWindow 2015-03-27 12:30:09 -04:00
sidheshenator
feaaedbf7c refresh() made nonstatic 2015-03-27 12:25:19 -04:00
Richard Cordovano
cbaa15c437 Merge pull request #1145 from sidheshenator/keyword_hit_sort
getOneHitPerObject() optimized
2015-03-27 11:34:05 -04:00
sidheshenator
e4c40ec866 getOneHitPerObject() optimized 2015-03-27 11:29:41 -04:00
Richard Cordovano
aec1435951 Merge pull request #1144 from sidheshenator/revert_revert
Revert "Revert "used non deprecated complete(ReportStatus)""
2015-03-27 11:24:21 -04:00
sidheshenator
f941eddd8c Revert "Revert "used non deprecated complete(ReportStatus)""
This reverts commit b1284625d220c203467112afe26441aeba941fdc.
2015-03-27 10:18:15 -04:00
Richard Cordovano
23bf795736 Merge pull request #1142 from sidheshenator/python_report_in_tree_view
Python report in tree view
2015-03-26 16:57:07 -04:00
Richard Cordovano
13f4c389cb Merge pull request #1138 from sidheshenator/rc-211-duplicate-interesting-items-set
Duplicate rule set names not allowed
2015-03-26 16:33:31 -04:00
Richard Cordovano
4ed44abf91 Merge pull request #1140 from karlmortensen/help_to_menu
Add offline help files to Help menu
2015-03-26 16:30:43 -04:00
sidheshenator
b1284625d2 Revert "used non deprecated complete(ReportStatus)"
This reverts commit f18420aa113a25f05d2e73de7d1b085f7f229f55.
2015-03-26 16:28:37 -04:00
sidheshenator
dca20e80cd python report module shows up in the tree 2015-03-26 14:11:40 -04:00
sidheshenator
bbcdb4b821 matches last dir in the pathName as a substring 2015-03-26 11:00:40 -04:00
Karl Mortensen
7ea4bf5396 add help to Help menu 2015-03-26 10:12:22 -04:00
sidheshenator
2b798aec2a path pattern initialized in the constructor 2015-03-25 16:39:47 -04:00
sidheshenator
f18420aa11 used non deprecated complete(ReportStatus) 2015-03-25 16:04:58 -04:00
sidheshenator
0be6d1e71d Duplicate rule set names not allowed 2015-03-25 15:37:33 -04:00
Richard Cordovano
988a15e04c Merge pull request #1137 from sidheshenator/rc-211-interesting-items-rule-set
partial substring parent path matching
2015-03-25 14:24:14 -04:00
sidheshenator
ca3b36b4fa renamed ruleUUID to uuid. Used appropriate exception 2015-03-25 14:08:35 -04:00
sidheshenator
ced65e1ee8 partial match available only for path names 2015-03-25 14:05:04 -04:00