15547 Commits

Author SHA1 Message Date
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
Richard Cordovano
b82643ad40 Correct errors in AutoIngestMonitor$CoordinationServiceQueryTask.run 2017-09-08 16:05:37 -04:00
Ann Priestman
89d2366791 Merge remote-tracking branch 'upstream/develop' into 3003_updateDocs 2017-09-08 14:59:39 -04:00
Ann Priestman
fbb88f6ed3 Adding images 2017-09-08 14:59:32 -04:00
Richard Cordovano
88184721ad Merge pull request #3056 from dgrove727/Aid20_FixedBundleMessages
Aid20 fixed bundle messages
2017-09-08 14:54:55 -04:00
Richard Cordovano
c4f50b472b Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2017-09-08 14:15:12 -04:00
Richard Cordovano
bd13254124 Make Case.getName and CaseMetaData.getName docs consistent 2017-09-08 14:11:51 -04:00
U-BASIS\dgrove
708543eab3 More messages from Bundle.properties 2017-09-08 14:06:35 -04:00
U-BASIS\dgrove
7174fc02db Missing message. 2017-09-08 13:45:26 -04:00
U-BASIS\dgrove
ded1a2ea8d Minor fix. 2017-09-08 13:30:52 -04:00
U-BASIS\dgrove
7eb441a88d Minor fix. 2017-09-08 13:10:57 -04:00
U-BASIS\dgrove
ac9c94dc27 Additional messages added/moved. 2017-09-08 13:07:16 -04:00
Richard Cordovano
721dacc5e8 Update KeywordHit.java 2017-09-08 13:03:50 -04:00
Richard Cordovano
8c548b23fc Update KeywordHit.java 2017-09-08 13:00:39 -04:00
Richard Cordovano
1658183a49 Merge pull request #3042 from APriestman/2995_npe
Create a central repo case entry if one does not exist when the user …
2017-09-08 12:57:20 -04:00
U-BASIS\dgrove
26a307b93c Added bundle messages to 'initComponents()'. 2017-09-08 12:45:42 -04:00
Ann Priestman
fa6ddf952c Change to pass the current Case into newCase. 2017-09-08 12:35:49 -04:00
Richard Cordovano
9b6984da04 Minor simplification of CE module shutdown method 2017-09-08 12:21:15 -04:00
Ann Priestman
75bde97a98 Added db setup 2017-09-08 12:17:56 -04:00
Richard Cordovano
71365566f3 Merge pull request #3052 from APriestman/2993_sharedConfig
Don't allow a user to run correlation engine if the case is multiuser…
2017-09-08 12:16:29 -04:00
Ann Priestman
c4f3e4014e Merge remote-tracking branch 'upstream/develop' into 3003_updateDocs 2017-09-08 11:11:31 -04:00
Ann Priestman
877bdae778 Adding central repo doc 2017-09-08 11:11:17 -04:00
Richard Cordovano
3de24d65cf Merge pull request #3055 from dgrove727/Aid20_FixedBundleMessages
Fixed constructor.
2017-09-08 11:08:29 -04:00
U-BASIS\dgrove
7b75d1513f Fixed constructor. 2017-09-08 11:05:15 -04:00
Richard Cordovano
f00a9e52f1 Merge pull request #3054 from dgrove727/Aid20_FixedBundleMessages
Aid20 fixed bundle messages
2017-09-08 11:03:30 -04:00
U-BASIS\dgrove
03d4e139fc Fixes for bundle messages. 2017-09-08 11:00:50 -04:00
millmanorama
aadb79331f Cleanup KeywordHit.java 2017-09-08 16:25:00 +02:00
Richard Cordovano
42e6e86db8 Merge remote-tracking branch 'upstream/rc-2.8.3' into develop 2017-09-08 09:44:22 -04:00
Richard Cordovano
1a63546ed2 Merge pull request #3032 from eugene7646/solr_log_2972
Lots of additional logging in events of Solr query failure
2017-09-08 09:30:46 -04:00
Ann Priestman
8d32e24481 Don't allow a user to run correlation engine if the case is multiuser but the central repo database is sqlite 2017-09-08 08:37:13 -04:00
millmanorama
81e22212e8 do direct db query for contentID intead of getting the entire artifact. 2017-09-08 11:15:28 +02:00