Commit Graph
18326 Commits
Author SHA1 Message Date
apriestman 8eeaaf17c5 Update merged files 2021-04-13 11:15:43 -04:00
apriestman 30485239c2 Revert bundles 2021-04-13 11:10:10 -04:00
apriestman 507f83b1ae Merge remote-tracking branch 'upstream/develop' into 7499_unsupportedContentType
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java
2021-04-13 11:08:16 -04:00
apriestman 8e0570abd2 Add UnsupportedContentNode 2021-04-13 08:21:54 -04:00
Richard Cordovano a19a0a880c Merge pull request #6830 from kellykelly3/7356-ui-not-updating-datasource
7356 - When ingest fails allow the tree to popup with the datasource
2021-04-12 17:32:28 -04:00
Richard Cordovano e1ad3a98a0 Merge pull request #6906 from APriestman/doxygenFixes041221
Fix doxygen comments
2021-04-12 14:29:38 -04:00
apriestman 6eeaffbec8 Fix doxygen comments 2021-04-12 14:23:10 -04:00
Kelly Kelly 02d69d8359 Fixed merge conflict 2021-04-12 10:56:12 -04:00
William Schaefer 9adbe1ffe0 7520 fix NPE in objects detected filter panel 2021-04-12 10:19:04 -04:00
Richard Cordovano b05c82b37c Merge pull request #6839 from markmckinnon/7453-populate-osaccount-realm-name
7453-populate-osaccount-realm-name
2021-04-09 13:17:03 -04:00
Richard Cordovano 288f459fcf Merge pull request #6891 from gdicristofaro/7505-tempPathChanges
7505 changes for case directory temp path
2021-04-09 09:26:16 -04:00
apriestman 393c22439f More CR test fixes 2021-04-09 07:56:11 -04:00
Richard Cordovano 0af60ca300 Merge pull request #6890 from APriestman/7464_hostRefresh
7464 Host node refresh
2021-04-09 06:35:58 -04:00
Richard Cordovano 5048cbe9a3 Merge pull request #6867 from gdicristofaro/7399-heapDumpFile
7399 heap dump file
2021-04-09 06:35:21 -04:00
apriestman 3258cc023a Fix CR functional tests 2021-04-08 16:16:40 -04:00
Kelly Kelly 1c2730c93d Added background task to fetch realm data for OsAccountNode 2021-04-08 15:17:58 -04:00
Mark McKinnon 426f3ffe2a Merge remote-tracking branch 'upstream/develop' into 7453-populate-osaccount-realm-name 2021-04-08 14:20:26 -04:00
Greg DiCristofaro e7ef17d1b4 changes for case directory temp path 2021-04-08 13:22:19 -04:00
Richard Cordovano 5526faee6b Merge pull request #6826 from APriestman/7438_nullCorrType
7438 Handle errors from unknown CR types better
2021-04-08 11:01:50 -04:00
apriestman 0d223f37da Improve comment 2021-04-08 10:16:05 -04:00
apriestman 9f5de56acc Merge remote-tracking branch 'upstream/develop' into 7464_hostRefresh 2021-04-08 10:06:47 -04:00
apriestman b17390ffac Try handling host deleted event 2021-04-08 09:46:32 -04:00
Richard Cordovano f3546671ac Merge pull request #6889 from gdicristofaro/custom_cat_permissions
Custom category move to user config
2021-04-08 09:46:23 -04:00
Greg DiCristofaro f0693caa83 fix for logging if missing directory 2021-04-08 09:01:06 -04:00
Greg DiCristofaro 873299ea2d send sqlite db to config instead of install folder 2021-04-08 08:38:43 -04:00
Greg DiCristofaro 9ad5cf30d3 just custom heap dump directory 2021-04-08 08:30:44 -04:00
Greg DiCristofaro 56462de82b Merge branch 'develop' of github.com:sleuthkit/autopsy into 7399-heapDumpFile 2021-04-08 07:48:31 -04:00
Mark McKinnon 551e4a03d5 Update OsAccountDataPanel.java
Revert code to original
2021-04-07 20:03:03 -04:00
Greg DiCristofaro ddbd6452ac enforce hprof extension 2021-04-07 19:23:36 -04:00
Mark McKinnon 31ac5fb061 Merge remote-tracking branch 'upstream/develop' into 7453-populate-osaccount-realm-name 2021-04-07 15:47:09 -04:00
Kelly Kelly 907d896473 Fixed merge conflict 2021-04-07 13:21:30 -04:00
apriestman d65495df3f Handle UnsupportedContent type 2021-04-07 13:04:56 -04:00
Richard Cordovano d8aa4ab07a Merge pull request #6883 from raman-bt/4262-4267-account-getters-setters
4262 4267 account getters setters
2021-04-07 12:28:40 -04:00
Greg DiCristofaro d7a617ed22 fixes 2021-04-07 11:53:39 -04:00
Greg DiCristofaro 9f6633a286 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7399-heapDumpFile 2021-04-07 11:03:04 -04:00
Richard Cordovano 0a6583aefc Merge pull request #6866 from wschaeferB/7474-LimitedOcrOption
7474 limited ocr option
2021-04-07 10:05:37 -04:00
Richard Cordovano 1ee2c6fb16 Merge pull request #6882 from markmckinnon/7507-fix-LeappFileProcessor.createMessageRelationship
7507-fix-LeappFileProcessor.createMessageRelationship
2021-04-07 09:56:55 -04:00
William Schaefer 437367e7c7 7474 remove accidently commited sout 2021-04-07 09:54:33 -04:00
William Schaefer cf813ac33d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 7474-LimitedOcrOption 2021-04-07 09:51:04 -04:00
Richard Cordovano 74ccfcf03a Merge pull request #6881 from kellykelly3/7487-os-account-content-pane-scrollbar
7487 - Fixed OsAccountContentViewer scroll bar issue.
2021-04-07 09:08:30 -04:00
Mark McKinnon 0063845c2b Update LeappFileProcessor.java
Change to check for alternate id instead.
2021-04-07 08:59:38 -04:00
Raman Arora 239892237e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4262-4267-account-getters-setters 2021-04-06 23:49:20 -04:00
Mark McKinnon 3d6157e0e2 Update LeappFileProcessor.java
Fix error
2021-04-06 21:25:36 -04:00
Kelly Kelly afcddc2629 Fixed OsAccountContentViewer scroll bar issue. 2021-04-06 17:33:50 -04:00
apriestman 5380964e69 Comment out broken code temporarily 2021-04-06 16:17:56 -04:00
Richard Cordovano e5ee00ddaa Merge pull request #6874 from kellykelly3/7364-clipped-joption-dialog-icon
7364 - Created new icons to fix JOption clip issue
2021-04-06 15:37:49 -04:00
Richard Cordovano 3c0f648f47 Merge pull request #6869 from markmckinnon/7496-Reconcile-the-older-Android-ingest-module-and-the-new-Android-(aLEAPP)-ingest-module
7496 reconcile the older android ingest module and the new android (a leapp) ingest module
2021-04-06 15:34:13 -04:00
Richard Cordovano 13de972049 Merge pull request #6879 from gdicristofaro/7494-hostUpdate
7494 remove updateHost
2021-04-06 15:31:05 -04:00
Mark McKinnon f3950940b0 Merge remote-tracking branch 'upstream/develop' into 7496-Reconcile-the-older-Android-ingest-module-and-the-new-Android-(aLEAPP)-ingest-module 2021-04-06 15:06:50 -04:00
Richard Cordovano 8ece27631f Merge pull request #6852 from rcordovano/7398-reduce-TaskRetryUtil-logging
7398 Reduce TaskRetryUtil logging
2021-04-06 15:02:53 -04:00