codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-22 02:27:43 +00:00
Code Issues Releases Wiki Activity
21,968 Commits 24 Branches 52 Tags
acacd03017f28ad447c2aeda6abc2e56f7218b2a
Commit Graph
21968 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Raman acacd03017 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 
# Conflicts:
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
 2019-03-05 16:41:34 -05:00
Richard Cordovano e17ccc62a1 Merge pull request #4592 from rcordovano/merged-bundle-fixes 
Fix MERGED bundle for KWS, update MERGED bundle for RA
 2019-03-05 16:34:39 -05:00
Richard Cordovano ac754393e2 Fix MERGED bundle for KWS, update MERGED bundle for RA 2019-03-05 16:33:46 -05:00
Richard Cordovano db98ac1111 Merge pull request #4587 from kellykelly3/1207-progressbar-message 
Modify Extract and subclasses to take a progress bar in process function
 2019-03-05 16:20:37 -05:00
Richard Cordovano 2bf654bfe3 Merge pull request #4585 from kellykelly3/1202-fix-recentactive-plistjar 
Removed the plist jar from recentActivity, it should be using the one…
 2019-03-05 16:17:45 -05:00
Kelly Kelly 706005772f removed commented out line from ivy.xml 2019-03-05 16:12:58 -05:00
Raman ddfe63c6ab Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-05 16:10:53 -05:00
Kelly Kelly 28b3bd34a1 Merge remote-tracking branch 'upstream/develop' into 1202-fix-recentactive-plistjar 2019-03-05 16:00:47 -05:00
Raman 24e310374d 1205: create TSK_DOWNLOAD_SOURCE artifact for downloaded files. 2019-03-05 15:25:38 -05:00
Richard Cordovano 2b739fe313 Bundle.properties-MERGE file fixes 2019-03-05 15:14:26 -05:00
Richard Cordovano ca24aacd53 Merge pull request #4584 from kellykelly3/1194-edge-download 
1194 edge download
 2019-03-05 15:11:54 -05:00
Richard Cordovano cd480a8f9a Merge pull request #4590 from rcordovano/fix-for-compile-warning 
Fix cause of compile warning for DataContentViewerOtherCases.java
 2019-03-05 14:51:45 -05:00
rcordovano 6b6f38d550 Fix cause of compile warning for DataContentViewerOtherCases.java 2019-03-05 14:51:02 -05:00
Richard Cordovano 39cf9b881c Merge pull request #4575 from wschaeferB/4626-CrDataSourcesUniqueConstraint 
4626 cr data sources unique constraint
 2019-03-05 13:53:26 -05:00
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
Raman d96874bf4e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-05 11:01:06 -05:00
Kelly Kelly b776821ce4 Merge branch 'develop' into 1202-fix-recentactive-plistjar 2019-03-05 10:36:57 -05:00
Kelly Kelly a82bcc603e Modified code based on review comments 2019-03-05 10:33:44 -05:00
Kelly Kelly 0cb11be390 Merge branch 'develop' into 1194-edge-download 2019-03-05 10:09:09 -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
Raman da28fabe13 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-05 09:27:54 -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
Raman 49732b1dfc Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-04 16:17:32 -05:00
Kelly Kelly 151e4218da Modify Extract and subclasses to take a progress bar in process function 2019-03-04 15:57: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
Kelly Kelly 67ebffac6c Removed the plist jar from recentActivity, it should be using the one from corelib now. 2019-03-04 12:50:01 -05:00
Raman 90177a7fb6 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 1205-download-source 2019-03-04 11:04:20 -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
Kelly Kelly 512d716e3f merge edge_support into 1194-edge-download 2019-03-04 10:28:02 -05:00
Kelly Kelly 4065b99967 Cleaned up the download code to put it on hold, fixed code to make sure we clean up the temp files properly and cleaned up a few javadocs 2019-03-04 10:22:42 -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