Commit Graph
12342 Commits
Author SHA1 Message Date
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 bca8232808 Fixed merge conflict 2016-10-07 16:04:04 -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
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 2fa1499711 Added distinction between MIME type and extension 2016-10-06 11:38:46 -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
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 ed9cdfbcb4 Changed file extension mismatch options panel UI to resize correctly 2016-10-04 13:48:47 -04:00
Sophie Mori 01c2487157 Reset border for File extension mismatch options panel 2016-10-04 12:45:30 -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
Richard Cordovano ec766c0d76 Merge pull request #2363 from rcordovano/tag_management_updates
Tag management updates
2016-10-03 18:13:38 -04:00
Richard Cordovano 1464fc973d Improve/fix tags option panel implementation 2016-10-03 18:12:08 -04:00
millmanorama 9f43ec1b6f query database for children count to avoid making nodes 2016-10-03 17:48:07 +02:00
Richard Cordovano 8af724e742 Merge pull request #2354 from millmanorama/845-multiselect-enabled-account-actions
845 account actions support multiselect via actionsGlobalLookup
2016-10-03 10:11:19 -04:00
Richard Cordovano 618e2c226e Merge pull request #2352 from millmanorama/843-disable-result-text
843 don't show broken result text option in ExtractedContentViewer dropdown
2016-10-03 10:07:01 -04:00
Richard Cordovano 4115dab333 Changes to tags management (partial) 2016-10-03 00:23:47 -04:00
Richard Cordovano 6e60f9a978 Changes to tags management (partial) 2016-10-02 23:31:56 -04:00
millmanorama 476ec23eaf remove accounts package 2016-10-02 22:47:19 +02:00
millmanorama 8aba99971e Merge remote-tracking branch 'upstream/develop' into 841-maintain-selection 2016-10-02 22:12:37 +02:00
millmanorama f056196db1 WIP 2016-10-02 22:12:27 +02:00
Richard Cordovano 00a905533e Merge pull request #2355 from wishdasher/AUT-2107_tag_deletion_options_panel
Added options panel for adding and deleting user tag names
2016-09-30 17:57:50 -04:00
Richard Cordovano 821c841d5b Merge pull request #2362 from zhhl/2025-cmdFileNotBeExecuted
2025: disable cmd file context menu of 'open in external viewer'
2016-09-30 17:16:55 -04:00
U-BASIS\zhaohui 32e3501126 2025: disable cmd file context menu of 'open in external viewer' 2016-09-30 15:27:08 -04:00
Richard Cordovano f380dbc429 Fix transaction error handling in FileManager 2016-09-30 11:22:58 -04:00
millmanorama 371a85ffd1 refactoring to maintain selection, but now it computes nodes too eagerly, and doesn't get the counts on the first update... 2016-09-30 17:08:19 +02:00
millmanorama 1c65426cfb simplify visitor 2016-09-29 13:03:31 +02:00
Sophie Mori 25639b76e1 Fixed if else logic 2016-09-28 15:38:18 -04:00
Sophie Mori b7f227b76c Updated implementation to not automatically add user tag names 2016-09-28 15:09:28 -04:00
millmanorama 07d93a07d8 Merge branch '844-generic-account-artifact' into 841-maintain-selection
Conflicts:
	Core/src/org/sleuthkit/autopsy/datamodel/_private/Accounts.java
2016-09-28 19:07:28 +02:00
millmanorama ff56458537 Merge remote-tracking branch 'upstream/develop' into 844-generic-account-artifact 2016-09-28 13:44:56 +02:00
millmanorama c78dab32a0 clarify comments 2016-09-28 13:43:52 +02:00
Richard Cordovano d2942263f2 Fix cause of IndexOutOfBounds exception for DataResultViewerThumbnail 2016-09-27 17:28:55 -04:00