Commit Graph
8721 Commits
Author SHA1 Message Date
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
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
U-BASIS\zhaohui ec86a85b46 3599: Rename the disabled test to make it more meaningful. 2018-04-13 12:45:05 -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
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
U-BASIS\dgrove 8de3dd76d3 Changed separator position to allow room for 'Translate Text'. 2018-04-10 16:26:15 -04:00
Richard Cordovano c9a14c1082 Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop 2018-04-10 13:40:08 -04:00
millmanorama 4379f81e17 call fitGraph() within transaction to avoid 'blip' 2018-04-09 18:15:13 +02: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
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
U-BASIS\zhaohui 771ec1a983 3598: 6th test for file filter tests 2018-04-06 15:08:36 -04:00
millmanorama 1882690b72 refactor actions to support multiselect in VisualizationPanel via the ActionsGlobalContext lookup 2018-04-06 15:55:44 +02:00
U-BASIS\dgrove 37ed49b1b3 Switched from Java logger to Autopsy logger. 2018-04-06 09:38:06 -04:00
U-BASIS\dgrove 34106c0f72 Event subscribers now handled for all factory classes. 2018-04-05 14:55:25 -04:00
U-BASIS\zhaohui a34cf8e531 3597: 5th test for file type filter test. 2018-04-05 14:40:03 -04:00
Eugene Livis ec0583a69e Merge branch 'develop' of github.com:sleuthkit/autopsy into central_repo_fixes_3693 2018-04-05 12:19:01 -04:00
millmanorama 32868a97f1 WIP - broken 2018-04-05 12:06:13 +02:00
Eugene Livis f013514e3e Added conflict clause to all INSTER SQL commands 2018-04-04 10:36:51 -04:00
millmanorama 08cc853fa8 refactor to use LockedVertexLayoutWrapper 2018-04-04 16:35:04 +02:00
millmanorama 268308874e refactoring layout buttons 2018-04-04 16:35:03 +02:00
millmanorama 642981ff69 show applied layout in bold 2018-04-04 16:34:37 +02:00
U-BASIS\zhaohui 186c037b21 3596: 4th test for file filter. 2018-04-04 10:13:40 -04:00
U-BASIS\zhaohui c3eadcb9f6 3596: 4th test for file filter. 2018-04-04 10:07:54 -04:00
millmanorama c326c1245f change default to fast organic 2018-04-04 14:47:58 +02:00
millmanorama 6c4573f15b Merge remote-tracking branch 'upstream/release-4.7.0' into 967-don't-show-secondary-relationships-by-default 2018-04-04 14:14:06 +02:00
Richard Cordovano c4b389b717 Merge pull request #3650 from zhhl/3592-3rdTestForFileFilterTest
3592 3rd test for file filter test
2018-04-03 18:22:48 -04:00
U-BASIS\zhaohui 836a53875f 3592: Import the ExtensionCondition to make the construction of a rule cleaner. 2018-04-03 18:18:13 -04:00
Richard Cordovano 84300bb6da Merge pull request #3645 from wschaeferB/3710-EditingExistingFilterFix
3710 editing a file filter without adding any new ones no longer uses…
2018-04-03 17:47:17 -04:00
U-BASIS\zhaohui be73e3f085 3592: 3rd Tests for file filter. 2018-04-03 17:46:42 -04:00
U-BASIS\zhaohui 6d748e4190 3592: 3rd Tests for file filter. 2018-04-03 17:44:49 -04:00
U-BASIS\zhaohui d801a66138 3592: 3rd Tests for file filter. 2018-04-03 17:39:32 -04:00
U-BASIS\zhaohui 7f50490642 3592: 3rd Tests for file filter. 2018-04-03 17:34:34 -04:00
Richard Cordovano d6be487524 Merge branch 'develop' into 3591-2ndTestForFileFilterTest 2018-04-03 17:32:54 -04:00