20848 Commits

Author SHA1 Message Date
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
U-BASIS\dsmyda
11943c3923 Merge branch '4388-implement-sqlite-streaming-design' into 4389-sqlite-stream-impl 2018-11-08 14:13:54 -05:00
U-BASIS\dsmyda
7199f0e955 Commented and refactored the solution, need to test nothing is broken 2018-11-08 14:11:08 -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
U-BASIS\dsmyda
5a2de8a02c Bug fix on empty table display 2018-11-08 12:27:51 -05:00
dannysmyda
97b2f6ca81
Merge branch 'develop' into 4389-sqlite-stream-impl 2018-11-08 11:47:40 -05:00
U-BASIS\dsmyda
b4cf1a0470 Added a few more comments 2018-11-08 11:36:07 -05:00
U-BASIS\dsmyda
03e851a341 Deleted SqliteUtil and fixed a log message 2018-11-08 11:31:58 -05:00
U-BASIS\dsmyda
ac4565f42f Refactored some code to make it more readable and added comments 2018-11-08 11:27:42 -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
U-BASIS\dsmyda
b13736b67c Added license back in 2018-11-08 10:07:57 -05:00
U-BASIS\dsmyda
422e6a7250 Commented and cleaned up the code for the text extractor 2018-11-08 10:04:03 -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
William Schaefer
f78ac99197 4305 remove changes for flag items global setting 2018-11-07 15:04:04 -05:00
Richard Cordovano
8d7fcf13a4
Merge pull request #4260 from APriestman/4357_moveExtractDomain
4357 Move extractDomain into coreutils
2018-11-07 14:53:40 -05:00
U-BASIS\dsmyda
fa2548f919 Merge remote-tracking branch 'upstream/develop' into 4282-streaming-design-implementation 2018-11-07 13:31:13 -05:00
U-BASIS\dsmyda
fbed670a4b Fixed text extractor using streaming impl 2018-11-07 13:30:51 -05:00
U-BASIS\dsmyda
aac459f4b5 Made content viewer impl new streaming sqlite class 2018-11-07 13:29:32 -05:00
Richard Cordovano
1f469ee112
Merge pull request #4248 from dgrove727/4335_ExtensionMismatchViewer
Using Application tab as the default.
2018-11-07 13:02:49 -05:00
U-BASIS\dsmyda
d3f6678f8b Bug fixes and file rename 2018-11-07 11:28:38 -05:00