31997 Commits

Author SHA1 Message Date
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
Kelly Kelly
cc95f6322a Merge branch 'develop' into 7316-update-ra-tocreate-dataArtifacts 2021-03-08 13:13:40 -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
e5fbc5a2c4 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 7335-DisplayAllCategories 2021-03-05 16:54:00 -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
Luís Ferreira
7a82bde1b4
netbeans: Migrate netbeans-vm.apache.org to netbeans-vm1.apache.org
Signed-off-by: Luís Ferreira <contact@lsferreira.net>
2021-03-04 23:00:24 +00: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
45f064be9f starting custom domain categorization 2021-03-04 14:07:14 -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
apriestman
5b5fed78eb Remove unused import 2021-03-04 10:58:27 -05:00
Mark McKinnon
3409a31c5a Update aleap-artifact-attribute-reference.xml
FIx TSK_MESSAGE artifact name, remove the S.
2021-03-04 10:09:30 -05:00
Greg DiCristofaro
a9c6f04e24 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7323-dssExcelExport 2021-03-04 09:53:28 -05:00
Mark McKinnon
71c7a07e20 Merge remote-tracking branch 'upstream/develop' into 7237-Make-Android-Analyzer-aLEAPP-create-account-relationships-etc 2021-03-04 08:54:52 -05:00
Greg DiCristofaro
14b58936a0 update to include event 2021-03-04 07:29:45 -05:00
Greg DiCristofaro
cde9ab3d5a Merge branch 'develop' of github.com:sleuthkit/autopsy into 7276_hostPersonEvents 2021-03-03 19:08:38 -05:00
William Schaefer
2a392e574a 7335 fix grouping to work on single categories, while still displaying all categories in summary 2021-03-03 17:02:06 -05:00
William Schaefer
5356e083a0 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 7335-DisplayAllCategories 2021-03-03 16:19:04 -05:00
William Schaefer
445609562a 7328 partially working checkbox lists 2021-03-03 16:14:38 -05:00
Richard Cordovano
4a3fcd6e46
Merge pull request #6769 from eugene7646/image_dsp_7337
ImageDSP fix (7337)
2021-03-03 14:29:15 -05:00
Eugene Livis
f6d446d8c8 removed a flag 2021-03-03 13:44:59 -05:00
Greg DiCristofaro
7225d77a43 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7323-dssExcelExport 2021-03-03 13:36:47 -05:00
Greg DiCristofaro
cfd4c2454f updates 2021-03-03 13:34:08 -05:00
Greg DiCristofaro
a75cec6ecd updates 2021-03-03 13:33:52 -05:00
Richard Cordovano
39d7349c1b
Merge pull request #6760 from wschaeferB/7302-fixDiscoveryAnimationIssue
7302 fix animation hop on domain discovery details by simplifying code
2021-03-03 13:00:34 -05:00
Eugene Livis
3e6d6f35fa Removed unused import 2021-03-03 12:51:28 -05:00
Eugene Livis
67a3bba19a Removed deprecated method 2021-03-03 12:50:52 -05:00
Greg DiCristofaro
75edce86eb fixes 2021-03-03 12:31:53 -05:00
Eugene Livis
96e0031267 Fix 2021-03-03 10:55:43 -05:00