1
0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-15 15:32:59 +00:00
Commit Graph

17440 Commits

Author SHA1 Message Date
William Schaefer
048d431eff 7084 resolve merge conflicts 2020-12-28 10:24:31 -05:00
William Schaefer
8af2670f01 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 7050-PolishDomainDetailViewers 2020-12-21 14:22:45 -05:00
William Schaefer
0a61c05097 7050 content viewer approach to handling artifact for file other than downloaded file 2020-12-21 14:09:22 -05:00
Richard Cordovano
1770e192c6 Merge pull request #6565 from kellykelly3/7074-persona-error-message
7074 - Added popup message new opening persona create dialog
2020-12-21 10:24:33 -05:00
William Schaefer
76766dd205 7050 fix no longer exists logic 2020-12-21 10:04:21 -05:00
William Schaefer
32cbeb0c32 7050 adjust other content viewers to disable when download content is parent 2020-12-18 21:41:25 -05:00
William Schaefer
fcac5fcc8d 7050 add missing getTypeId 2020-12-18 19:46:08 -05:00
William Schaefer
45d19ba585 7050 fix results content viewer when artifacts content is not parent 2020-12-18 19:09:29 -05:00
William Schaefer
ae9789d08b 7050 add (no longer exists) 2020-12-18 18:23:11 -05:00
William Schaefer
44e432f285 7050 fix header names and file path 2020-12-18 18:10:08 -05:00
William Schaefer
02e6c7e004 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 7084-FeedbackWhileLoadingArtifacts 2020-12-18 17:24:53 -05:00
William Schaefer
555c34d302 7084 working scroll bars finally 2020-12-18 17:22:25 -05:00
William Schaefer
d65c34b97d 7084 rough changes to try and make scroll bar work 2020-12-18 17:21:17 -05:00
Kelly Kelly
afa4958af0 Updated based on review comments 2020-12-18 14:35:29 -05:00
Richard Cordovano
ff6517c132 Merge pull request #6525 from eugene7646/su_path_fix_7054
Not allowing UNC paths for single user cases (7054)
2020-12-18 14:14:45 -05:00
Kelly Kelly
9228f49e9e Added popup message new opening persona create dialog 2020-12-17 17:43:00 -05:00
William Schaefer
708939dc75 7084 fix scroll bar 2020-12-17 17:25:43 -05:00
William Schaefer
cbf8db2afc 7084 hopefully actually fix scrolling this time 2020-12-17 17:09:21 -05:00
William Schaefer
eaf603fd47 7084 fix accidental recurrsion and display of loading panel 2020-12-17 12:11:38 -05:00
Greg DiCristofaro
1f32e34678 first draft of adding TSK_WEB_CACHE to CR 2020-12-17 11:43:00 -05:00
William Schaefer
477743c235 7084 fix loading layout 2020-12-16 16:48:12 -05:00
William Schaefer
8468939425 7084 discovery loading panel 2020-12-16 15:48:54 -05:00
William Schaefer
bb41bd9078 Merge branch '7050-PolishDomainDetailViewers' of https://github.com/wschaeferB/autopsy into 7084-FeedbackWhileLoadingArtifacts 2020-12-16 15:05:54 -05:00
William Schaefer
35e62d0cf7 7050 change username and domain placement 2020-12-16 15:04:35 -05:00
William Schaefer
52b2c297f0 7084 loading panel 2020-12-16 14:50:04 -05:00
William Schaefer
4e4d1a3362 7050 fix swapped artifact type and remove extra import 2020-12-16 13:17:51 -05:00
William Schaefer
3c62819c71 remove unused import 2020-12-16 13:05:53 -05:00
William Schaefer
827105eb43 scroll to start of line 2020-12-16 13:03:05 -05:00
William Schaefer
edceaede90 update bundle messages 2020-12-16 12:51:28 -05:00
William Schaefer
1575d05f2b fix conditional search labels 2020-12-16 12:48:44 -05:00
William Schaefer
d4bf9d4396 fix time label 2020-12-16 12:36:55 -05:00
William Schaefer
3a4ecd8008 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 7050-PolishDomainDetailViewers 2020-12-16 12:32:14 -05:00
Richard Cordovano
072b06856c Merge pull request #6553 from APriestman/7004_resetView
7004 Don't reset the view if width or height are zero
2020-12-16 12:23:54 -05:00
apriestman
b773be6d29 Don't reset the view if width or height are zero 2020-12-16 09:23:13 -05:00
U-BASIS\dsmyda
5260c03da9 Merged in develop and fixed merge conflicts 2020-12-15 19:30:47 -05:00
Richard Cordovano
0a9f9dd885 Merge pull request #6547 from gdicristofaro/7105-domainCategories
7105 domain categories
2020-12-15 16:46:10 -05:00
U-BASIS\dsmyda
b78682d86a Merged in develop and fixed merged conflicts 2020-12-15 11:17:35 -05:00
U-BASIS\dsmyda
72dd3b0bcf Merge branch 'develop' of github.com:sleuthkit/autopsy into 7063-webCategoryDiscovery 2020-12-15 11:07:13 -05:00
Richard Cordovano
746d9635ac Merge pull request #6522 from dannysmyda/7063-userRoleDiscovery
7063 user role discovery
2020-12-15 09:33:11 -05:00
Greg DiCristofaro
1a43fbf627 bug fixes 2020-12-15 09:18:58 -05:00
U-BASIS\dsmyda
0a4a634080 Merge branch 'develop' of github.com:sleuthkit/autopsy into 6868-Improve-Order-By-Options 2020-12-14 15:02:54 -05:00
U-BASIS\dsmyda
849e07f919 Merged in user role branch to fix merge conflicts and to inherit bug fixes 2020-12-14 14:40:46 -05:00
U-BASIS\dsmyda
a7f602ea62 Merged in developed, fix merge conflicts and solved Greg's NPE 2020-12-14 13:44:39 -05:00
Richard Cordovano
bc6056a5bd Merge pull request #6470 from kellykelly3/6989-keyword-search-ingest-terminator
6989 - Added new KeywordSearch ingest OCR process terminator
2020-12-14 11:40:09 -05:00
Richard Cordovano
363060286e Merge pull request #6527 from kellykelly3/6988-add-description-turn-off-hidpi
6988 add description turn off hidpi
2020-12-14 10:55:43 -05:00
Richard Cordovano
bdb7df1c92 Merge pull request #6544 from APriestman/7009_embeddedFileTesting
7009 Zip error handling
2020-12-14 10:01:47 -05:00
Greg DiCristofaro
72096de18b DomainCategory to concrete class and change service provider notation for Default Categorizer 2020-12-11 14:51:35 -05:00
Greg DiCristofaro
ed944d3b59 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7105-domainCategories 2020-12-11 14:19:56 -05:00
Greg DiCristofaro
8d2440e3e7 public api refinement 2020-12-11 13:51:52 -05:00
apriestman
4dd226deb8 Revert testing changes 2020-12-11 12:24:32 -05:00