20605 Commits

Author SHA1 Message Date
William Schaefer
f687446658 4381 fix issue with looping over null list of correlation attr types 2018-11-19 13:36:10 -05:00
William Schaefer
2782c11fef Merge branch '4361-AddDataSourceIdColumn' of https://github.com/wschaeferB/autopsy into 4381-MacAddressCorrelationAttr 2018-11-16 16:39:32 -05:00
William Schaefer
ec94b8ecde 4361 remove empty line white space change 2018-11-16 16:34:59 -05:00
William Schaefer
4a0be9ecf8 4361 do not attempt to update CR data sources when case is not present 2018-11-16 16:34:10 -05:00
William Schaefer
d4124b7ab0 4381 resolve merge conflicts from 4361 2018-11-16 13:16:14 -05:00
William Schaefer
926abf24b1 4361 resolve merge conflicts from 4354 2018-11-16 12:37:28 -05:00
William Schaefer
7eafe00d1a 4354 remove redundant create index statement for file_obj_id on wifi attrs 2018-11-16 12:32:20 -05:00
William Schaefer
bd1e32a591 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4354-AddObjectIdToCR 2018-11-16 12:06:33 -05:00
William Schaefer
315782e574 4354 rename cr object_id column to file_obj_id 2018-11-16 11:47:18 -05:00
William Schaefer
1a894a1ca4 4381 add conditions for when a correlation attr has MAC_TYPE_ID 2018-11-15 18:29:18 -05:00
William Schaefer
fa6fc1cdc4 4381 add mac address correlation property to CR 2018-11-15 18:19:45 -05:00
William Schaefer
bace99fd71 4361 replace cryptic comment with more descriptive one regarding large query 2018-11-15 18:08:28 -05:00
William Schaefer
276d15e01c 4361 add indexes for datasource_obj_id to creation and upgrade code 2018-11-15 18:05:09 -05:00
William Schaefer
8d8125abee 4361 refactor names adjust comments 2018-11-15 17:21:36 -05:00
William Schaefer
3e8373d5e2 4361 add note regarding not being able to change CR with open case 2018-11-15 16:24:03 -05:00
William Schaefer
624a829917 4361 fix data source cr object id update code 2018-11-15 16:04:11 -05:00
William Schaefer
aee7efd6d5 4361 AutopsyService to populate object id for data sources in cr 2018-11-15 15:24:33 -05:00
William Schaefer
9f48caf897 4361 enable/disable settings based on CURRENT_CASE events 2018-11-15 14:06:21 -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
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
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
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
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
William Schaefer
3f637e12bf Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4354-AddObjectIdToCR 2018-11-08 13:41:25 -05:00
William Schaefer
819cf99f9e 4354 adjust comments regarding objectID 2018-11-08 13:41:12 -05:00
Richard Cordovano
7c534810ff
Merge pull request #4250 from wschaeferB/4305-NewCorrelationAttrs
4305 new correlation attrs
2018-11-08 13:26:40 -05:00
William Schaefer
516cc2fb0c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4354-AddObjectIdToCR 2018-11-08 11:21:54 -05:00
Richard Cordovano
dd4a29b456
Merge pull request #4270 from wschaeferB/20181108ChangeToDevelop
Change the build type back to DEVELOPMENT
2018-11-08 11:21:37 -05:00
William Schaefer
b907d6db0e Change the build type back to DEVELOPMENT 2018-11-08 10:25:32 -05:00
William Schaefer
0a788d14bc 4354 merge in changes from 4305 to 4354 2018-11-07 17:59:43 -05:00
William Schaefer
a694e78701 4305 allow version to be updated if schema changes already present 2018-11-07 17:50:53 -05:00
William Schaefer
37d048bc59 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4305-NewCorrelationAttrs 2018-11-07 16:51:15 -05:00