Commit Graph
18776 Commits
Author SHA1 Message Date
Richard Cordovano 3fa1afb27b Merge pull request #2371 from wishdasher/develop
Fixed typo that appears in the UI
2016-10-11 16:23:36 -04:00
Sophie Mori f2cd5ce5a4 Fixed typo that appears in the UI 2016-10-11 13:16:31 -04:00
Sophie Mori 325c6a9310 Removed unused imports 2016-10-11 13:14:49 -04:00
Sophie Mori 2d5f271df3 Fixed race conditions when adding new tag names to database 2016-10-11 12:58:24 -04:00
Richard Cordovano cdb5b50ed4 Fixes for credit card account artifact report generation 2016-10-11 12:26:29 -04:00
Sophie Mori 618eb494d4 Renamed classes with rule -> external viewer rule 2016-10-11 11:04:11 -04:00
Sophie Mori 4e722ce81a Eliminated use of action command binding 2016-10-07 17:23:59 -04:00
Sophie Mori be95f12605 set commandAction manually 2016-10-07 17:10:55 -04:00
Sophie Mori b721a14226 merging to use new jar file during build 2016-10-07 16:05:48 -04:00
Sophie Mori bca8232808 Fixed merge conflict 2016-10-07 16:04:04 -04:00
Sophie Mori 3982f35e38 Merge branch 'develop' into AUT-2105_keyboard_shortcut_tagging_file
merging to use new jar file when building
2016-10-07 15:59:55 -04:00
Eugene Livis 031d86b7b1 Using non-deprecated classes and methods 2016-10-07 15:59:49 -04:00
Richard Cordovano 27de2e805f First draft of NEWS.txt update 2016-10-07 15:49:27 -04:00
Richard Cordovano 667e35f372 Merge remote-tracking branch 'upstream/credit_card_account_search' into develop 2016-10-07 14:56:45 -04:00
Richard Cordovano 585ea95c7d Merge in rc_base branch 2016-10-07 14:55:19 -04:00
Eugene Livis d6f704a149 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-10-07 14:39:33 -04:00
Eugene Livis 5b0a0635f1 Merge latest 2016-10-07 14:39:12 -04:00
Richard Cordovano ee52d2bcf1 Merge pull request #2369 from millmanorama/imagegallery_sort_help
add pop up help to imagegallery sort controls
2016-10-07 14:38:31 -04:00
Sophie Mori 7c18bc0e4f Merge branch 'develop' into AUT-2106_tags_table_view

build finding the wrong jar file
2016-10-07 13:11:21 -04:00
Eugene Livis 5da78acb57 First cut at porting to Solr 6.2.1 2016-10-07 11:54:13 -04:00
Eugene Livis 6c8487d310 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-10-06 16:17:57 -04:00
Sophie Mori 2fa1499711 Added distinction between MIME type and extension 2016-10-06 11:38:46 -04:00
Sophie Mori a60dd92384 Rows initially colored, does not update upon tag addition or reordering 2016-10-06 10:06:21 -04:00
millmanorama bc7b3d3556 add pop up help to imagegallery sort controls 2016-10-06 11:33:16 +02:00
Richard Cordovano 81d7f3f47e Merge pull request #2368 from esaunders/develop
Upgrade PostgreSQL driver from 9.4.1201-jdbc41 to 9.4.1211.jre7
2016-10-05 17:49:57 -04:00
esaunders 5134fdfb45 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2016-10-05 17:05:25 -04:00
esaunders 5291ed80dc Upgrade PostgreSQL driver from 9.4.1201-jdbc41 to 9.4.1211.jre7 2016-10-05 17:04:47 -04:00
Sophie Mori 2bfc85e8ad Renamed bookmark action class and added shortcut function to timeline 2016-10-05 12:52:23 -04:00
Richard Cordovano 3e6106bec9 Merge pull request #2359 from wishdasher/AUT-2232_options_panel_consistent_UI
Changed options panel UI to be more consistent
2016-10-05 12:40:26 -04:00
Richard Cordovano 5e9d3b7082 Merge pull request #2365 from millmanorama/841-maintain-selection
841 maintain selection
2016-10-05 12:38:48 -04:00
Richard Cordovano 474b5a6b14 Merge pull request #2366 from wishdasher/AUT-2231_artifact_content_viewer_datetime_format
Updated getString to use attribute's getDisplayString
2016-10-05 12:16:22 -04:00
Richard Cordovano 044222ec83 Merge pull request #2351 from wishdasher/AUT-2228_keywordsearch_cleanups
Changed requested code
2016-10-05 12:12:18 -04:00
Sophie Mori 7471881951 Updated getString to use attribute's getDisplayString 2016-10-05 10:52:24 -04:00
millmanorama 049913bc4b some cleanup and comments 2016-10-05 16:41:40 +02:00
millmanorama 9bd01d1613 re-implement re-selection of nodes 2016-10-05 15:10:28 +02:00
millmanorama e18839f256 fix refresh bugs 2016-10-05 13:54:45 +02:00
millmanorama 2e21c70098 Merge remote-tracking branch 'upstream/develop' into 841-maintain-selection 2016-10-05 11:43:41 +02:00
millmanorama 60f5b19e46 Merge remote-tracking branch 'upstream/credit_card_account_search' into 841-maintain-selection
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
2016-10-05 11:43:27 +02:00
Sophie Mori dfdc033a52 Added shortcut to timeline view, removed unnecessary hashset construction 2016-10-04 17:30:37 -04:00
Sophie Mori e112806bc2 Updated bookmark to tag results and files (excluding virtualdir) 2016-10-04 16:12:07 -04:00
Sophie Mori ed9cdfbcb4 Changed file extension mismatch options panel UI to resize correctly 2016-10-04 13:48:47 -04:00
Sophie Mori e8c8d6c8d3 Updated BookmarkFileAction to work with new version of TagsManager 2016-10-04 13:38:48 -04:00
Sophie Mori 83afd06486 Removed previous files accidentally committed from merge 2016-10-04 13:00:34 -04:00
Sophie Mori 01c2487157 Reset border for File extension mismatch options panel 2016-10-04 12:45:30 -04:00
Sophie Mori aaf4b61f30 Merged develop to get new TagsManager and AddTagAction files 2016-10-04 11:31:47 -04:00
Eugene Livis faadedd54c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-10-04 11:24:37 -04:00
Sophie Mori f70fa430b5 Renamed button in keyword list options add keyword panel 2016-10-04 11:14:39 -04:00
Richard Cordovano 85972446c8 Merge pull request #2364 from wishdasher/rc_base
Changed DATETIME format for artifact viewer in ArtifactStringContent
2016-10-04 09:53:24 -04:00
Sophie Mori 0e5f72270c Changed DATETIME format for artifact viewer in ArtifactStringContent 2016-10-04 09:48:05 -04:00
Richard Cordovano f8a5795107 Merge pull request #2357 from wishdasher/AUT-2231_artifact_content_viewer_datetime_format
Changed datetime value type attributes to be formatted as dates inste…
2016-10-03 18:45:05 -04:00