Richard Cordovano
0b43813a6f
Revert "1218 back\forward code for Communications window"
2019-04-03 13:02:24 -04:00
millmanorama
ca14a06d8a
refactor to fix codacy issues.
2019-04-03 17:21:13 +02:00
U-BASIS\dsmyda
3f29cbb525
Merge branch 'develop' into 4367-Upgrade-Tika-1.20
2019-04-03 10:59:41 -04:00
millmanorama
2a7d1a1f84
Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events
2019-04-03 16:20:55 +02:00
Richard Cordovano
450da82c7f
Merge in release-4.11.0 branch
2019-04-03 09:21:26 -04:00
millmanorama
55eecf4508
fix getClusters() by making sorted set with explicit comparator.
2019-04-03 15:10:40 +02:00
Richard Cordovano
182db4dc02
Merge pull request #4614 from millmanorama/1216-drop-immutablesets
...
1216 drop immutablesets
2019-04-03 08:09:33 -04:00
millmanorama
567f9c59bb
fix merge
2019-04-03 14:08:22 +02:00
millmanorama
2754102d86
fix merge
2019-04-03 14:06:16 +02:00
millmanorama
afaa098a49
Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1216-drop-immutablesets
...
# Conflicts:
# Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventClusterNode.java
# Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/EventCluster.java
# Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/datamodel/EventStripe.java
2019-04-03 13:54:38 +02:00
millmanorama
3a62cd765d
Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1192-manually_created_events
...
# Conflicts:
# Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
2019-04-03 13:28:45 +02:00
William Schaefer
cac861ec16
4792 make initial empty details panel visible
2019-04-02 17:03:22 -04:00
Richard Cordovano
5d051d88c3
Merge pull request #4669 from esaunders/4868_gstreamer_deployment
...
Added GStreamer paths to PATH environment variable on Windows so that we can always find the correct version even if there are multiple versions of Autopsy installed.
2019-04-02 17:00:07 -04:00
William Schaefer
e2eb0e78a3
4792 fix sizes so content viewer is enabled
2019-04-02 16:37:38 -04:00
Richard Cordovano
cd8f6589ca
Merge pull request #4668 from wschaeferB/4896-RemoveMultiCaseKWS
...
4896 remove multi case kws
2019-04-02 16:33:57 -04:00
esaunders
46f0c0ae39
Use property instead of variable in build script.
2019-04-02 16:01:39 -04:00
William Schaefer
4ef9ae338f
4792 fix npe with initial empty panel
2019-04-02 15:58:06 -04:00
William Schaefer
e35dd18c9a
4792 initial panel for 4th column added as empty panel
2019-04-02 15:55:18 -04:00
esaunders
8a2ee04a0d
Merge branch 'release-4.11.0' of github.com:sleuthkit/autopsy into 4868_gstreamer_deployment
2019-04-02 15:39:58 -04:00
U-BASIS\dsmyda
5eb96d1e72
Attempting to make travis build. Also fixed the mistake with the gson conflict resolution
2019-04-02 12:10:00 -04:00
Richard Cordovano
60f25b3c4d
Merge pull request #4671 from wschaeferB/FixScriptErrorMessage
...
Change error message to reflect that it was checking a github user na…
2019-04-02 11:26:12 -04:00
William Schaefer
3ee4ecce02
Change error message to reflect that it was checking a github user name not a repo owner
2019-04-02 11:21:32 -04:00
Richard Cordovano
3e902f71df
Merge pull request #4651 from kellykelly3/1218-link-analysis-back
...
1218 back\forward code for Communications window
2019-04-02 11:21:22 -04:00
U-BASIS\dsmyda
926d017370
Added missing <class-path-extension> tag from the conflict resolution for the previous merge
2019-04-02 11:20:37 -04:00
U-BASIS\dsmyda
3160b3a45f
Merged in develop
2019-04-02 11:16:52 -04:00
Richard Cordovano
aa85a45755
Merge pull request #4547 from millmanorama/1157-collapse_file_events
...
1157 collapse file events
2019-04-02 11:13:19 -04:00
Richard Cordovano
18f2843acc
Merge pull request #4670 from sleuthkit/release-4.11.0
...
Release 4.11.0
2019-04-02 10:21:17 -04:00
Richard Cordovano
7bbe4d6d96
Remove input directory deletion from case deletion
2019-04-01 17:33:27 -04:00
esaunders
65a80f7042
Deletion of Gstreamer binaries was not right so now just remove them from installer.
2019-04-01 17:15:00 -04:00
esaunders
04e0c6e678
Codacy fix.
2019-04-01 17:13:41 -04:00
Richard Cordovano
d8f31894af
Merge pull request #4658 from dannysmyda/4860-Gstreamer-0-length-duration
...
4860 gstreamer 0 length duration
2019-04-01 17:09:51 -04:00
Richard Cordovano
e6d930bc0e
Merge pull request #4648 from APriestman/fixPortableCaseArtifacts
...
Support content with artifact parent in portable case.
2019-04-01 15:41:41 -04:00
Richard Cordovano
59cc31cf97
Merge pull request #4655 from raman-bt/4882-image-gallery-db-upgrade
...
4882: DrawableDB init error
2019-04-01 15:41:06 -04:00
U-BASIS\dsmyda
c38dc25456
Fixed codacy, the bug will reported, the bug seen in demos
2019-04-01 14:29:36 -04:00
esaunders
a87caa0c2e
Use build variable instead of hardcoding application name.
2019-04-01 14:17:37 -04:00
esaunders
3c1789463c
Added GStreamer paths to PATH environment variable on Windows so that we can find the correct version even if there is more than one version of Autopsy installed.
2019-04-01 13:55:12 -04:00
U-BASIS\dsmyda
f039aa6601
This commit features a whole bunch of proper state handling, preroll management, and small bug tweaks. An audio bar has also been added.
2019-03-29 15:46:08 -04:00
William Schaefer
b49cb1c987
4896 merged properties file changes
2019-03-29 12:05:23 -04:00
William Schaefer
55be8e329d
4896 remove no longer necessary dependency
2019-03-29 11:51:11 -04:00
William Schaefer
239eeab203
4896 remove multi case KWS
2019-03-29 11:40:28 -04:00
Kelly Kelly
f3ee0f9332
fixed used imports
2019-03-29 11:16:37 -04:00
millmanorama
10e0b60117
limit plaso to 2 workers
2019-03-29 15:54:48 +01:00
millmanorama
388e92b991
cleanup remove unneeded code to filter out WEBHIST and PE events
2019-03-29 13:50:27 +01:00
Ann Priestman
95a4d04a3a
Addressing review comments
2019-03-29 08:21:26 -04:00
millmanorama
b8757321db
minor cleanup
2019-03-29 13:03:21 +01:00
millmanorama
e3d51055ae
codacy and review comments cleanup
2019-03-29 11:35:31 +01:00
millmanorama
3fd348a079
Merge branch 'timeline-event-mgr' into 1192-manually_created_events
...
# Conflicts:
# branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
2019-03-29 11:14:13 +01:00
millmanorama
6873582ce5
revised method Javadoc
2019-03-29 11:12:19 +01:00
millmanorama
502d81dc15
Merge branch 'timeline-event-mgr' into 1124_disable_plaso_by_default
2019-03-29 11:05:53 +01:00
wschaeferB
271cb7ff28
Merge pull request #4646 from wschaeferB/4879-NormalizeBlackboardAttributesInDiffs
...
4879 normalize blackboard attributes in diffs
2019-03-28 18:27:57 -04:00
