15276 Commits

Author SHA1 Message Date
Richard Cordovano
a43cebeca6 AIN/AID 1.0/AID 2.0 revisions 2017-09-14 19:51:37 -04:00
Richard Cordovano
d7ab84988f Merge remote-tracking branch 'upstream/release-4.5.0' into 2951_Aid20AdditionalData 2017-09-13 15:44:05 -04:00
Richard Cordovano
4f8b8af6c8 Remove AutoIngestJobData field from AutoIngestJob 2017-09-13 15:43:26 -04:00
U-BASIS\dgrove
36e6ccb8a6 Additional attributes supported for node data. 2017-09-13 12:27:50 -04:00
Richard Cordovano
e1b4b4abfa Fix undocumented format parameter warnings for message strings 2017-09-12 19:10:55 -04:00
Richard Cordovano
f21b64a7b5 Change auto ingest events channel name 2017-09-12 18:33:24 -04:00
Richard Cordovano
922727fef7 Merge pull request #3067 from wschaeferB/2945-SwitchAutoIngestModeBug
2945 switching between standalone and review mode bug fixed 2968 duplicate
2017-09-12 16:12:59 -04:00
Richard Cordovano
7dbd3b5e1f Merge pull request #3068 from esaunders/2971_weak_file_listeners
Hold onto a reference to the weak listener so that it can be successf…
2017-09-12 15:59:13 -04:00
Richard Cordovano
7fce8dbca9 Merge pull request #3066 from esaunders/2987_weak_listener_fix
Hold onto a reference to the weak listener so that it can be successf…
2017-09-12 15:44:11 -04:00
Richard Cordovano
04c6dc12cf Merge pull request #3035 from wschaeferB/2943-ArtifactsAsContentCleanup
2943 artifacts as content cleanup
2017-09-12 15:42:15 -04:00
William Schaefer
177687ae2b 2943 Change isa check back to Abstract File with comment 2017-09-12 15:39:37 -04:00
Richard Cordovano
54a42ffc0b Merge pull request #3045 from wschaeferB/2831-EventListenerCR-Disables
2831 event listener cr disables
2017-09-12 15:26:42 -04:00
esaunders
5b990b4aaa Convert to javadoc comment. 2017-09-12 15:16:58 -04:00
esaunders
af119e055f Convert to javadoc comment. 2017-09-12 15:11:31 -04:00
William Schaefer
fc4a2d5bbf 2945 switching between standalone and review mode bug fixed 2968 duplicate 2017-09-12 14:30:14 -04:00
esaunders
f2eb256fa8 Hold onto a reference to the weak listener so that it can be successfully removed. Use finalize() to take care of automatic listener removal when the node is garbage collected. 2017-09-12 14:13:26 -04:00
esaunders
2cc8f5c5f2 Hold onto a reference to the weak listener so that it can be successfully removed. Use finalize() to take care of automatic listener removal when the node is garbage collected. 2017-09-12 13:32:21 -04:00
Richard Cordovano
4d97d1ac3f Merge pull request #3059 from APriestman/2997_removeTag
Deleting a tag from a file can remove BAD from central repo
2017-09-12 13:29:35 -04:00
Richard Cordovano
1a6c5f90b2 Merge pull request #3064 from millmanorama/2990-resize-indextedtext-chooser
2990 cleanup ExtractedContentPanel, insert spacers into 'toolbar' make the…
2017-09-12 12:56:49 -04:00
Ann Priestman
c0b087f393 Restored missing break statement 2017-09-12 12:42:33 -04:00
millmanorama
3ad40600e9 cleanup ExtractedContentPanel, insert spacers into 'toolbar' make the combobox bigger 2017-09-12 14:47:27 +02:00
William Schaefer
61833ab86c 2831 rename CE enabling methods to reflect that they are counter based 2017-09-11 18:08:04 -04:00
Richard Cordovano
dac3ce5626 Merge pull request #3063 from dgrove727/Aid10_Work2
AID 1.0 now correctly sees and starts running jobs.
2017-09-11 17:49:54 -04:00
U-BASIS\dgrove
968d699b48 AID 1.0 now correctly sees and starts running jobs. 2017-09-11 16:00:58 -04:00
William Schaefer
0b02fdcf60 2831 merge changes from develop 2017-09-11 14:35:27 -04:00
William Schaefer
b4c65ac0af 2831 moved disabling/enabling of Correlation Engine module to after EamDb.enabled check 2017-09-11 14:11:06 -04:00
William Schaefer
bd1390671d 2831 refactor names of variables and methods used for correlation engine enabling to be more clear 2017-09-11 13:25:12 -04:00
William Schaefer
f1d761fcb8 2943 modified getUnallocFiles to ensure it would work as previosly did in the case of Artifact children 2017-09-11 13:01:43 -04:00
Richard Cordovano
85715a3e6c Merge pull request #3062 from APriestman/3003_updateDocs
Adding documentation for central repository
2017-09-11 12:29:04 -04:00
William Schaefer
42968e4ae6 2943 removed TableFilterNode isa check which was part of 3008 not 2943 2017-09-11 12:26:52 -04:00
Richard Cordovano
1c57f90093 Merge pull request #3060 from dgrove727/Aid10_Work1
AID 1.0 patching to populate 'nodeData'.
2017-09-11 12:23:29 -04:00
William Schaefer
36e8441e9f 2943 add import for FsContent for isa check 2017-09-11 12:09:09 -04:00
William Schaefer
c9d8c24966 2943 change isa check to FsContent type, resolve some netbeans hints 2017-09-11 11:48:53 -04:00
William Schaefer
b87cc6e8b3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2943-ArtifactsAsContentCleanup 2017-09-11 11:36:03 -04:00
Ann Priestman
1f2e23ea85 Finished updating documentation images 2017-09-11 10:53:25 -04:00
Richard Cordovano
670a82a57f Merge pull request #3061 from millmanorama/2936-handle-001-files-better
2936 ask user to use .000 file if it is detected when they have selected a…
2017-09-11 09:55:29 -04:00
Richard Cordovano
6c33cc7eae Merge pull request #3057 from millmanorama/ImageFilePanel-cleanup
Image file panel cleanup and related classes
2017-09-11 09:48:51 -04:00
Richard Cordovano
0d6ec8caf0 Merge pull request #3053 from millmanorama/2960-only_store_artifact_id_in_KeywordHit
2960 only store artifact id in keyword hit
2017-09-11 09:46:43 -04:00
Jonathan Millman
1b6fce712f Update KeywordSearchResultFactory.java 2017-09-11 15:44:21 +02:00
Richard Cordovano
b4251bf980 Update KeywordHit.java
Clarify a comment
2017-09-11 09:41:35 -04:00
U-BASIS\dgrove
f856c338b3 AID 1.0 patching to populate 'nodeData'. 2017-09-11 09:17:57 -04:00
Ann Priestman
7507ed412a Cleanup 2017-09-11 08:30:24 -04:00
Ann Priestman
2023698dd8 Merge remote-tracking branch 'upstream/develop' into 2997_removeTag
Conflicts:
	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamDb.java
	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDb.java
2017-09-11 08:19:37 -04:00
Ann Priestman
6e7a907031 Continuing documentation work 2017-09-11 08:06:54 -04:00
millmanorama
0afe9b19c2 ask user to use .000 file if it is detected when they have selected a .001 file. 2017-09-10 10:50:53 +02:00
millmanorama
cba65e8f4b clean up GeneralFilter.java 2017-09-10 10:05:18 +02:00
millmanorama
9984503bfe more cleanup 2017-09-09 14:04:18 +02:00
millmanorama
a50284ea73 minor cleanup 2017-09-09 13:25:55 +02:00
millmanorama
cdc723507c cleanup ImageFilePanel 2017-09-09 13:17:10 +02:00
Richard Cordovano
826b1fb463 Correct errors in AutoIngestMonitor.run 2017-09-08 16:53:09 -04:00