Commit Graph
18776 Commits
Author SHA1 Message Date
jmillman ddb9d0c245 converting image analyzer to history manager 2014-08-27 17:05:49 -04:00
jmillman 9074d436ef Merge branch 'advanced_timeline' into timeline_and_image_analyzer
Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
	nbproject/project.properties
2014-08-27 16:51:35 -04:00
jmillman 760e352230 move timeline to Core; add controlsfx/jfxtras/jodatime to CoreLibs via ivy 2014-08-27 16:47:11 -04:00
jmillman d02fe44255 reinstate check for ATTRIBUTE_TYPE.TSK_TAGGED_ARTIFACT 2014-08-27 16:35:59 -04:00
jmillman 820c5cbc32 comments HistoryManager, made ObservableStack an inner class 2014-08-27 16:19:00 -04:00
jmillman 8716d20d66 Merge branch 'timeline_history_manager' into advanced_timeline 2014-08-27 15:50:38 -04:00
jmillman ef640fdf25 Merge branch 'develop' into advanced_timeline 2014-08-27 15:50:10 -04:00
jmillman b0c0eaed1a tightened up api of HistoryManager 2014-08-27 15:41:18 -04:00
jmillman 8ebe820b81 fixed back in history manager 2014-08-27 14:37:15 -04:00
jmillman 3b1586fd2d connect historymanager to filtered events through property: back is broken 2014-08-26 17:36:49 -04:00
jmillman aa1c4f4029 restore lost endOfMedia listener 2014-08-26 16:32:01 -04:00
jmillman 054bb6cf34 Merge branch 'advanced_timeline' into timeline_history_manager 2014-08-26 16:18:03 -04:00
Richard Cordovano c9a6353b6d Merge pull request #866 from millmanorama/source_level_1.8
change source level to 1.8
2014-08-26 16:16:44 -04:00
jmillman 28b1f6e53a Merge branch 'source_level_1.8' into advanced_timeline
Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2014-08-26 16:16:17 -04:00
jmillman 7928094285 Merge remote-tracking branch 'upstream/develop' into advanced_timeline 2014-08-26 16:15:14 -04:00
jmillman e059d5dfa1 change source level to 1.8; use more generic method to look up branded resources in AboutWindowPanel 2014-08-26 16:09:14 -04:00
jmillman 67f0f5f006 remove override of deprecated method logrb 2014-08-26 16:01:43 -04:00
jmillman 4ffe0d32c9 Merge remote-tracking branch 'upstream/develop' into compiler_warning_fixes 2014-08-26 15:56:50 -04:00
Richard Cordovano f33a651621 Merge pull request #864 from millmanorama/md5Search_fix
fix HashSearchAction
2014-08-26 15:38:50 -04:00
jmillman 91deef8310 fix HashSearchAction 2014-08-26 15:33:51 -04:00
jmillman 21db1eec35 make Attachment an innner class 2014-08-26 14:43:26 -04:00
jmillman d0ce887e66 suppress warning about deprecated use of TSK_TAG_ARTIFACT/FILE in documented legacy/hack cases 2014-08-26 14:23:21 -04:00
jmillman e058f766ff remove unnexessary and deprecated use TSK_TAG_FILE/ARTIFACT and simplify action list population 2014-08-26 14:04:45 -04:00
jmillman 110d46c047 remove deprecated and unnecessary use of TSK_TAG_ARTIFACT/FILE 2014-08-26 14:01:51 -04:00
jmillman 6f56826269 suppress warnings about deprecated use of runQuery 2014-08-26 14:00:42 -04:00
jmillman c9e95a1009 fix compiler warnings;
fix warnings related mostly  to generics and deprecation;
2014-08-26 12:50:06 -04:00
jmillman a705f78e2a suppress warnings 2014-08-26 12:45:55 -04:00
jmillman bb8bfd4167 Merge branch 'develop' into compiler_warning_fixes 2014-08-26 12:41:49 -04:00
jmillman 2152129115 initial commit towards HistoryManager implementation 2014-08-25 16:10:21 -04:00
jmillman 62176818df Merge branch 'with_image_analyzer_module' into timeline_and_image_analyzer
Conflicts:
	ImageAnalyzer/nbproject/project.properties
	ImageAnalyzer/nbproject/project.xml
2014-08-25 15:51:12 -04:00
jmillman a8744600d2 move utilities into Core 2014-08-25 15:48:57 -04:00
jmillman 47d2f99eca move ControlsFX into CoreLibs, remove unused jars 2014-08-25 15:48:33 -04:00
jmillman bd1534f572 Merge branch 'advanced_timeline' into timeline_and_image_analyzer 2014-08-25 15:35:25 -04:00
jmillman 68096c5137 remove unussed jars 2014-08-25 15:35:11 -04:00
jmillman 655af8d322 move utilities into autopsy-core 2014-08-25 15:35:00 -04:00
jmillman d67abd1928 Merge branch 'advanced_timeline' into timeline_and_image_analyzer 2014-08-25 15:10:54 -04:00
jmillman 72d1b25086 move controls fx into corelibs; fix bundle property 2014-08-25 15:10:11 -04:00
jmillman 5db3bdd91f remove bad dependencies; move controlsfx into coreLibs 2014-08-25 15:07:21 -04:00
jmillman 2fcd19ba69 Merge branch 'advanced_timeline' into timeline_and_image_analyzer
Conflicts:
	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
	nbproject/project.properties
2014-08-25 14:51:25 -04:00
jmillman e86d90d4ef Merge branch 'with_image_analyzer_module' into timeline_and_image_analyzer 2014-08-25 14:49:24 -04:00
jmillman b3183fadde remove advanced from image paths 2014-08-25 14:48:15 -04:00
jmillman 5f56a3c70d rename package remove "advanced" 2014-08-25 14:43:40 -04:00
jmillman cb60578153 initial commit timeline module 2014-08-25 14:32:40 -04:00
jmillman cfbf825bf2 Merge remote-tracking branch 'upstream/develop' into with_image_analyzer_module
Conflicts:
	nbproject/project.properties
2014-08-25 11:01:36 -04:00
Brian Carrier ea4307367f Updated gitignore 2014-08-22 10:27:16 -04:00
Brian Carrier 94d49ada2a Added utf-8 encoding to test diff 2014-08-22 10:25:35 -04:00
Brian Carrier ab2ad235be Merge pull request #862 from millmanorama/call_log_locations
Merge remote-tracking branch 'upstream/develop' into call_log_locations
2014-08-21 09:51:00 -04:00
Brian Carrier 05dcd706e6 fixed doxyfile to reflect modules going away 2014-08-21 09:46:48 -04:00
Brian Carrier 97bfc60b30 Merge branch 'release-3.1.0' into develop 2014-08-21 09:38:15 -04:00
Brian Carrier fedab4a026 moved build type back to DEVELOPMENT 2014-08-21 09:37:39 -04:00