mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-06 21:00:22 +00:00
Merge branch 'develop' of github.com:sleuthkit/autopsy into AUT-2487_bitlockerInAutopsy
This commit is contained in:
commit
c82bb93ce7
@ -158,14 +158,6 @@ final public class FilterSetPanel extends BorderPane {
|
||||
throw new UnsupportedOperationException("Unknown ViewMode: " + controller.getViewMode());
|
||||
}
|
||||
});
|
||||
|
||||
//Block the default treetable keyboard events.
|
||||
filterTreeTable.addEventFilter(KeyEvent.ANY, new EventHandler<KeyEvent>() {
|
||||
@Override
|
||||
public void handle(KeyEvent event) {
|
||||
event.consume();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public FilterSetPanel(TimeLineController controller) {
|
||||
|
@ -62,7 +62,7 @@
|
||||
|
||||
<!-- for viewers -->
|
||||
<dependency conf="autopsy_core->default" org="org.freedesktop.gstreamer" name="gst1-java-core" rev="1.4.0"/>
|
||||
<dependency conf="autopsy_core->default" org="net.java.dev.jna" name="jna-platform" rev="5.15.0"/>
|
||||
<dependency conf="autopsy_core->default" org="net.java.dev.jna" name="jna-platform" rev="5.16.0"/>
|
||||
|
||||
<!-- for file search -->
|
||||
<dependency conf="autopsy_core->default" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="11.2.1"/>
|
||||
|
@ -118,8 +118,8 @@ file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar
|
||||
file.reference.jfxtras-common-17-r1.jar=release/modules/ext/jfxtras-common-17-r1.jar
|
||||
file.reference.jfxtras-controls-17-r1.jar=release/modules/ext/jfxtras-controls-17-r1.jar
|
||||
file.reference.jfxtras-fxml-17-r1.jar=release/modules/ext/jfxtras-fxml-17-r1.jar
|
||||
file.reference.jna-5.15.0.jar=release/modules/ext/jna-5.15.0.jar
|
||||
file.reference.jna-platform-5.15.0.jar=release/modules/ext/jna-platform-5.15.0.jar
|
||||
file.reference.jna-5.16.0.jar=release/modules/ext/jna-5.16.0.jar
|
||||
file.reference.jna-platform-5.16.0.jar=release/modules/ext/jna-platform-5.16.0.jar
|
||||
file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar
|
||||
file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
|
||||
file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar
|
||||
|
@ -1041,12 +1041,12 @@
|
||||
<binary-origin>release/modules/ext/jfxtras-fxml-17-r1.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/jna-5.15.0.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jna-5.15.0.jar</binary-origin>
|
||||
<runtime-relative-path>ext/jna-5.16.0.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jna-5.16.0.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/jna-platform-5.15.0.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jna-platform-5.15.0.jar</binary-origin>
|
||||
<runtime-relative-path>ext/jna-platform-5.16.0.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jna-platform-5.16.0.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/joda-time-2.10.14.jar</runtime-relative-path>
|
||||
|
@ -64,7 +64,7 @@ file.reference.jdom2-2.0.6.1.jar=release/modules/ext/jdom2-2.0.6.1.jar
|
||||
file.reference.jempbox-1.8.16.jar=release/modules/ext/jempbox-1.8.16.jar
|
||||
file.reference.jhighlight-1.0.3.jar=release/modules/ext/jhighlight-1.0.3.jar
|
||||
file.reference.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar
|
||||
file.reference.jna-5.15.0.jar=release/modules/ext/jna-5.15.0.jar
|
||||
file.reference.jna-5.16.0.jar=release/modules/ext/jna-5.16.0.jar
|
||||
file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar
|
||||
file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
|
||||
file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
|
||||
|
@ -620,8 +620,8 @@
|
||||
<binary-origin>release/modules/ext/jmatio-1.5.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/jna-5.15.0.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jna-5.15.0.jar</binary-origin>
|
||||
<runtime-relative-path>ext/jna-5.16.0.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jna-5.16.0.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/joda-time-2.2.jar</runtime-relative-path>
|
||||
|
Loading…
x
Reference in New Issue
Block a user