23032 Commits

Author SHA1 Message Date
Raman
b5696860d0 Remove unused exception. 2019-04-04 17:00:22 -04:00
Raman
8c1e8d39e8 Fix path in log string. 2019-04-04 16:48:54 -04:00
Raman
c64c1eaf7b 4842: some SEVERE error messages coming from Recent Activity module. 2019-04-04 16:36:20 -04:00
William Schaefer
b5c020f273 4792 slight clean up of mostly working content viewer 2019-04-04 15:51:14 -04:00
William Schaefer
d5531d8ffc 4792 kinda working field population 2019-04-04 14:51:35 -04:00
Richard Cordovano
cd2e7159a0
Merge pull request #4672 from millmanorama/1216-drop-immutablesets
1216 fix merge
2019-04-04 11:19:22 -04:00
Richard Cordovano
1ecf58d033
Merge pull request #4678 from sleuthkit/release-4.11.0
Merge in release 4.11.0 branch
2019-04-04 08:02:23 -04:00
Richard Cordovano
07bbc22952
Merge pull request #4677 from rcordovano/fix-merge-error
Remove MultiCaseSearcher.java restored by a merge error
2019-04-04 07:48:21 -04:00
rcordovano
c392a102a7 Remove MultiCaseSearcher.java restored by a merge error 2019-04-04 07:44:33 -04:00
Raman
0e0ae17807 4918: Additional data sources do not show up in ImageGallery under Path grouping 2019-04-04 07:37:19 -04:00
Richard Cordovano
8fe9ffeaad Merge remote-tracking branch 'upstream/release-4.11.0' into develop 2019-04-03 19:10:52 -04:00
Richard Cordovano
2f4799d937
Merge pull request #4647 from rcordovano/improved-case-deletion-part2
4578 Improved case deletion
2019-04-03 19:06:46 -04:00
William Schaefer
48264cbba0 4792 resizing of other occurrences content viewer actually works! 2019-04-03 19:01:11 -04:00
Richard Cordovano
9ed329f81a Merge remote-tracking branch 'upstream/release-4.11.0' into improved-case-deletion-part2 2019-04-03 18:59:35 -04:00
William Schaefer
83e5c24c11 4792 working resize, code to reset and clear details panel 2019-04-03 17:29:22 -04:00
William Schaefer
d718d1ca1b 4792 resizing of other occurrences content viewer components closer to working 2019-04-03 15:35:59 -04:00
Richard Cordovano
7dca7e35fd
Merge pull request #4674 from APriestman/doxygenFixesMarch319
Doxygen fixes
2019-04-03 14:59:04 -04:00
William Schaefer
1db30a6830 4792 adjust sizing and layout of other occurrences panel 2019-04-03 14:46:41 -04:00
William Schaefer
1614bf9fb5 4792 adjust sizing and layout of other occurrences panel 2019-04-03 14:46:21 -04:00
Ann Priestman
05881422d0 Doxygen fixes 2019-04-03 14:39:15 -04:00
William Schaefer
86fd0f9a23 4792 make occurrence details panel dynamically to allow for variable number of properties 2019-04-03 13:50:14 -04:00
Richard Cordovano
bad71b6f1c
Merge pull request #4673 from sleuthkit/revert-4651-1218-link-analysis-back
Revert "1218 back\forward code for Communications window"
2019-04-03 13:07:44 -04:00
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