11435 Commits

Author SHA1 Message Date
Karl Mortensen
77a5696336 Remove changed Japanese internationalization items 2016-04-20 12:31:30 -04:00
Karl Mortensen
7506627af2 Update text 2016-04-20 12:30:36 -04:00
Karl Mortensen
59e9e8e694 Remove debug logging, have higher level classes deal with Exceptions 2016-04-20 11:20:58 -04:00
Richard Cordovano
ab4b1ef8fb Fix typo in build.xml for Autopsy suite 2016-04-20 10:21:29 -04:00
Richard Cordovano
e111390e30 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-04-20 10:16:19 -04:00
Richard Cordovano
2e6c926ca9 Merge pull request #2082 from BasisOlivers/aut-2092
File extension mismatch ui upgrade
2016-04-20 10:11:57 -04:00
Richard Cordovano
4b57b1a3b8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-04-20 10:04:03 -04:00
Richard Cordovano
85b436cf08 Change Autopsy3 to Autopsy4 in build.xml 2016-04-20 10:03:30 -04:00
Richard Cordovano
d9b055e5ee Change Autopsy3 to Autopsy4 in build.xml 2016-04-20 10:01:10 -04:00
Karl Mortensen
63196051ba Merge branch 'develop' of github.com:sleuthkit/autopsy into IngestModuleExceptions 2016-04-20 09:32:21 -04:00
Oliver Spohngellert
f9c419c134 Fixed merge conflicts. 2016-04-19 15:42:34 -04:00
Oliver Spohngellert
4829557794 Merge remote-tracking branch 'upstream/develop' into aut-2092 2016-04-19 15:35:41 -04:00
Richard Cordovano
2a099cf87d Merge pull request #2078 from BasisOlivers/ui-bugfix
Fixed file size rule ui bug.
2016-04-19 15:35:08 -04:00
jmillman
6e93249736 comments and minor cleanup in SubTypeTreeItem 2016-04-19 15:32:47 -04:00
jmillman
cc58b96764 comments and minor cleanup in EventsTreeItem; replace Deque with list 2016-04-19 15:23:33 -04:00
jmillman
a10b1fd23e comments and minor cleanup in EventTypeTreeItem 2016-04-19 15:03:07 -04:00
jmillman
dc1c989fd5 comments and minor cleanup in DescriptionTreeItem 2016-04-19 15:00:09 -04:00
jmillman
701d9c54c6 comments and minor cleanup in BaseTypeTreeItem 2016-04-19 14:53:34 -04:00
Richard Cordovano
cee800dba3 Merge pull request #2076 from BasisOlivers/aut-2034
Serialization for file extension mismatch
2016-04-19 14:52:25 -04:00
jmillman
a1eea710a9 comments and minor cleanup in EventStripeNode 2016-04-19 14:41:22 -04:00
Karl Mortensen
b852cafa41 merge 2016-04-19 14:23:16 -04:00
jmillman
f041783a19 comments and minor cleanup in EventClusterNode 2016-04-19 14:17:32 -04:00
Karl Mortensen
254dc67854 Messaging for IngestModuleExceptions 2016-04-19 13:46:08 -04:00
Oliver Spohngellert
d624eab01d Fixed file size rule ui bug. 2016-04-19 13:35:48 -04:00
jmillman
1545639c76 comments and minor cleanup in DetailsChart , pull HideDescriptionAction and UnhideDescriptionAction out as top level classes 2016-04-19 12:57:45 -04:00
jmillman
501a108a6f comments and minor cleanup in DetailsChart and DetailsChartLayoutSettings 2016-04-19 12:20:46 -04:00
jmillman
3a093cd112 comments and minor cleanup 2016-04-19 11:07:13 -04:00
Oliver Spohngellert
3289326de6 Got rid of unnecessary re-put in map. 2016-04-19 10:29:42 -04:00
jmillman
adf2e11b1d improve API for artifactID 2016-04-19 09:53:18 -04:00
jmillman
9753d2d0eb remove inherited hashmap 2016-04-19 09:53:12 -04:00
jmillman
ef98498d82 comments 2016-04-19 09:53:03 -04:00
jmillman
a664079b54 move findTreeItemForEvent up to EventsTreeItem 2016-04-19 09:52:58 -04:00
jmillman
395f248a06 fix another bug in EventsTree and make it more general (takes TimeLineEvent instead of EventStripe) 2016-04-19 09:52:52 -04:00
jmillman
2f087fb022 WIP fixing events tree WIP 2016-04-19 09:52:46 -04:00
Oliver Spohngellert
7663ebc7fe Made text field clear when extension is added. 2016-04-19 08:47:20 -04:00
Richard Cordovano
bdceaa7899 Merge pull request #2072 from BasisOlivers/aut-2079
Update to netbeans plat 8.1
2016-04-18 16:58:47 -04:00
Oliver Spohngellert
80bf23d8b1 Fixed up ui to only show error messages, disables buttons. 2016-04-18 16:27:30 -04:00
Oliver Spohngellert
3dd4cd1db3 Fixed merge conflicts. 2016-04-18 15:14:58 -04:00
Oliver Spohngellert
6ca219fad4 Merge remote-tracking branch 'upstream/develop' into aut-2092 2016-04-18 15:12:56 -04:00
Oliver Spohngellert
dad5ce9696 Working towards expanding extension mismatch panel downwards. 2016-04-18 15:11:59 -04:00
Richard Cordovano
1eb2e18b7e Merge pull request #2075 from BasisOlivers/aut-2089
Improved ui of file type definition global panel
2016-04-18 14:42:43 -04:00
Richard Cordovano
27863bd499 Merge pull request #2073 from BasisOlivers/aut-2086
Removed usages of add/delete "internal"
2016-04-18 14:42:31 -04:00
Oliver Spohngellert
02aaa885d1 Merge remote-tracking branch 'upstream/develop' into aut-2086 2016-04-18 14:39:14 -04:00
Richard Cordovano
4cc56a9798 Merge pull request #2071 from millmanorama/TL-dialog-title
simplify the TL dialog title
2016-04-18 14:37:24 -04:00
Richard Cordovano
542326dd7f Merge pull request #2067 from millmanorama/TL-fix-no-filters-selected
added default true/false values to intersection and union filter sql where clauses…
2016-04-18 14:01:34 -04:00
Oliver Spohngellert
730bfc6278 Fixed up error messages and use of public. 2016-04-18 13:52:41 -04:00
Richard Cordovano
ba4ab7e0dd Merge pull request #2066 from millmanorama/TL-multiple-images-same-name
distinguish datasource filters by datasource id and not displayname in…
2016-04-18 13:43:39 -04:00
Richard Cordovano
aaa217741a Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2016-04-18 13:26:36 -04:00
Richard Cordovano
67ec7e4f92 Correct class doc for modules/filetypeid/FileTypeIdModuleFactory 2016-04-18 13:25:38 -04:00
Richard Cordovano
420fbad28d Remove @inheritDoc from ingest/RunIngestAction and modules/filetypeid/FileTypeIdModuleFactory 2016-04-18 13:21:50 -04:00