14526 Commits

Author SHA1 Message Date
Richard Cordovano
3c4dd8c2e6 Merge pull request #2799 from wschaeferB/2596-IntArtifactColumns
2596 Added Artifact Type and and Details Columns
2017-05-15 15:02:29 -04:00
Richard Cordovano
95dec9abf9 Merge pull request #2800 from zhhl/2640-nightlyTimeoutIssue2
2640 nightly timeout issue2
2017-05-15 14:42:25 -04:00
U-BASIS\zhaohui
8db38095b3 2640: Add a convenient function so regression test can change different timeouts 2017-05-15 13:53:05 -04:00
U-BASIS\zhaohui
c61c179807 2640: override the default WindowWaiter.WaitwidnowTimeout to git WizardOperator more time to wait it's fully loaded and also at StartAddxxxxDataSource time give timeouts for casedatabase and solr to create 2017-05-15 13:23:11 -04:00
millmanorama
c72806bd50 Merge remote-tracking branch 'upstream/develop' into 1659-sort-thumbnailviewer 2017-05-15 12:41:15 +02:00
William Schaefer
2ba924bb81 2596 find associated attribute with already defined method, remove un-needed null check 2017-05-12 14:23:57 -04:00
William Schaefer
ed9d2ad596 2596 Added Artifact Type and and Details Columns 2017-05-12 12:21:13 -04:00
Richard Cordovano
321c13509d Merge pull request #2798 from millmanorama/patch-2
fix bug I introduced in my cleanup
2017-05-12 11:22:21 -04:00
Jonathan Millman
d07bcc6af2 fix bug I introduced in my cleanup 2017-05-12 17:09:41 +02:00
millmanorama
a3cb94a061 Merge remote-tracking branch 'upstream/develop' into 1659-sort-thumbnailviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
2017-05-12 17:07:40 +02:00
millmanorama
5fdf70cf08 Merge remote-tracking branch 'upstream/develop' into 1659-sort-thumbnailviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
2017-05-12 16:34:21 +02:00
Richard Cordovano
0f05700f19 Merge pull request #2797 from millmanorama/2210-cleanup
2210 cleanup
2017-05-12 09:25:21 -04:00
millmanorama
6af4d0a631 refactoring and cleanup of DataResultViewerTable 2017-05-12 14:40:09 +02:00
millmanorama
6f3f993073 Merge remote-tracking branch 'upstream/develop' into 2210-cleanup
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
2017-05-12 10:47:38 +02:00
William Schaefer
c18d952393 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2594-GoToSourceArtifactAction 2017-05-11 15:46:51 -04:00
Richard Cordovano
d158b4c011 Merge pull request #2769 from wschaeferB/2595-SplitInterestingItemsTree
2595 split interesting items tree
2017-05-11 15:44:59 -04:00
William Schaefer
e15331f951 2595 fixed module name in interestingArtifactCreatorModule 2017-05-11 15:23:17 -04:00
William Schaefer
ed2a23ca09 2595 fixed name and imports for test interesting artifact creation module 2017-05-11 15:23:03 -04:00
William Schaefer
226c36169f 2595 Test module for creating fake interesting artifacts for display-disabled 2017-05-11 15:22:47 -04:00
William Schaefer
92e9b1f0a7 2595 fixed module name in interestingArtifactCreatorModule 2017-05-11 15:16:30 -04:00
William Schaefer
8952023255 2595 fixed name and imports for test interesting artifact creation module 2017-05-11 15:09:14 -04:00
William Schaefer
36f1defd37 2595 Test module for creating fake interesting artifacts for display-disabled 2017-05-11 14:58:19 -04:00
William Schaefer
26fc8d1ffa Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2595-SplitInterestingItemsTree 2017-05-11 11:22:22 -04:00
William Schaefer
426df25968 2494 add support for newer Results tree changes to viewartifact 2017-05-11 11:16:16 -04:00
William Schaefer
adfdf471c1 2494 add actions for viewing source artifact for interesting art 2017-05-11 11:15:09 -04:00
William Schaefer
6a58e107e5 2594 add actions to call viewArtifact for navigation to source art 2017-05-11 11:13:03 -04:00
William Schaefer
5cee9f5402 2596 fix bundle message for artifact label 2017-05-11 10:49:22 -04:00
Richard Cordovano
97ff7ca519 Merge pull request #2793 from millmanorama/2210-persist-sort
2210 persist sort
2017-05-10 15:24:35 -04:00
Richard Cordovano
a71e1f58c6 Merge remote-tracking branch 'upstream/release-4.4.0' into develop 2017-05-10 11:53:37 -04:00
Richard Cordovano
d4184abbf2 Move attempt to gc from Autopsy.Case to SleuthkitCase 2017-05-10 11:50:15 -04:00
Richard Cordovano
590682350a Merge pull request #2795 from rcordovano/1655-view-in-dir-fixes
Add missing clone method to ViewContextAction
2017-05-09 17:15:40 -04:00
Richard Cordovano
b93699d174 Add missing clone method to ViewContextAction 2017-05-09 17:14:48 -04:00
Richard Cordovano
e0a9dbb975 Update contents of developers directory 2017-05-09 17:02:53 -04:00
Richard Cordovano
dd96eb7718 Merge pull request #2794 from rcordovano/2644-missing-resource-exception-fix
2644 missing resource exception fix
2017-05-09 14:15:40 -04:00
Richard Cordovano
915dad6498 Fix MissingResourceException in Experimental NBM 2017-05-09 14:15:08 -04:00
Richard Cordovano
75ff182a16 Fix MissingResourceException in Experimental NBM 2017-05-09 14:13:34 -04:00
millmanorama
6988ebc97d minor cleanup 2017-05-09 17:09:18 +02:00
millmanorama
b35b871d1f cleanup sort persistence and fix bug caused by using column identifiers 2017-05-09 17:07:33 +02:00
millmanorama
e22c9d413b persist multi column sorting in DataResultViewerTable 2017-05-09 11:07:48 +02:00
Richard Cordovano
b148a95844 Merge pull request #2792 from rcordovano/1655-view-in-dir-fixes
Tidy up ViewContextAction.java
2017-05-08 18:05:10 -04:00
Richard Cordovano
95b4beb41d Format ViewCOntextAction.java 2017-05-08 18:04:26 -04:00
Richard Cordovano
29c5f42c94 Tidy up ViewContextAction.java 2017-05-08 18:02:49 -04:00
Richard Cordovano
e6e36476d9 Updated NEWS.txt for release 4.4.0 2017-05-08 17:04:24 -04:00
Richard Cordovano
8effe75dd6 Merge pull request #2791 from zhhl/2640-nightlyTimeoutIssue
2640: wait until the 'Add Data Source' dialog loaded
2017-05-08 16:41:28 -04:00
U-BASIS\zhaohui
d32435302d 2640: wait until the 'Add Data Source' dialog loaded 2017-05-08 16:05:58 -04:00
Richard Cordovano
61fada77f8 Merge remote-tracking branch 'upstream/release-4.4.0' into develop 2017-05-08 12:00:28 -04:00
Richard Cordovano
2fb0babe0d Merge branch 'release-4.4.0' of github.com:sleuthkit/autopsy into release-4.4.0 2017-05-08 11:58:46 -04:00
Richard Cordovano
5384645a63 Add new RegRipper 2.8 plugins 2017-05-08 11:58:34 -04:00
Richard Cordovano
cdcdab8fa7 Merge pull request #2790 from sleuthkit/release-4.4.0
Merge in release 4.4.0 branch
2017-05-08 11:55:02 -04:00
Richard Cordovano
ec46fddb2a Merge pull request #2789 from sleuthkit/reg-ripper-plugins-update
Update to RegRipper 2.8 plugins
2017-05-08 11:53:47 -04:00