 Joe Ho
|
1fec260fb5
|
Merge branch 'develop' into 5010-Make-Logical-Imager-DSP-stub-with-config-panel
|
2019-05-08 19:55:26 -04:00 |
|
|
Richard Cordovano
|
d05a8e1440
|
Merge pull request #4752 from wschaeferB/4978-TextContentViewer
4978 text content viewer
|
2019-05-07 12:19:36 -04:00 |
|
|
Joe Ho
|
2c90521a1c
|
Debugging code LogicalImagerDSProcessor class not found
|
2019-05-03 11:11:28 -04:00 |
|
|
U-BASIS\dsmyda
|
ee90958509
|
Removed sources and javadoc off class path
|
2019-05-01 10:00:43 -04:00 |
|
|
U-BASIS\dsmyda
|
055db7b6a2
|
Excluded javadocs from Ivy
|
2019-05-01 09:54:31 -04:00 |
|
|
esaunders
|
3d7fc23304
|
Merge branch 'develop' into Fix-Desync-Between-KWS-Props-and-XML
|
2019-04-30 18:05:42 -04:00 |
|
|
U-BASIS\dsmyda
|
f0fb45cc51
|
Removed references that netbeans failed to clean up
|
2019-04-30 17:48:59 -04:00 |
|
|
U-BASIS\dsmyda
|
a56c5c116a
|
Fixed old references hanging around from bad merge in Tika 1.20 branch
|
2019-04-30 17:42:59 -04:00 |
|
|
U-BASIS\dsmyda
|
c1ab782cbc
|
Readded override statement that was lost in Tika 1.20 upgrade
|
2019-04-30 16:45:47 -04:00 |
|
|
Richard Cordovano
|
bcb5987430
|
Revert "4972 - Remove Javadocs from release"
|
2019-04-30 16:35:26 -04:00 |
|
|
U-BASIS\dsmyda
|
f1883d8539
|
Fixing merge errors
|
2019-04-30 10:01:01 -04:00 |
|
|
U-BASIS\dsmyda
|
f40c0dc982
|
Merged in develop
|
2019-04-30 08:30:21 -04:00 |
|
|
U-BASIS\dsmyda
|
01065c269d
|
Changed the solution to a one-liner rather than explicitly excluding javadoc on each configuration
|
2019-04-29 17:06:41 -04:00 |
|
|
Richard Cordovano
|
237ea66025
|
Merge pull request #4511 from dannysmyda/4367-Upgrade-Tika-1.20
4367 - upgrade to tika 1.20
|
2019-04-26 17:05:49 -04:00 |
|
|
Richard Cordovano
|
75bf67616d
|
Merge pull request #4683 from kellykelly3/1218-communications-history
1218 communications history
|
2019-04-26 13:39:11 -04:00 |
|
|
William Schaefer
|
70ece59df5
|
4978 fix issues caused when fixing codacy issues
|
2019-04-25 18:25:06 -04:00 |
|
|
William Schaefer
|
07baa3f52a
|
4978 address codacy complaints
|
2019-04-25 18:05:20 -04:00 |
|
|
U-BASIS\dsmyda
|
dee5022bb6
|
Removed javadoc from being pulled down from Maven repo, renamed configurations to more closely match their parent NBM, and took sources jars off of the classpath
|
2019-04-25 15:46:43 -04:00 |
|
|
William Schaefer
|
9df9befc29
|
4978 clean up comments regarding DataContentViewers becoming TextViewers
|
2019-04-25 13:47:09 -04:00 |
|
|
William Schaefer
|
e562b2e31f
|
4978 minor clean up changes white space and annotations
|
2019-04-25 11:29:49 -04:00 |
|
|
William Schaefer
|
de43edd557
|
4978 fix disabling of next button
|
2019-04-24 18:08:22 -04:00 |
|
|
William Schaefer
|
b812151a64
|
4978 fix disabling of combobox for extracted text viewer
|
2019-04-24 17:05:21 -04:00 |
|
|
William Schaefer
|
7b9c342ba1
|
4978 fix npe and disabling of combo box
|
2019-04-24 16:55:57 -04:00 |
|
|
William Schaefer
|
778431c45b
|
4978 clean up netbeans warnings
|
2019-04-24 16:09:17 -04:00 |
|
|
William Schaefer
|
d9bb876f6e
|
4978 add Bundle messages
|
2019-04-24 11:17:29 -04:00 |
|
|
William Schaefer
|
b1b77f7248
|
4978 initial TextContentViewer with subviewers
|
2019-04-23 13:56:18 -04:00 |
|
|
U-BASIS\dsmyda
|
eae8425e07
|
Removed non-needed overrides and redundant jar references
|
2019-04-22 17:05:48 -04:00 |
|
|
U-BASIS\dsmyda
|
d37dc80da9
|
Removed the unused sqlite jdbc references
|
2019-04-22 12:31:23 -04:00 |
|
|
Richard Cordovano
|
2afc59ee39
|
Revert "merge develop into Timeline event mgr"
|
2019-04-19 13:16:26 -04:00 |
|
|
U-BASIS\dsmyda
|
be0e2cf059
|
Removed erroneous Image Gallery project property and manually downloaded the cleartk-ml package in attempt to fix Travis
|
2019-04-18 17:09:30 -04:00 |
|
|
U-BASIS\dsmyda
|
59579721b5
|
Merged in release 4.11.0 branch
|
2019-04-18 15:29:33 -04:00 |
|
|
Richard Cordovano
|
f8e359f0ba
|
Merge pull request #4721 from millmanorama/timeline-event-mgr
merge develop into Timeline event mgr
|
2019-04-17 19:04:06 -04:00 |
|
|
rcordovano
|
6aab496d6b
|
Update module dependencies for release 4.11.0
|
2019-04-17 12:54:17 -04:00 |
|
|
rcordovano
|
164543ab64
|
Update module version numbers for 4.11.0 release
|
2019-04-17 11:32:33 -04:00 |
|
|
millmanorama
|
01966ad498
|
Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
# Core/build.xml
# Core/src/org/sleuthkit/autopsy/casemodule/Case.java
# Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
# Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionDataSourceIngestModule.java
# Core/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionFileIngestModule.java
# Core/src/org/sleuthkit/autopsy/timeline/db/EventsRepository.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/Bundle.properties-MERGED
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchErrorDialog.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchOpenAction.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseKeywordSearchPanel.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/MultiCaseSearcher.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SearchQuery.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SelectMultiUserCasesDialog.java
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/multicase/SelectMultiUserCasesPanel.java
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
|
2019-04-16 18:40:34 +02:00 |
|
|
U-BASIS\dsmyda
|
1eb102912f
|
Merged in release 4.11.0 branch
|
2019-04-12 15:11:03 -04:00 |
|
|
U-BASIS\dsmyda
|
748eee36cc
|
Exported dependencies for a certain NBM
|
2019-04-12 14:51:33 -04:00 |
|
|
Raman
|
a00e311652
|
4884: Add support for keyword lists to multi-case keyword search
|
2019-04-10 12:59:30 -04:00 |
|
|
Kelly Kelly
|
f6a2bf16c5
|
refactored how the date control state was saved
|
2019-04-05 15:26:04 -04:00 |
|
|
rcordovano
|
c392a102a7
|
Remove MultiCaseSearcher.java restored by a merge error
|
2019-04-04 07:44:33 -04:00 |
|
|
Richard Cordovano
|
450da82c7f
|
Merge in release-4.11.0 branch
|
2019-04-03 09:21:26 -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 |
|
|
U-BASIS\dsmyda
|
3160b3a45f
|
Merged in develop
|
2019-04-02 11:16:52 -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 |
|
|
Richard Cordovano
|
3cd0fee13f
|
Merge remote-tracking branch 'upstream/release-4.11.0' into improved-case-deletion-part2
|
2019-03-28 11:20:20 -04:00 |
|
|
millmanorama
|
2119625f5a
|
Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1157-collapse_file_events
# Conflicts:
# KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
# RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED
# branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
# branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
|
2019-03-27 12:37:10 +01:00 |
|
|
Ann Priestman
|
bed8774a7f
|
Fixed doxygen warnings
|
2019-03-26 11:31:00 -04:00 |
|
|
Richard Cordovano
|
da8d73d878
|
Improved case deletion polish/cleanup
|
2019-03-25 14:51:47 -04:00 |
|