20771 Commits

Author SHA1 Message Date
U-BASIS\dsmyda
ed802b0c3b Fixed ViewPreferncesPanel to cooperate 2018-11-15 15:35:58 -05:00
William Schaefer
aee7efd6d5 4361 AutopsyService to populate object id for data sources in cr 2018-11-15 15:24:33 -05:00
U-BASIS\dsmyda
8b8196c218 Did the refactoring and fleshing out, seems to be working, but will test further 2018-11-15 14:40:49 -05:00
William Schaefer
9f48caf897 4361 enable/disable settings based on CURRENT_CASE events 2018-11-15 14:06:21 -05:00
U-BASIS\dgrove
9ee54cf46e Renamed feature; added description to dialog. 2018-11-15 11:58:22 -05:00
U-BASIS\dgrove
4b804ed226 Updated access modifiers. 2018-11-15 10:03:08 -05:00
U-BASIS\dgrove
1da24f1aec Cleanup. 2018-11-15 00:49:53 -05:00
William Schaefer
68eea6d961 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4361-AddDataSourceIdColumn 2018-11-14 16:05:08 -05:00
William Schaefer
6a5d745921 4361 make queries use case db datasource id 2018-11-14 16:03:38 -05:00
U-BASIS\dsmyda
75bb46f0f4 Reverted Prefences panel and will try the merge conflict resolution again 2018-11-14 13:18:07 -05:00
dannysmyda
1ded18d67b
Merge branch 'develop' into 4361-SCO-clean-up-and-background-tasks 2018-11-14 13:09:30 -05:00
U-BASIS\dsmyda
5c59c8937c Changed variable names and minor tweaks 2018-11-14 13:05:37 -05:00
U-BASIS\dsmyda
d597eea4a8 Adjusted some comments 2018-11-14 12:59:38 -05:00
U-BASIS\dsmyda
cf2dfe899e Implemented all of Richards code review comments 2018-11-14 12:54:12 -05:00
Richard Cordovano
52035ca499
Merge pull request #4279 from raman-bt/1110-no-prepop-2
1110: Removed  prepopulation of image DB
2018-11-14 11:23:11 -05:00
Raman
8d2326b475 Address review comments and Codacy comments in the previous commit. 2018-11-14 10:21:12 -05:00
U-BASIS\dgrove
e20466bc28 Added correlation property search. Cleanup still needed. 2018-11-14 09:54:22 -05:00
Raman
503e1e56ef Manually applied changes to resolve merge conflict
- Push isImageGalleryOpen() check on EDT.
2018-11-13 18:40:40 -05:00
Raman
d5bd765c9b Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1110-no-prepop-2
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
2018-11-13 18:00:46 -05:00
Raman
a1d0519b6a 1110: Remove pre-populating phase. 2018-11-13 17:33:47 -05:00
Richard Cordovano
9dfddb9a07
Merge pull request #4276 from wschaeferB/WirelessNetworkHtmlReportBugFix
Add missing break to case statement for HTML Report generation
2018-11-13 16:57:39 -05:00
Richard Cordovano
8180c713d9
Merge pull request #4258 from dgrove727/4371_PlistContentViewerExceptions
Added handling of NSArray data.
2018-11-12 13:28:57 -05:00
Richard Cordovano
f170e9ce6e
Merge pull request #4199 from dannysmyda/Appropriate_SevenZipExtractor_Memory_Fix
Appropriate seven zip extractor memory fix
2018-11-12 13:28:40 -05:00
U-BASIS\dsmyda
ac54dee5a2 Updated method header 2018-11-12 13:09:29 -05:00
William Schaefer
7a410ade15 4361 fix name of column in upgrade code 2018-11-12 11:46:45 -05:00
U-BASIS\dsmyda
ad9cc4c026 Coday changes 2018-11-12 09:12:55 -05:00
U-BASIS\dsmyda
b677d8fa93 Merge branch '4388-implement-sqlite-streaming-design' into 4390-text-extraction-stream-impl 2018-11-12 09:10:28 -05:00
U-BASIS\dsmyda
d8e65c70e7 Did codacy suggestions 2018-11-12 09:07:29 -05:00
U-BASIS\dsmyda
5c7fdf4b71 Did some codacy suggestions 2018-11-12 09:03:05 -05:00
William Schaefer
061a5debb1 Add missing break to case statement for HTML Report generation 2018-11-09 17:46:55 -05:00
William Schaefer
0d3d80c115 4361 merge in changes from 4354 and resolve merge conflicts 2018-11-09 16:17:30 -05:00
William Schaefer
8feb1314f1 4354 fix issues found in PR review and ordering issue with upgrade 2018-11-09 16:09:19 -05:00
William Schaefer
ed249c4e28 4361 populate datasource_id column in central repository 2018-11-09 14:36:27 -05:00
U-BASIS\dsmyda
e7c1c9e0be Merge branch '4388-implement-sqlite-streaming-design' into 4390-text-extraction-stream-impl 2018-11-09 09:50:37 -05:00
U-BASIS\dsmyda
bc7252a4bc Merge branch '4388-implement-sqlite-streaming-design' into 4389-sqlite-stream-impl 2018-11-09 09:49:28 -05:00
U-BASIS\dsmyda
b1708f777e Bug fix on iteration 2018-11-09 09:48:52 -05:00
U-BASIS\dsmyda
0b4e233bbc Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4390-text-extraction-stream-impl 2018-11-08 17:06:18 -05:00
William Schaefer
b01596afc9 4361 add datasource_id column 2018-11-08 16:42:04 -05:00
U-BASIS\dsmyda
e77faa4d2d Fixed a log message 2018-11-08 15:57:16 -05:00
U-BASIS\dsmyda
3040976ab8 Made only unpackstream wrap an encodedfileoutputstream 2018-11-08 15:55:11 -05:00
U-BASIS\dsmyda
f76967969d Merge remote-tracking branch 'upstream/develop' into Appropriate_SevenZipExtractor_Memory_Fix 2018-11-08 15:43:44 -05:00
U-BASIS\dsmyda
3f2a748d9d Fixing unncessary class indirection 2018-11-08 15:43:32 -05:00
William Schaefer
67a2dbb294 4354 add NON-NLS comment to database opperations 2018-11-08 15:40:27 -05:00
William Schaefer
0ebb679778 4354 make upgrade code succeed when object_id column already exists 2018-11-08 15:29:19 -05:00
U-BASIS\dsmyda
1fd7ba7f7c Added param comment to method header 2018-11-08 15:22:27 -05:00
U-BASIS\dsmyda
550874ead6 added try catch around close function, tested to make sure not SQLiteTableReader changes that got merged in broke anything 2018-11-08 15:13:38 -05:00
U-BASIS\dsmyda
1e1ceeae3d Merged in the updated and commented SQLiteTableReader 2018-11-08 14:49:37 -05:00
U-BASIS\dsmyda
7cc9fc6b78 Minor changes 2018-11-08 14:47:42 -05:00
U-BASIS\dsmyda
f0998c7a02 Fixed a bug with clicking the same table name 2018-11-08 14:45:57 -05:00
U-BASIS\dsmyda
711ed7a388 Close now throws exception, so had to wrap it here 2018-11-08 14:29:39 -05:00