Commit Graph
20607 Commits
Author SHA1 Message Date
Ann Priestman 3605ba147e Merge branch '3139_cr_hashes' into 3144_encaseHashes 2017-11-09 07:40:33 -05:00
Ann Priestman 7a3b009747 Refactoring 2017-11-09 07:40:28 -05:00
millmanorama 894c3f6d1e fix a compiler error, and use the correct API so that counts in the tables match. some comments and minor cleanup 2017-11-09 10:19:19 +01:00
Richard Cordovano a0f0e3cffc Merge remote-tracking branch 'upstream/release-4.5.1' into develop 2017-11-08 17:48:02 -05:00
Richard Cordovano b4d2cbd447 Update comment in some JPanel subclasses 2017-11-08 17:45:39 -05:00
Richard Cordovano 35ce341372 Workaround for JComponent.addPropertyChangeListener calls in ctor 2017-11-08 17:41:10 -05:00
William Schaefer feb12e304b 3201 fix title for Edit Tag dialog 2017-11-08 17:18:22 -05:00
Ann Priestman 055c095a56 Standardized name of referenceSetID.
Improved comments.
2017-11-08 15:32:07 -05:00
Richard Cordovano deb9fc79d8 Merge pull request #3191 from raman-bt/accounts_relationships
Fixed a typo in previous commit.
2017-11-08 13:00:47 -05:00
Raman ae8d9c4860 Added more info to log statement. 2017-11-08 12:56:48 -05:00
Raman dfd8043fff Fixed a typo in previous commit. 2017-11-08 12:31:08 -05:00
Richard Cordovano b48a164400 Merge pull request #3189 from raman-bt/accounts_relationships
Merged develop -> accounts_relationships
2017-11-08 12:26:33 -05:00
Richard Cordovano 64a0e83132 Merge in release-4.5.1 branch and resolve conflicts 2017-11-08 12:09:08 -05:00
Ann Priestman d9e97d1b94 Finished encase hash set importing 2017-11-08 12:08:52 -05:00
Raman 1eedb00aba Merge branch 'develop' of https://github.com/sleuthkit/autopsy into accounts_relationships
# Conflicts:
#	Core/nbproject/project.xml
2017-11-08 11:16:28 -05:00
William Schaefer d49b1667af 3201 disable tag deletion and editing during ingest 2017-11-08 09:58:03 -05:00
Richard Cordovano a0b27ae39d Merge pull request #3184 from raman-bt/accounts_relationships
Updated the CommunicationsManager API usage for getCommunicationsCoun…
2017-11-08 09:39:31 -05:00
U-BASIS\dgrove 88d668ffeb Wait cursor set for 'Ingest Module Settings' button. 2017-11-08 00:54:53 -05:00
esaunders 0a6b3bc62b Use String interning instead of our own hashmap to reuse hits. 2017-11-07 16:48:11 -05:00
esaunders ec9d24b4a8 Merge branch 'release-4.5.1' of github.com:sleuthkit/autopsy into release-4.5.1 2017-11-07 16:13:19 -05:00
esaunders e1546bd510 Only create one KeywordHit instance per document for a given hit. 2017-11-07 16:12:06 -05:00
William Schaefer 93a72e6a36 Merge branch '3199-ConsolidateDefaultTags' of https://github.com/wschaeferB/autopsy into 3201-ManageTagsOptionsPanel 2017-11-07 15:25:57 -05:00
William Schaefer 09f729f92c Merge branch '3198-TagPropertiesUpdate' of https://github.com/wschaeferB/autopsy into 3199-ConsolidateDefaultTags 2017-11-07 15:22:58 -05:00
William Schaefer 4770217954 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-07 15:22:28 -05:00
Ann Priestman bed554f874 Merge branch '3139_cr_hashes' into 3144_encaseHashes 2017-11-07 14:25:20 -05:00
Ann Priestman 08c2e05fd4 Fix file filter 2017-11-07 14:23:24 -05:00
Ann Priestman 6494a23dee Adding encase parser file 2017-11-07 14:19:05 -05:00
Ann Priestman ebf34dab14 Allow user to import Encase hashsets into central repo 2017-11-07 14:15:49 -05:00
Richard Cordovano 2772cdfe19 Merge pull request #3185 from zhhl/3180-UnitTestCreateAndDeleteCase
3180 unit test create and delete case
2017-11-07 14:10:13 -05:00
William Schaefer b85a41b4b9 fixed height of File ext mismatch settings Panel 2017-11-07 13:54:58 -05:00
William Schaefer 635537496a fixed height of External Viewer Global Settings Panel 2017-11-07 13:54:35 -05:00
William Schaefer 59d42a84fe Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3198-TagPropertiesUpdate 2017-11-07 13:52:49 -05:00
William Schaefer 36b7a24ea1 3201 initial revisions to Tag Options Panel to allow editing 2017-11-07 13:52:13 -05:00
U-BASIS\zhaohui 82ec21ac1a 3180: delete unused import 2017-11-07 13:49:19 -05:00
U-BASIS\zhaohui a8648cdbb1 3180: Move unit test to qa-functional test and adding Case creation and deletion 2017-11-07 13:45:21 -05:00
Raman 6e0ccf4e01 Updated the CommunicationsManager API usage for getCommunicationsCount() and getCommunications() 2017-11-07 13:35:03 -05:00
Richard Cordovano 623365f6dd Merge pull request #3175 from raman-bt/accounts_relationships
Minor CVT updates
2017-11-07 11:28:01 -05:00
Raman 511ed069ee Merge branch 'accounts_relationships' of https://github.com/sleuthkit/autopsy into accounts_relationships
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
2017-11-07 11:24:09 -05:00
Ann Priestman 18dc97fa69 Merge branch '3139_cr_hashes' into 3141_addHashes 2017-11-07 09:40:28 -05:00
Ann Priestman 9ece65a3f0 Added idx only file filter for central repo import 2017-11-07 09:40:01 -05:00
Ann Priestman ad4e02ed06 Add ability to create empty central repo hash sets. 2017-11-07 09:27:38 -05:00
Richard Cordovano af66549f56 Merge pull request #3172 from dgrove727/2942_CrashedJobs
2942 crashed jobs
2017-11-06 18:10:16 -05:00
Richard Cordovano 074394f297 Merge pull request #3179 from millmanorama/867-add-actions-to-nodes
add actions to MessageBrowser
2017-11-06 18:07:14 -05:00
Richard Cordovano aec5f55f81 Merge pull request #3178 from millmanorama/867-refactor-and-tweak-MessageContentViewer
867 refactor and tweak message content viewer
2017-11-06 18:04:55 -05:00
Richard Cordovano d2036b1be5 Merge pull request #3177 from zhhl/3180-caseCreationAndDeletionInUnitTest
3180: correct the typo
2017-11-06 18:03:31 -05:00
Richard Cordovano d4f625d329 Merge pull request #3174 from millmanorama/867-change_tab_title_to_Messages
allow custom DataResultViewerTable titles
2017-11-06 18:00:33 -05:00
Richard Cordovano 8f3ce23b55 Merge pull request #3173 from millmanorama/882-refresh-on-reopen
update and apply the filters when the CVT window is (re)opened
2017-11-06 17:55:10 -05:00
Eugene Livis a46e406f60 Code review feedback 2017-11-06 17:49:52 -05:00
Eugene Livis 83261afcb6 Removed unused imports 2017-11-06 16:16:49 -05:00
William Schaefer 9201c73fbd 3199-Fix merge conflict from changes to 3198 2017-11-06 16:12:09 -05:00