Ann Priestman
|
66e8b2c1cf
|
Merge branch '3139_cr_hashes' into 3196_invalidHashSets
Conflicts:
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupModuleSettingsPanel.java
|
2017-11-17 13:14:50 -05:00 |
|
Ann Priestman
|
a28a88f13c
|
Merge remote-tracking branch 'upstream/develop' into 3141_addHashes
|
2017-11-17 12:26:03 -05:00 |
|
Ann Priestman
|
ff3f620b00
|
Merge branch '3139_cr_hashes' into 3141_addHashes
Conflicts:
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddContentToHashDbAction.java
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
|
2017-11-17 12:25:56 -05:00 |
|
Ann Priestman
|
3170c1d0c8
|
Merge remote-tracking branch 'upstream/develop' into 3144_encaseHashes
|
2017-11-17 11:45:46 -05:00 |
|
Ann Priestman
|
a5ace70c54
|
Merge branch '3139_cr_hashes' into 3144_encaseHashes
Conflicts:
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/ImportCentralRepoDbProgressDialog.java
|
2017-11-17 11:27:20 -05:00 |
|
U-BASIS\zhaohui
|
30615f5b7d
|
3207: fix typo
|
2017-11-17 11:06:29 -05:00 |
|
Ann Priestman
|
5bccb82c68
|
Update central repo hashsets automatically when getting known, known bad, or updateable hash sets
|
2017-11-17 09:41:37 -05:00 |
|
U-BASIS\zhaohui
|
4ecfb24165
|
3207: create ArrayList in python
|
2017-11-17 09:40:31 -05:00 |
|
Ann Priestman
|
c062a20213
|
Addresses most of the review comments
|
2017-11-17 08:47:43 -05:00 |
|
Richard Cordovano
|
7698597682
|
Update docs of EmbeddedFileExtractorModuleFactory.java
|
2017-11-16 15:36:29 -05:00 |
|
Richard Cordovano
|
6955416f02
|
Clean up EmbeddedFileExtractorIngestModule.java
|
2017-11-16 15:32:16 -05:00 |
|
U-BASIS\zhaohui
|
01fda811d5
|
3207: Update python code to use collection of attributes instead of adding addtribute one at a time
|
2017-11-16 13:56:09 -05:00 |
|
Ann Priestman
|
61b7f89788
|
Cleanup
|
2017-11-16 09:40:29 -05:00 |
|
William Schaefer
|
590f8dc241
|
3201 resolve merge conflict from 3199
|
2017-11-15 16:08:40 -05:00 |
|
William Schaefer
|
5035aa41b4
|
3199 include knownStatus in TagName class
|
2017-11-15 15:57:28 -05:00 |
|
U-BASIS\zhaohui
|
19c7cfb704
|
3207: Add a collection of attributes to aritifact instead of add one attribute at a time.
|
2017-11-15 13:10:57 -05:00 |
|
William Schaefer
|
7f205b3ae4
|
3201 move fix for blank description on new tag into 3201 from 3202
|
2017-11-15 12:34:05 -05:00 |
|
William Schaefer
|
82e99dc221
|
3201 resolve merge conflicts with 3199
|
2017-11-15 12:30:26 -05:00 |
|
William Schaefer
|
3fda67bb22
|
3199 fix merge error in TagsManager where both old and new arguments were in method call
|
2017-11-15 12:25:18 -05:00 |
|
William Schaefer
|
77b874e075
|
3199 resolve merge conflicts from 3198 changes
|
2017-11-15 12:19:30 -05:00 |
|
William Schaefer
|
273434f50f
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate
|
2017-11-15 11:59:44 -05:00 |
|
William Schaefer
|
c2d0bbb932
|
3198 comment getTagNameDefinitions
|
2017-11-15 11:59:10 -05:00 |
|
Richard Cordovano
|
25f6f2657f
|
Rename DataSource => AutoIngestDataSource for clarity
|
2017-11-15 11:55:52 -05:00 |
|
Richard Cordovano
|
183536c832
|
Merge pull request #3181 from eugene7646/archive_dsp_v2_3136
Archive DSP (3136)
|
2017-11-15 10:53:36 -05:00 |
|
Richard Cordovano
|
98b0290959
|
Merge remote-tracking branch 'upstream/release-4.5.1' into develop
|
2017-11-15 10:14:19 -05:00 |
|
Richard Cordovano
|
16abf6bf4c
|
Update develpers folder contents
|
2017-11-15 09:41:08 -05:00 |
|
Ann Priestman
|
143e530c32
|
Missed a "hash" reference
|
2017-11-15 09:18:03 -05:00 |
|
Ann Priestman
|
156970c9e5
|
Made reference set methods less hash-specific
|
2017-11-15 09:08:29 -05:00 |
|
Richard Cordovano
|
6d23931448
|
Merge pull request #3202 from dgrove727/3177_Aid10Metrics
3177 aid10 metrics
|
2017-11-14 16:16:52 -05:00 |
|
Ann Priestman
|
8a63c5aa15
|
Change HashDb interface to an abstract class.
Rename SleuthkitHashSet and CentralRepoHashSet
|
2017-11-14 15:04:30 -05:00 |
|
Ann Priestman
|
2bb24e3d4d
|
Remove/change some public methods.
|
2017-11-14 11:32:19 -05:00 |
|
Ann Priestman
|
1b272cf18c
|
Only display valid hash sets in the ingest module settings
|
2017-11-14 09:26:10 -05:00 |
|
U-BASIS\dgrove
|
e78980cb6e
|
Merge
|
2017-11-14 02:45:19 -05:00 |
|
U-BASIS\dgrove
|
e64e30181e
|
Typo
|
2017-11-14 02:26:38 -05:00 |
|
U-BASIS\dgrove
|
22f023002c
|
Fixed merge issue.
|
2017-11-14 02:24:24 -05:00 |
|
U-BASIS\dgrove
|
8934275246
|
Merge remote-tracking branch 'upstream/develop' into 3177_Aid10Metrics
|
2017-11-13 17:31:00 -05:00 |
|
U-BASIS\dgrove
|
556810da0e
|
Fixed merge conflict.
|
2017-11-13 16:52:19 -05:00 |
|
U-BASIS\dgrove
|
e63c7d8723
|
Cleanup.
|
2017-11-13 16:28:55 -05:00 |
|
U-BASIS\dgrove
|
5edea4c595
|
API added for getting data source content size.
|
2017-11-13 16:26:14 -05:00 |
|
Richard Cordovano
|
48123343cc
|
Merge pull request #3192 from zhhl/3155-waitCursorInIngestInbox
3155: Busy cursor in ingest inbox
|
2017-11-13 14:31:17 -05:00 |
|
Ann Priestman
|
a46d369f7e
|
Merge remote-tracking branch 'upstream/develop' into 3139_cr_hashes
|
2017-11-13 14:29:48 -05:00 |
|
Ann Priestman
|
fed52680a9
|
Cleanup
|
2017-11-13 14:28:04 -05:00 |
|
Ann Priestman
|
0ea88c0f68
|
Cleanup
|
2017-11-13 14:24:50 -05:00 |
|
Richard Cordovano
|
a241a9a3c0
|
Merge pull request #3188 from dgrove727/3192_WaitCursor
Wait cursor set for 'Ingest Module Settings' button.
|
2017-11-13 14:20:18 -05:00 |
|
Ann Priestman
|
f00ceeea27
|
Cleanup
|
2017-11-13 14:03:29 -05:00 |
|
Ann Priestman
|
5c2b89995e
|
Switched around names of HashDb and HashDatabase
|
2017-11-13 13:56:40 -05:00 |
|
Richard Cordovano
|
bb0f25ae02
|
Merge pull request #3187 from esaunders/release-4.5.1
Reduce memory consumed by keyword search hits
|
2017-11-13 13:26:28 -05:00 |
|
Richard Cordovano
|
146dacd541
|
Merge pull request #3180 from dgrove727/3148_AlertFiles
3148 alert files
|
2017-11-13 13:22:28 -05:00 |
|
Ann Priestman
|
bf164a7a56
|
Put dialogs asking if unindexed hash sets should be indexed on the EDT
|
2017-11-13 12:37:11 -05:00 |
|
Ann Priestman
|
56c5cd92cb
|
Revert changes to the public api
|
2017-11-13 08:47:01 -05:00 |
|