Commit Graph
17676 Commits
Author SHA1 Message Date
Richard Cordovano cabbca166f Merge pull request #3683 from dgrove727/3685_StringsScrollBars
Fixed Strings scroll bars.
2018-04-18 09:02:10 -04:00
Richard Cordovano 7ac20398b0 Merge pull request #3682 from dgrove727/3685_IndexedTextScrollBars
Fixed Indexed Text scroll bars.
2018-04-18 09:01:53 -04:00
Richard Cordovano 59020a3ca9 Merge pull request #3667 from dgrove727/1746_TranslationTool
Changed separator position to allow room for 'Translate Text'.
2018-04-18 08:31:19 -04:00
Brian Carrier bdfa460d5d Merge pull request #3688 from rishwanth1995/appveyor_and_travis
reduced verbosity of travis log and added appveyor.yml
2018-04-17 13:48:45 -04:00
Richard Cordovano 941351053d Merge pull request #3662 from zhhl/3599-7thTestForFileFilterTests
3599: 7th test for file filter tests.
2018-04-16 13:42:21 -04:00
U-BASIS\zhaohui 5114f21a56 3599: Enable number 7 test case. 2018-04-13 16:59:02 -04:00
U-BASIS\zhaohui 4f9efb602b 3599: Enable number 7 test case. 2018-04-13 16:56:54 -04:00
rishwanth1995 5f210fd08d checked out ingestfilterTest 2018-04-13 13:36:46 -04:00
rishwanth1995 e86e81de9b removed merge conflict with develop 2018-04-13 13:34:14 -04:00
rishwanth1995 9e04d08280 modified travis for reduced verbosity and added appveyor.yml 2018-04-13 13:28:48 -04:00
U-BASIS\zhaohui ec86a85b46 3599: Rename the disabled test to make it more meaningful. 2018-04-13 12:45:05 -04:00
U-BASIS\dgrove f9f6fb3f62 Fixed Indexed Text scroll bars. 2018-04-13 11:45:09 -04:00
U-BASIS\dgrove 380869b3e5 Fixed Strings scroll bars. 2018-04-13 11:40:30 -04:00
U-BASIS\zhaohui 8cf2266364 3599: cleanup. 2018-04-12 14:37:29 -04:00
U-BASIS\zhaohui 757bc00923 3599: comment out 7th test for file filter tests. 2018-04-12 14:33:15 -04:00
Brian Carrier a2f15b234a Merge pull request #3669 from rishwanth1995/travis_less_verbose
reduce verbosity of ant build in travis
2018-04-12 09:50:25 -04:00
Richard Cordovano ea0a56b9fa Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-04-11 14:27:52 -04:00
Richard Cordovano 3594c4c501 Merge remote-tracking branch 'upstream/release-4.7.0' into custom-release-may-2018 2018-04-11 14:27:12 -04:00
Richard Cordovano bd5cf39456 Merge pull request #3670 from dgrove727/RegressionTestLoggerFix
Switched to 'java.lang' Logger.
2018-04-11 13:16:40 -04:00
U-BASIS\dgrove 8f48347669 Switched to 'java.lang' Logger. 2018-04-11 11:53:01 -04:00
rishwanth1995 e32348590e reduce verbosity of ant build in travis 2018-04-11 11:48:42 -04:00
Richard Cordovano 8f7a3f3c27 Merge pull request #3656 from dgrove727/3711_AccountsCreateKeysNPE
Event subscribers now handled for all factory classes.
2018-04-11 11:28:52 -04:00
Richard Cordovano caa1f73266 Merge pull request #3668 from dgrove727/AutopsyTestCasesLoggerFix
Switched to 'java.util' Logger.
2018-04-11 11:26:06 -04:00
U-BASIS\dgrove 2d99a3dbd4 Switched to 'java.util' Logger. 2018-04-11 11:12:32 -04:00
Brian Carrier aff1f64ced Added more logging and status 2018-04-10 22:41:06 -04:00
U-BASIS\dgrove 8de3dd76d3 Changed separator position to allow room for 'Translate Text'. 2018-04-10 16:26:15 -04:00
Richard Cordovano 2174948042 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2018-04-10 13:45:49 -04:00
Richard Cordovano 42988f20bb Fix compile error in KeywordSearch.java 2018-04-10 13:45:38 -04:00
Richard Cordovano c9a14c1082 Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-04-10 13:40:08 -04:00
Richard Cordovano b759ddcc4f Merge pull request #3664 from millmanorama/962-layout-progress
962 layout progress
2018-04-10 12:21:18 -04:00
Richard Cordovano 74856bc4de Merge pull request #3653 from millmanorama/976-show-applied-layout
976 show applied layout as bold text on buttons
2018-04-10 12:18:08 -04:00
millmanorama 4379f81e17 call fitGraph() within transaction to avoid 'blip' 2018-04-09 18:15:13 +02:00
Richard Cordovano d381dd276d Merge pull request #3661 from dgrove727/3645_CoreUtilsLogger_1
Fixed return type issue.
2018-04-09 11:48:08 -04:00
U-BASIS\zhaohui 06198b0162 3599: Rename the ant target name from getImageFile to getTestDataFiles 2018-04-09 11:42:17 -04:00
U-BASIS\zhaohui 35ae3e60aa 3599: 7th test for file filter test. 2018-04-09 11:35:53 -04:00
millmanorama 206e599037 remove animation of layout and handle errors. 2018-04-09 16:43:26 +02:00
U-BASIS\dgrove 7a73afd647 Fixed return type issue. 2018-04-09 10:36:26 -04:00
millmanorama f3f650c2f3 fix codacy issues 2018-04-09 13:54:40 +02:00
millmanorama 662babede1 Revert "refactor to use LockedVertexLayoutWrapper"
This reverts commit 08cc853fa8.

# Conflicts:
#	Core/src/org/sleuthkit/autopsy/communications/LockedVertexModel.java
#	Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
2018-04-09 13:52:10 +02:00
millmanorama 763d30d760 Merge branch '976-show-applied-layout' into 962-layout-progress
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/communications/LockedVertexModel.java
#	Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
2018-04-09 13:20:01 +02:00
millmanorama f0e04d28f2 log errors in layout SwingWorker 2018-04-09 11:32:14 +02:00
millmanorama 1bec33604b fix codacy warnings 2018-04-07 16:52:43 +02:00
millmanorama b5a50fd62a fix repainting of lock icons 2018-04-07 15:49:25 +02:00
millmanorama f3161c7af6 multiselect for locking. Not updating the icon properly... 2018-04-07 14:56:15 +02:00
Richard Cordovano 0097e0f942 Merge pull request #3658 from dgrove727/3645_CoreUtilsLogger
Switched from Java logger to Autopsy logger.
2018-04-06 17:52:46 -04:00
Richard Cordovano fdb42c6c2b Merge pull request #3657 from eugene7646/central_repo_fixes_3693
Central repository fixes (3693)
2018-04-06 17:41:23 -04:00
U-BASIS\dgrove 0cacfea4b3 Added comment about use of standard Java Logger. 2018-04-06 17:06:25 -04:00
Richard Cordovano 02a7da15ef Merge pull request #3659 from zhhl/3598-6thTestForFileFilterTest
3598: 6th test for file filter tests
2018-04-06 15:14:34 -04:00
U-BASIS\zhaohui 771ec1a983 3598: 6th test for file filter tests 2018-04-06 15:08:36 -04:00
Richard Cordovano 6d8431921c Merge pull request #3655 from zhhl/3597-5rdTestForFileFilterTest
3597: 5th test for file type filter test.
2018-04-06 14:22:29 -04:00