12382 Commits

Author SHA1 Message Date
Sophie Mori
9763d4513c Fixed interesting items scrolling and sizing 2016-10-17 13:25:41 -04:00
Sophie Mori
6b990de886 Fixed hash options panel size issue 2016-10-17 13:25:03 -04:00
Sophie Mori
8d639a29e4 merging develop 2016-10-17 10:15:38 -04:00
Richard Cordovano
d6f57de1b8 Merge pull request #2373 from zhhl/2020-NPEatStixReport
2020: instead of passing a msg from getLocalizedMessage() method, pas…
2016-10-13 14:47:35 -04:00
U-BASIS\zhaohui
bd023b6859 2020: instead of passing a msg from getLocalizedMessage() method, pass an string of error message to avoid a NPE problem 2016-10-13 13:44:26 -04:00
Sophie Mori
594305ca6f pulling latest develop branch 2016-10-13 11:40:07 -04:00
Sophie Mori
7593f0eb0e ReportHTML NPE catch and log with detailed error message 2016-10-13 11:38:47 -04:00
Richard Cordovano
c507799d47 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-10-12 10:28:57 -04:00
Richard Cordovano
f4153d5f0b Restore AutopsyItemVisitor and AutopsyVisitableItem to public API 2016-10-12 10:28:20 -04:00
Richard Cordovano
37061a7309 Merge pull request #2370 from wishdasher/AUT-2233_race_condition_vic_tag_names
Fixed race conditions when adding tag names
2016-10-12 10:18:12 -04:00
Sophie Mori
81622f985f Merging in develop, resolved conflict in DrawableTagsManager 2016-10-12 09:54:54 -04:00
Sophie Mori
0c433e43ac Updated error messages 2016-10-12 09:29:27 -04:00
Richard Cordovano
6c5079ee97 Merge pull request #2372 from ffsantos92/patch-1
Link to developer docs v4.1
2016-10-11 18:19:40 -04:00
Fábio Santos
4c2e1b5a82 Link to developer docs v4.1 2016-10-11 23:15:32 +01:00
Richard Cordovano
6a2f235114 Update NEWS.txt for Autopsy release 4.2.0 2016-10-11 17:22:59 -04:00
Richard Cordovano
394a22213a Merge pull request #2367 from wishdasher/AUT-2105_keyboard_shortcut_tagging_file
Added keyboard shortcut for tagging files and artifacts
2016-10-11 16:44:41 -04:00
Richard Cordovano
ba83557b98 Merge pull request #2348 from wishdasher/AUT-1795_external_viewer_associations
Added options panel for user defined external viewer associations
2016-10-11 16:39:34 -04:00
Sophie Mori
448cb0cd98 Changed ExternalViewerRulesManager to package level access 2016-10-11 16:25:36 -04:00
Sophie Mori
145ba4dd10 All abstract files are taggable, changed lookup in AddContentTagAction 2016-10-11 16:24:00 -04:00
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
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
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
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