codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-29 22:09:52 +00:00
Code Issues Releases Wiki Activity
24,378 Commits 24 Branches 52 Tags
c3e57475bb22eb4e501d2e0c94de27866ea6753e
Commit Graph
24378 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
William Schaefer 2113c3c92f Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4791-ReviseIntraCaseResults 2019-03-05 13:35:08 -05:00
Richard Cordovano 63eecc7af8 Merge in develop branch 2019-03-05 13:00:28 -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
William Schaefer 9a2d5f410a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-05 12:50:33 -05:00
William Schaefer 3837da1f4b 4755 add shortcut for open in external viewer to image gallery 2019-03-05 12:48:40 -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 10f8e55aa2 Interim commit for auto ingest case deletion 2019-03-05 11:37:09 -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
millmanorama 95adcb96f0 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events 2019-03-05 16:31:23 +01:00
millmanorama aecc229345 add right click menu option to add event with datetime prepopulated; 
other small cleanup and refactoring
 2019-03-05 16:30:52 +01:00
William Schaefer 67d57cce53 4755 resolve merge conflict with develop 2019-03-05 10:20:50 -05:00
Kelly Kelly 0cb11be390 Merge branch 'develop' into 1194-edge-download 2019-03-05 10:09:09 -05:00
William Schaefer b30681c138 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4791-ReviseIntraCaseResults 2019-03-05 10:08:29 -05:00
William Schaefer 1af5006a0e 4791 rename hash node with token file name 2019-03-05 10:08:04 -05:00
William Schaefer 44eb4d0b0d 4791 rename hash node with token file name 2019-03-05 10:07:37 -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
millmanorama 397f9694ee inline methods 2019-03-05 12:38:22 +01:00
millmanorama 58913c6970 remove notification cooldown timer 2019-03-05 12:37:59 +01:00
millmanorama d9fe0134cc support User Created events 2019-03-05 12:37:40 +01:00
William Schaefer b979217fe3 4791 Organize by number of data sources instead of instances 2019-03-04 17:43:09 -05:00
William Schaefer 90c75d635e 4791 use name of first image in multi-image data sources 2019-03-04 16:24:43 -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
William Schaefer ba0010f626 4791 make default selection for intra-case search to filter by mime type 2019-03-04 15:44:36 -05:00
William Schaefer 7f7a1094ac 4791 remove text/plain mime type from document results 2019-03-04 15:43:38 -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
William Schaefer 93cf20e363 4755 remove ctrl+e shortcut text from image gallery merged files 2019-03-04 14:31:10 -05:00
William Schaefer 2cc861d8f3 4755 fix copyright for new file 2019-03-04 13:01:46 -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
William Schaefer e399ae4594 4755 add modified merged bundle files 2019-03-04 12:35:49 -05:00
William Schaefer 094f576e5b 4755 add (Ctrl+E) to end of Open in External Viewer to identify shortcut 2019-03-04 12:27:31 -05:00
William Schaefer 5b72595367 3921 add merged bundle files and diamond typing for html viewer 2019-03-04 11:39:46 -05:00
William Schaefer e5733efd62 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 11:36:34 -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
William Schaefer 874f239f0e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 10:19:54 -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
William Schaefer d21ee983de Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4755-OpenInExternalViewerShortcut 2019-03-04 10:17:12 -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 e9d4019bf7 Merge pull request #4583 from millmanorama/timeline-event-mgr 
merge develop into Timeline event mgr
 2019-03-04 10:13:29 -05:00