Commit Graph
21943 Commits
Author SHA1 Message Date
William Schaefer fc356fc3e3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-03-05 12:55:43 -05:00
Richard Cordovano 2d4f7e7f50 Merge pull request #4589 from rcordovano/bundle-merge-updates
Update bundle MERGE files
2019-03-05 12:02:40 -05:00
Richard Cordovano 449955bfb6 Update bundle MERGE files 2019-03-05 12:00:39 -05:00
Richard Cordovano a1d426569c Merge pull request #4588 from sleuthkit/edge_support
Merge edge_support branch into develop branch
2019-03-05 09:56:38 -05:00
Richard Cordovano 2db8920e39 Merge branch 'develop' into edge_support 2019-03-05 09:56:14 -05:00
Richard Cordovano 96e87f6b7d Merge pull request #4569 from wschaeferB/4757-InterCaseSearchQueryChanges
4757 inter case search query changes
2019-03-05 09:17:14 -05:00
Richard Cordovano 7abee59bfe Merge pull request #4578 from raman-bt/1188-cache-artifact
1188 Web cache artifact
2019-03-04 15:31:42 -05:00
Raman ff5195eeff Close temp file copy in case of error. 2019-03-04 10:42:43 -05:00
Richard Cordovano 5462b9f8c7 Merge pull request #4579 from wschaeferB/4782-UniqueNamedDocImages
4782 unique named doc images
2019-03-04 10:30:10 -05:00
Richard Cordovano de9277ea56 Merge pull request #4573 from dgrove727/4663_OtherOccurrencesCount
Case and data source counts added.
2019-03-04 10:18:42 -05:00
Richard Cordovano 26b125f97c Merge pull request #4566 from dgrove727/3921_HtmlContentViewer
3921 html content viewer
2019-03-04 10:18:03 -05:00
Richard Cordovano dc2fa3f8d4 Merge pull request #4580 from dgrove727/4777_ApplicationContentViewerSize
Reset viewport.
2019-03-04 10:16:45 -05:00
Richard Cordovano d2b540d10b Merge pull request #4572 from kellykelly3/1199-safari-cookies
1197, 1198, 1199, 1200 - Support for Safari
2019-03-01 16:26:43 -05:00
Raman 18beac06e8 1204: Show TSK_DOWNLOAD_SOURCE artifact in MetaData viewer
Also addressed review comments on previous commit.
2019-03-01 14:45:57 -05:00
William Schaefer ec3903cdb6 4626 make connect(bool foreignKeys) an additional method instead of a replacement method 2019-03-01 11:51:52 -05:00
William Schaefer 1f92057a5f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-03-01 11:42:25 -05:00
U-BASIS\dgrove 672e20bd6b Typo fix. 2019-03-01 11:42:15 -05:00
U-BASIS\dgrove fa60adcb26 Additional count parameter; handling edge case. 2019-03-01 11:40:38 -05:00
Kelly Kelly ab782a4df7 Completed the rest of the review comments that where hidden 2019-03-01 11:35:43 -05:00
Richard Cordovano 68982b21f7 Merge pull request #4545 from wschaeferB/4708-ScreenShotChanges
4708 only perform screen shot when test times out first time
2019-03-01 09:58:10 -05:00
U-BASIS\dgrove 7262cbbfe3 Removed unused logger. 2019-03-01 01:17:37 -05:00
U-BASIS\dgrove 3e153f0c33 Additional mime-type support; reposition button. 2019-03-01 01:13:53 -05:00
U-BASIS\dgrove 9f31d3d4e0 Reset viewport. 2019-02-28 23:56:58 -05:00
Richard Cordovano cea2f25e52 Merge pull request #4574 from dgrove727/4665_SortOtherOccurrences
Sort columns by case name, then data source.
2019-02-28 18:35:36 -05:00
Richard Cordovano 26f9d45484 Merge pull request #4515 from eugene7646/aquisition_details_4661
aquisition details
2019-02-28 18:31:34 -05:00
William Schaefer 2a19dc71aa 4782 add missing dot before extension to new file names for embedded images 2019-02-28 18:16:04 -05:00
William Schaefer 94225be5a7 4782 make file name determination for .doc files simaler to other files 2019-02-28 18:10:22 -05:00
William Schaefer a22a84566d 4782 add non hex character to name to account for variable lenght names 2019-02-28 18:05:09 -05:00
Richard Cordovano 620dd56839 Merge pull request #4571 from APriestman/4751_addPortableCaseArtifacts
4751 Add tagged artifacts to portable cases
2019-02-28 18:02:03 -05:00
William Schaefer 9594c031df 4782 add incrementing integer to beggining of extracted picture names for doc 2019-02-28 17:56:23 -05:00
Raman 9575bba204 Merge from develop. 2019-02-28 17:36:09 -05:00
Raman 5dbc1ff792 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1188-cache-artifact 2019-02-28 15:59:19 -05:00
William Schaefer ec6b951a28 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-02-28 15:53:20 -05:00
Richard Cordovano 45119b046e Merge pull request #4576 from wschaeferB/RemoveOldUncompilableLine
remove line referencing variable which no longer exists
2019-02-28 15:51:58 -05:00
Kelly Kelly bf53781efd Changes from review comments, plus a few other little cosmetic things. 2019-02-28 15:20:35 -05:00
William Schaefer 656c8475fc Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-02-28 14:56:30 -05:00
Richard Cordovano 93b96f2608 Merge pull request #4577 from sleuthkit/remove_bundle_escapes
remove escaping that causes inconsistencies in merged version
2019-02-28 14:28:11 -05:00
Brian Carrier 38cf5f570b remove escaping that causes inconsisencies in merged version 2019-02-28 14:23:27 -05:00
Brian Carrier a22a0b4ca2 remove escaping that causes inconsisencies in merged version 2019-02-28 14:22:38 -05:00
William Schaefer c32827bef7 remove line referencing variable which no longer exists 2019-02-28 14:06:04 -05:00
William Schaefer 7c0c8de488 4626-change unique constraint on new central repository tables to be as minimal as possible 2019-02-28 13:44:09 -05:00
William Schaefer 058052ecd9 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4626-CrDataSourcesUniqueConstraint 2019-02-28 13:35:31 -05:00
Kelly Kelly 91b2656eb8 Changed absolute path to relative in coreLib. 2019-02-28 13:03:31 -05:00
Kelly Kelly 5122dfba4d Changed absolute path to relative in project.xml 2019-02-28 12:54:00 -05:00
Raman 668e452b75 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1188-cache-artifact 2019-02-28 11:45:26 -05:00
Kelly Kelly 7d556addab Changed absolute path in project.properties to relative 2019-02-28 11:41:29 -05:00
Kelly Kelly 669e8d47d2 Merge branch 'edge_support' into 1199-safari-cookies 2019-02-28 11:34:45 -05:00
Richard Cordovano c2ca68320e Merge pull request #4570 from dgrove727/4715_4716_4717_VCardIngest
VCard support added.
2019-02-28 11:23:16 -05:00
William Schaefer b7dce55e28 4626 auto format changes 2019-02-28 10:31:44 -05:00
William Schaefer effeceee29 4626 allow connection pool used for upgrades to ignore foreign keys with sqlite 2019-02-28 10:29:40 -05:00