Commit Graph
31150 Commits
Author SHA1 Message Date
Greg DiCristofaro 74d51a973d message fix 2021-03-17 08:55:44 -04:00
Greg DiCristofaro 922c804c6b fix 2021-03-17 08:49:47 -04:00
Greg DiCristofaro 741b1f7379 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7365-domainCategorization 2021-03-17 08:24:13 -04:00
Greg DiCristofaro 070da26d9e revert validation code 2021-03-17 08:22:48 -04:00
Greg DiCristofaro 2b75da7adb updated overwrite message 2021-03-16 15:22:58 -04:00
Greg DiCristofaro 3778b62629 fixes from comments 2021-03-16 14:19:06 -04:00
Greg DiCristofaro 8797705bac ordering in table and tooltips 2021-03-15 20:52:43 -04:00
Greg DiCristofaro 76fe1573f5 fixes 2021-03-15 20:34:34 -04:00
Richard Cordovano 9b20ef1601 Merge pull request #6765 from APriestman/7357_imageGalleryDeadlock
7357 Only hold controllersByCaseLock when using controllersByCase.
2021-03-15 17:44:53 -04:00
Richard Cordovano fe107aa304 Merge pull request #6790 from gdicristofaro/7276-nodeUpdateFix
7276 data sources node update fix
2021-03-15 16:27:11 -04:00
Greg DiCristofaro 3bbeead990 pcl change 2021-03-15 12:07:38 -04:00
Richard Cordovano 7df892d7ca Merge pull request #6783 from markmckinnon/7241-Align-aLeapp-iLeapp-parsing-with-artifact-catalog
7241 align a leapp i leapp parsing with artifact catalog
2021-03-15 11:41:14 -04:00
Greg DiCristofaro f37afa01cf data sources node update fix 2021-03-15 11:14:50 -04:00
Greg DiCristofaro dbfbb9cd71 file already exists fix 2021-03-15 11:04:17 -04:00
Greg DiCristofaro 224b55de06 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7365-domainCategorization 2021-03-15 09:57:58 -04:00
Richard Cordovano 7a5b09c7e4 Merge pull request #6788 from wschaeferB/7422-OsAccountInstanceDiffChange
7422 replace tsk os account object id with sid in account instances diff
2021-03-12 15:05:10 -05:00
William Schaefer 64f6551316 7422 replace tsk os account object id with sid in account instances diff 2021-03-12 13:36:57 -05:00
Mark McKinnon b32ed1971e More alignment for catalog
More alignment to catalog.
2021-03-12 11:26:55 -05:00
Richard Cordovano ed633ff7e6 Merge pull request #6780 from kellykelly3/7376-osAccountNodeFactory-exception-fix
7376 - Fixed OsAccountFactoryNode exception
2021-03-11 16:10:49 -05:00
Kelly Kelly b09ccea25d merged in latest develop 2021-03-11 15:31:33 -05:00
Kelly Kelly 4373ca3011 Merge branch 'develop' into 7376-osAccountNodeFactory-exception-fix 2021-03-11 15:22:04 -05:00
Greg DiCristofaro 0415a4eef1 fixes and changes 2021-03-11 14:33:35 -05:00
Greg DiCristofaro 2062ab5113 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7365-domainCategorization 2021-03-11 13:33:46 -05:00
Greg DiCristofaro ccf2a66c81 bug fixes 2021-03-11 12:51:28 -05:00
Greg DiCristofaro c4fcc7aa98 bug fixes 2021-03-11 09:50:28 -05:00
Richard Cordovano abaf0efac8 Merge pull request #6782 from kellykelly3/7355-OsAccountNode-content-menu
7355 - Added OsAccount context menu items
2021-03-11 09:29:06 -05:00
Greg DiCristofaro ae2a916939 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7365-domainCategorization 2021-03-10 20:01:21 -05:00
Kelly Kelly 6b53e25446 Added OsAccount context menu items 2021-03-10 16:49:23 -05:00
Mark McKinnon 0d2fe89e72 Update ileap-artifact-attribute-reference.xml
Fix xml mappings
2021-03-10 15:15:48 -05:00
Greg DiCristofaro cee100446e commenting and working through options panel 2021-03-10 14:35:03 -05:00
Kelly Kelly 6a80782fcb Fixed OsAccountDactoryNode exception 2021-03-10 13:50:28 -05:00
Richard Cordovano a9751542ab Merge pull request #6776 from kellykelly3/7354-contentviewer-host-data
7354 Adding OsAccountAttributes and instances to the ContentViewer
2021-03-10 11:42:04 -05:00
Greg DiCristofaro 6d20d088de Merge branch 'develop' of github.com:sleuthkit/autopsy into 7365-domainCategorization 2021-03-10 11:35:30 -05:00
Greg DiCristofaro 1ebadc0133 package change 2021-03-10 11:35:15 -05:00
Greg DiCristofaro 19a677100b package change 2021-03-10 11:35:08 -05:00
Greg DiCristofaro 8389476f5f ui fixes 2021-03-10 11:08:44 -05:00
Greg DiCristofaro 0a4ddcd399 commenting and refactoring 2021-03-10 10:52:08 -05:00
apriestman d1dabed82e Refactor DrawableFile NPE fix 2021-03-10 10:48:21 -05:00
Kelly Kelly 4dfffc96ce Updated with review changes 2021-03-10 10:39:46 -05:00
Mark McKinnon 79fe98e2c3 Align with artifact catalog
align artifacts with artifact catalog.
2021-03-10 10:30:03 -05:00
apriestman a962ab34c5 Merge remote-tracking branch 'upstream/develop' into 7357_imageGalleryDeadlock 2021-03-10 10:16:37 -05:00
Richard Cordovano 8ad9087b1f Merge pull request #6771 from gdicristofaro/7323-dssExcelExport
7323 dss excel export
2021-03-09 16:56:36 -05:00
Richard Cordovano 8d453aaa85 Merge pull request #6766 from markmckinnon/7310-Duplicate-Associated-Object-artifacts-for-email
7310-Duplicate-Associated-Object-artifacts-for-email
2021-03-09 16:56:23 -05:00
Greg DiCristofaro 453e0dc8da working through options panel 2021-03-09 16:46:40 -05:00
Greg DiCristofaro 24a248ae73 updated build for DomainCategorization 2021-03-09 15:57:36 -05:00
Kelly Kelly 5e47760892 Merged change from sleuthkit in 2021-03-09 15:35:47 -05:00
Greg DiCristofaro 20261b260f Merge branch 'develop' of github.com:sleuthkit/autopsy into 7365-domainCategorization 2021-03-09 15:29:29 -05:00
Greg DiCristofaro 7695ef6a90 bundles updates 2021-03-09 15:29:19 -05:00
Richard Cordovano 2cd6b3c6c7 Merge pull request #6751 from wschaeferB/7142-ShowPastCasesDomainDiscovery
7142 show past cases domain discovery
2021-03-09 14:56:18 -05:00
Kelly Kelly 584fe7d4d0 Merge branch 'develop' into 7354-contentviewer-host-data 2021-03-09 14:48:55 -05:00