Commit Graph
31376 Commits
Author SHA1 Message Date
William Schaefer 309075fa57 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2882-AllowResetWhileCaseOpen 2021-03-31 12:35:54 -04:00
Richard Cordovano a25ea4ab89 Merge pull request #6849 from rcordovano/format-IngestJob.java
Format IngestJob.java
2021-03-31 12:01:21 -04:00
Richard Cordovano d1a6e097c7 Format IngestJob.java 2021-03-31 12:00:33 -04:00
Ann Priestman 219e7afedd Merge pull request #6845 from wschaeferB/2021-03-29-FixBuild
2021-03-29 normalize object ids for tsk_data_artifacts table
2021-03-30 19:20:18 -04:00
William Schaefer a322b21830 2021-03-29 normalize object ids for tsk_data_artifacts table 2021-03-30 17:56:49 -04:00
Richard Cordovano 7d076dbbde Merge pull request #6843 from APriestman/7481_bluetoothIconFix
7481 Fix icon capitalization
2021-03-30 15:00:21 -04:00
Richard Cordovano 4e5102e47e Merge pull request #6840 from gdicristofaro/7466-customWebCategoriesPolish
7466 custom web categories polish
2021-03-30 14:58:45 -04:00
apriestman 6f5b075f47 Fix icon capitalization 2021-03-30 14:13:59 -04:00
Ann Priestman a096c6e926 Merge pull request #6842 from APriestman/updateAddrColInDbDiff
Change column name from unique_id to addr in test script
2021-03-30 13:52:49 -04:00
apriestman dd12f5bf6d Change column name from unique_id to addr in test script 2021-03-30 13:49:03 -04:00
Greg DiCristofaro 980651a67b updated properties-MERGED file 2021-03-30 12:03:59 -04:00
William Schaefer f74889c577 2882 fix bug that prevents working when no case is open 2021-03-30 11:46:14 -04:00
Richard Cordovano 7b30501fab Merge pull request #6837 from gdicristofaro/7473-domainCategorizationArtifacts
7473 domain categorization artifacts
2021-03-30 11:42:40 -04:00
Greg DiCristofaro 342b00eb15 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7466-customWebCategoriesPolish 2021-03-30 11:35:51 -04:00
William Schaefer c2a338768d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2882-AllowResetWhileCaseOpen 2021-03-30 11:12:21 -04:00
Ann Priestman 7692411fc3 Merge pull request #6838 from APriestman/accountIdFix
Update name of getOsAccountByObjectId
2021-03-30 09:41:12 -04:00
apriestman f77a646a83 Update name of getOsAccountByObjectId 2021-03-30 09:40:03 -04:00
Ann Priestman 73714bea55 Merge pull request #6824 from kellykelly3/7455-update-osaccount-content-panel
7455 - Fixed content panel and RA
2021-03-30 09:25:55 -04:00
Ann Priestman bbe32a097c Merge pull request #6834 from gdicristofaro/7459-getId
7459 getId Changes
2021-03-30 08:50:00 -04:00
Ann Priestman 4d11d47bfb Merge pull request #6836 from wschaeferB/2021-03-29-FixBuild
Change getAccounts calls to getOsAccounts so Autopsy builds
2021-03-29 20:39:19 -04:00
Greg DiCristofaro 45de420c54 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7459-getId 2021-03-29 18:27:47 -04:00
William Schaefer 11ddee1c72 Change getAccounts calls to getOsAccounts so Autopsy builds 2021-03-29 17:30:09 -04:00
Greg DiCristofaro d3a12cba71 reset runner 2021-03-29 16:05:44 -04:00
Greg DiCristofaro d8615de1c0 domain categorization polish 2021-03-29 16:03:35 -04:00
Greg DiCristofaro 6802deefe3 domain categorization artifacts 2021-03-29 15:40:57 -04:00
Greg DiCristofaro 66a8d1634b getOsAccountByObjectId changes 2021-03-29 15:14:02 -04:00
Richard Cordovano 7428b06bcc Merge pull request #6835 from gdicristofaro/7461-osAccountManagerChanges
7461 os account manager changes
2021-03-29 14:30:00 -04:00
Richard Cordovano 88bff123ea Merge pull request #6829 from rcordovano/7415-batch-save-files-in-file-ingest-pipeline
7415 batch save files in file ingest pipeline
2021-03-29 13:32:25 -04:00
Richard Cordovano 5353662f09 Merge pull request #6825 from kellykelly3/7452-update-osaccount-delete-event
7452-Modified OSAccountRemoveEvent to take id instead of object
2021-03-29 13:26:01 -04:00
Richard Cordovano 8061e8c0bf 7415 Change FileIngestPipeline method name 2021-03-29 13:24:17 -04:00
Richard Cordovano 20026ad472 Merge pull request #6785 from kellykelly3/7318-remove-tsk-os-account-from-ra
7318 Removed TSK_OS_ACCOUNT from RA
2021-03-29 13:13:14 -04:00
Greg DiCristofaro 0d6fe9ed56 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7461-osAccountManagerChanges 2021-03-29 13:12:26 -04:00
Greg DiCristofaro 2a69084869 getOsAccountbyObjectid changes 2021-03-29 13:04:25 -04:00
Greg DiCristofaro e4719d4ac0 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7459-getId 2021-03-29 12:56:10 -04:00
Richard Cordovano 77b9cd3903 Merge pull request #6831 from gdicristofaro/7460-getAddr
7460 change to getAddr
2021-03-29 12:41:42 -04:00
Greg DiCristofaro c3c9e2ead4 os account manager consistency 2021-03-29 12:33:53 -04:00
Kelly Kelly 574a74da5e Fixed merge conflict 2021-03-29 12:29:36 -04:00
William Schaefer 7542d9cd12 2882 combine message lines, use messagenotifyUtil 2021-03-29 12:00:23 -04:00
Greg DiCristofaro f5955bd424 Merge branch 'develop' of github.com:sleuthkit/autopsy into 7460-getAddr 2021-03-29 11:51:58 -04:00
Greg DiCristofaro 9324c8d8dd Merge branch '7460-getAddr' of github.com:gdicristofaro/autopsy into 7459-getId 2021-03-29 11:33:15 -04:00
Greg DiCristofaro f78e59e22d getId for Host,Person,Realm changed 2021-03-29 11:33:00 -04:00
Richard Cordovano 850d2246ae Merge pull request #6828 from kellykelly3/7102-center-solr-dialog
7373 - solr warning dialog will center now
2021-03-29 10:27:41 -04:00
Greg DiCristofaro 29c1a51ddb change to getAddr 2021-03-26 14:56:42 -04:00
Richard Cordovano 1b07a81c75 7415 file pipeline file save batching 2021-03-26 13:37:34 -04:00
Kelly Kelly 61e8bcaf42 solr warning dialog will center now 2021-03-26 13:02:56 -04:00
Richard Cordovano e7cce9069e 7415 file pipeline file save batching 2021-03-26 12:49:04 -04:00
Richard Cordovano 7cf9360605 Merge remote-tracking branch 'upstream/develop' into 7415-batch-save-files-in-file-ingest-pipeline 2021-03-26 12:42:51 -04:00
Kelly Kelly 104d623354 Modified OSAccountRemoveEvent to take id instead of object 2021-03-25 18:16:27 -04:00
Kelly Kelly bef9e117e2 Fixed content panel and osAccount 2021-03-25 17:40:05 -04:00
Ann Priestman 5c169b73d9 Merge pull request #6823 from APriestman/adjustActiveMQImage
Move activeMQ purge parameter to previous line.
2021-03-25 17:02:32 -04:00