Commit 465d6735 authored 4 years ago by Kelly Kelly

Merge branch 'develop' into 7038-rule-set-file-list-update

parents 3c76d500 7995fbd5

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Core/build.xml 1 addition, 0 deletions

Core/build.xml
Core/nbproject/project.properties 1 addition, 1 deletion

Core/nbproject/project.properties
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java 25 additions, 0 deletions

...psy/centralrepository/datamodel/CentralRepoDbManager.java
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PostgresCentralRepoSettings.java 7 additions, 5 deletions

...tralrepository/datamodel/PostgresCentralRepoSettings.java
Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED 6 additions, 3 deletions

...centralrepository/eventlisteners/Bundle.properties-MERGED
Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CentralRepositoryNotificationDialog.java 73 additions, 0 deletions

...y/eventlisteners/CentralRepositoryNotificationDialog.java
Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Installer.java 25 additions, 67 deletions

...t/autopsy/centralrepository/eventlisteners/Installer.java
Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/RecentFilesSummary.java 147 additions, 162 deletions

...topsy/datasourcesummary/datamodel/RecentFilesSummary.java
Core/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/UserActivitySummary.java 77 additions, 53 deletions

...opsy/datasourcesummary/datamodel/UserActivitySummary.java
Core/src/org/sleuthkit/autopsy/modules/drones/Bundle.properties-MERGED 2 additions, 2 deletions

...sleuthkit/autopsy/modules/drones/Bundle.properties-MERGED
Core/src/org/sleuthkit/autopsy/modules/drones/DroneIngestModuleFactory.java 2 additions, 2 deletions

...hkit/autopsy/modules/drones/DroneIngestModuleFactory.java
Core/src/org/sleuthkit/autopsy/modules/ileappanalyzer/Bundle.properties 2 additions, 1 deletion

...leuthkit/autopsy/modules/ileappanalyzer/Bundle.properties
Core/src/org/sleuthkit/autopsy/modules/ileappanalyzer/Bundle.properties-MERGED 1 addition, 0 deletions

...t/autopsy/modules/ileappanalyzer/Bundle.properties-MERGED
Core/src/org/sleuthkit/autopsy/modules/ileappanalyzer/ILeappAnalyzerIngestModule.java 294 additions, 49 deletions

...sy/modules/ileappanalyzer/ILeappAnalyzerIngestModule.java
Core/src/org/sleuthkit/autopsy/modules/ileappanalyzer/ILeappFileProcessor.java 100 additions, 22 deletions

...t/autopsy/modules/ileappanalyzer/ILeappFileProcessor.java
Core/src/org/sleuthkit/autopsy/modules/ileappanalyzer/ileap-artifact-attribute-reference.xml 258 additions, 3 deletions

...les/ileappanalyzer/ileap-artifact-attribute-reference.xml
Core/src/org/sleuthkit/autopsy/report/modules/portablecase/PortableCaseReportModule.java 5 additions, 4 deletions

...report/modules/portablecase/PortableCaseReportModule.java
Core/test/unit/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/RecentFilesSummaryTest.java 115 additions, 44 deletions

...y/datasourcesummary/datamodel/RecentFilesSummaryTest.java
Core/test/unit/src/org/sleuthkit/autopsy/datasourcesummary/datamodel/UserActivitySummaryTest.java 41 additions, 15 deletions

.../datasourcesummary/datamodel/UserActivitySummaryTest.java
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED 2 additions, 8 deletions

...sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED

with 1184 additions and 441 deletions

Please register or to comment