codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-09 02:21:00 +00:00
Code Issues Releases Wiki Activity
17,665 Commits 24 Branches 52 Tags
f246e05a9ef83bc3e63bedf47752878e62157dbb
Commit Graph
17665 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Cordovano f246e05a9e Merge pull request #3699 from millmanorama/972-remove-event-hash-set-hets-tables 
972 remove event hash set hets tables
 2018-04-18 09:52:52 -04:00
millmanorama 20ffc61d69 Merge remote-tracking branch 'upstream/timeline-event-mgr' into 972-remove-event-hash-set-hets-tables 2018-04-17 15:04:46 +02:00
millmanorama 975d07cae5 update to match sleuthkit changes 2018-04-17 15:03:59 +02:00
Richard Cordovano 2c385b6d94 Merge pull request #3681 from millmanorama/972-remove-tags-table 
972 remove tags table
 2018-04-16 09:23:09 -04:00
Richard Cordovano f608831f57 Update EventsRepository.java 
Correct spelling error.
 2018-04-16 09:22:33 -04:00
Richard Cordovano a3eb0d7dd0 Merge pull request #3680 from millmanorama/error-handling-fixes 
minor error handling fixes
 2018-04-16 09:21:12 -04:00
millmanorama 789a069ff2 Merge branch 'error-handling-fixes' into 972-remove-tags-table 2018-04-13 15:25:46 +02:00
millmanorama d69535492d remove unneeded call 2018-04-13 15:25:31 +02:00
millmanorama 3985911eed don't record tags, only mark event tagged. 2018-04-13 14:45:05 +02:00
millmanorama 84f1f335c5 minor mixes 2018-04-12 10:34:41 +02:00
Richard Cordovano 2f8c0a0627 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 2018-04-10 14:30:57 -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
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
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\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
Richard Cordovano 3c652a20f3 Merge pull request #3652 from zhhl/3596-4rdTestForFileFilterTest 
3596 4rd test for file filter test
 2018-04-05 11:26:37 -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
Richard Cordovano ebe4436394 Merge pull request #3651 from millmanorama/967-don't-show-secondary-relationships-by-default 
967 don't show secondary relationships by default
 2018-04-04 09:37:55 -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