18292 Commits

Author SHA1 Message Date
Mark McKinnon
426f3ffe2a Merge remote-tracking branch 'upstream/develop' into 7453-populate-osaccount-realm-name 2021-04-08 14:20:26 -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
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
Mark McKinnon
551e4a03d5 Update OsAccountDataPanel.java
Revert code to original
2021-04-07 20:03:03 -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
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
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
Richard Cordovano
13864d5555
Merge pull request #6793 from markmckinnon/7238-Complete-replacement-of-legacy-Android-Analyzer-module
7238 complete replacement of legacy android analyzer module
2021-04-06 15:00:39 -04:00
Richard Cordovano
708b5d11ce
Merge pull request #6873 from gdicristofaro/7447-apiChanges
7477 api changes
2021-04-06 14:56:43 -04:00
Mark McKinnon
d072b352e4 Merge remote-tracking branch 'upstream/develop' into 7238-Complete-replacement-of-legacy-Android-Analyzer-module 2021-04-06 14:44:45 -04:00
Mark McKinnon
2111e343d4 Add Registry Class and Revert Realmname back in OsAccounts
Move code from ExtractRegistry to its own class to get registry information.
Revert the change from OsAccounts back to orginal.
2021-04-06 14:36:16 -04:00
Richard Cordovano
b8da7d9c18
Merge pull request #6832 from wschaeferB/7470-AllPastOccurancesForDomainDiscovery
7470 remove past occurrence filter from initially selected filters fo…
2021-04-06 14:27:12 -04:00
Richard Cordovano
12cef71615
Merge pull request #6875 from gdicristofaro/7491-emailResults
7491 email results
2021-04-06 14:24:25 -04:00
Greg DiCristofaro
22619ed2da Merge branch 'develop' of github.com:sleuthkit/autopsy into 7447-apiChanges 2021-04-06 13:56:05 -04:00
Richard Cordovano
f1b5cb72b0
Merge pull request #6877 from gdicristofaro/7501-npeOnClose
7501 fix npe on web categories close
2021-04-06 13:50:55 -04:00
Mark McKinnon
3d561de60c Revert "Add Registry Class and Revert Realmname back in OsAccounts"
This reverts commit 9337f72d0e156e7153fc6a5ab92ff6c57008a5b4.
2021-04-06 13:45:23 -04:00
Mark McKinnon
9337f72d0e Add Registry Class and Revert Realmname back in OsAccounts
Move code from ExtractRegistry to its own class to get registry information.
Revert the change from OsAccounts back to oirginal.
2021-04-06 13:45:02 -04:00
Greg DiCristofaro
9f9c5681ab Merge branch 'develop' of github.com:sleuthkit/autopsy into 7494-hostUpdate 2021-04-06 12:39:51 -04:00
Richard Cordovano
82a24d47d7
Merge pull request #6847 from raman-bt/4251-osaccount-update-philosophy
4251: Reconcile different OsAccount update philosophies.
2021-04-06 12:23:53 -04:00
Kelly Kelly
8169594875 Modified the JOption panel icons to be similar to netbeans look&feel 2021-04-06 11:56:37 -04:00
Greg DiCristofaro
3a74f3a2b4 synchronized database access methods 2021-04-06 10:13:54 -04:00
Greg DiCristofaro
b959863483 fix npe on web categories close 2021-04-06 09:39:26 -04:00
Mark McKinnon
722a2eef8b Merge remote-tracking branch 'upstream/develop' into 7453-populate-osaccount-realm-name 2021-04-06 09:36:34 -04:00
Greg DiCristofaro
ea411bcb6f remove updateHost 2021-04-06 09:33:29 -04:00
Greg DiCristofaro
517ba8ab90 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7447-apiChanges 2021-04-06 08:48:43 -04:00
Richard Cordovano
5b63326a78
Merge pull request #6803 from markmckinnon/7255-upgade-ileapp-aleapp-executables
7255-upgade-ileapp-aleapp-executables
2021-04-05 17:05:40 -04:00
Richard Cordovano
f68c39519d
Merge pull request #6851 from kellykelly3/7485-translator-lazy-panel-construction
7485 - Removed the panel init from the translator constructors
2021-04-05 16:55:31 -04:00
Greg DiCristofaro
b55755b33e changed sql and logic for email node 2021-04-05 15:23:22 -04:00
Kelly Kelly
2d496f9a7d Created new icons to fix JOption clip issue 2021-04-05 12:36:47 -04:00
Greg DiCristofaro
d5772c0725 api changes 2021-04-05 09:39:55 -04:00
Raman Arora
55424a82fe Addressed more review comments
- renamed update account methods
 - renamed AccountUpdateStatus and AccountUpdateResult
 - Made OsAccountAttribute an inner class of OsAccount.
2021-04-05 08:39:49 -04:00
Mark McKinnon
d6f0041058 Update aleap-artifact-attribute-reference.xml
Remove entries that will duplicate the Android python module data.
2021-04-02 16:22:29 -04:00
Mark McKinnon
18bbb74961 Merge remote-tracking branch 'upstream/develop' into 7496-Reconcile-the-older-Android-ingest-module-and-the-new-Android-(aLEAPP)-ingest-module 2021-04-02 16:06:38 -04:00