31110 Commits

Author SHA1 Message Date
apriestman
fa1b00d69b Add context menu to merge hosts.
Fixed capitalization on csv menu option.
2021-03-12 09:57:56 -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
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
Kelly Kelly
6b53e25446 Added OsAccount context menu items 2021-03-10 16:49:23 -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
Kelly Kelly
4dfffc96ce Updated with review changes 2021-03-10 10:39:46 -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
Kelly Kelly
5e47760892 Merged change from sleuthkit in 2021-03-09 15:35:47 -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
Richard Cordovano
8962d55dbe
Merge pull request #6762 from markmckinnon/7237-Make-Android-Analyzer-aLEAPP-create-account-relationships-etc
7237-Make-Android-Analyzer-aLEAPP-create-account-relationships-etc
2021-03-09 14:00:35 -05:00
Greg DiCristofaro
46a62b296e no lists excluded 2021-03-09 13:54:39 -05:00
Mark McKinnon
1b6efe4f56 Update aleap-artifact-attribute-reference.xml
Change attribute from phone to email based on data type
2021-03-09 09:41:06 -05:00
Richard Cordovano
9c10d2f31a
Merge pull request #6763 from kellykelly3/7353-add-realm-scope
7353 add realm scope
2021-03-09 09:27:38 -05:00
Greg DiCristofaro
4c6e75b47a commenting and dialog fixes 2021-03-09 09:16:40 -05:00
Greg DiCristofaro
dabdb1f894 working through export 2021-03-08 20:57:58 -05:00
Greg DiCristofaro
bd8d6b07f3 working through export 2021-03-08 20:57:48 -05:00
Greg DiCristofaro
2703b41b6b Merge branch 'develop' of github.com:sleuthkit/autopsy into 7323-dssExcelExport 2021-03-08 18:58:51 -05:00
Richard Cordovano
90b0f762d0
Merge pull request #6756 from kellykelly3/7281-OsAccountContentViewer
7281 - Added OsAccount content viewer
2021-03-08 16:42:48 -05:00
Kelly Kelly
f4f6901507 Merged in latest develop 2021-03-08 14:56:33 -05:00
Kelly Kelly
747a5e39b2 Updated OsAccount content viewer proeprties file 2021-03-08 14:50:02 -05:00
Kelly Kelly
166fda3ff3 Removed the admin property from the content viewer 2021-03-08 14:45:26 -05:00
Kelly Kelly
16b12dd02a Merge branch 'develop' into 7281-OsAccountContentViewer 2021-03-08 14:32:48 -05:00
Greg DiCristofaro
3572351a18 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7323-dssExcelExport 2021-03-08 12:40:26 -05:00
Richard Cordovano
4c78012b29
Merge pull request #6777 from raman-bt/4186-remove-admin-column
4186: Remove admin column and field from Os account table and class.
2021-03-08 11:09:31 -05:00
Ann Priestman
a55a7b812c
Merge pull request #6772 from wschaeferB/7370-OsAccountObjectIdDiffs
7370 os account object id diffs
2021-03-08 10:50:18 -05:00
Richard Cordovano
42103bcb7d
Merge pull request #6767 from gdicristofaro/7276_hostPersonEvents
7276 host person events
2021-03-08 09:20:45 -05:00
William Schaefer
7810810a7e 7370 fixed by adding casting 2021-03-05 16:01:21 -05:00
Raman Arora
58148f4e42 4186: Remove admin column and field from Os account table and class. 2021-03-05 15:40:18 -05:00
Kelly Kelly
c0b9d5f49c Finished OsAccountContentViewer changes 2021-03-05 15:18:26 -05:00
Richard Cordovano
e496052b02
Merge pull request #6759 from eugene7646/wordlists
Wordlists (7256)
2021-03-05 15:18:09 -05:00
Greg DiCristofaro
7d2244b849 fix view context unknown persons issue 2021-03-05 15:13:33 -05:00
Greg DiCristofaro
c515d5a328 merge from develop 2021-03-05 14:34:58 -05:00
Richard Cordovano
88cff589e1
Merge pull request #6775 from APriestman/improveIGthreadName
Add "ImageGallery" to name of worker thread
2021-03-05 12:45:04 -05:00
apriestman
a545401df8 Add "ImageGallery" to name of worker thread 2021-03-05 12:30:50 -05:00
William Schaefer
fa18fc5b4f 7370 add missing return statement 2021-03-04 16:46:18 -05:00
William Schaefer
9106868299 7370 fix the rest of copy paste error 2021-03-04 14:33:12 -05:00
William Schaefer
fb2dbaa6db 7370 fix copy paste that would have left source object id unchanged 2021-03-04 14:31:06 -05:00
William Schaefer
3a663c57b0 7370 fix extra = in assignment 2021-03-04 14:24:32 -05:00
William Schaefer
7c157dad81 7370 fix typo 2021-03-04 14:23:12 -05:00
Richard Cordovano
34a980b7fc
Merge pull request #6750 from gdicristofaro/7340-fileInDirNPE
7340 file in dir action
2021-03-04 14:21:43 -05:00
William Schaefer
86820e98ee 7370-Substitute SID for OS account Object ID everywhere SID is not in output already 2021-03-04 14:20:52 -05:00
Greg DiCristofaro
bb3b2bb84e merge from develop 2021-03-04 14:12:02 -05:00
Greg DiCristofaro
0052391dec date fix 2021-03-04 13:10:26 -05:00
Greg DiCristofaro
09539e0108 refactoring and commenting 2021-03-04 13:06:38 -05:00
Richard Cordovano
fa744fdb84
Merge pull request #6770 from APriestman/7359_removeImport
7359 Remove unused import
2021-03-04 11:47:07 -05:00