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
Brian Carrier
1629450e74
Added version into name of desktop icon
2014-08-21 09:33:33 -04:00
Brian Carrier
0b84e6f7ce
Updated version number
2014-08-20 14:17:35 -04:00
Brian Carrier
a6ea66adb3
removed code that copies error files bc it caused problems
2014-08-19 14:36:29 -04:00
jmillman
0d0a636f15
Merge remote-tracking branch 'upstream/develop' into call_log_locations
2014-08-19 14:31:48 -04:00
Brian Carrier
357d43f4e3
Forced regression scripts to use python 3
2014-08-19 13:54:33 -04:00
Brian Carrier
053ce78473
Merge branch 'release-3.1.0' into develop
2014-08-19 10:37:59 -07:00
Brian Carrier
5e4ed7d047
refactored search engine, used list to make it more deterministic
2014-08-19 10:37:12 -07:00
jmillman
a9e823d62b
update call log analyzer to include additional file(s) and table(s) in search;
...
updated call log analyzer to search files where name = 'logs.db' and additionally to try tables named 'logs'. Also refactored code to be more extensible and a little more sanely organized. Looking at other sibling 'analyzers' in the android module indicates they could all be refactored in similar ways, and probably a lot of duplicate code could be reduced if they were refactored as a whole to be more generic.
2014-08-19 13:02:16 -04:00
Brian Carrier
303c3315ec
Added basic usage message
2014-08-18 18:05:06 -04:00
Brian Carrier
148f4757fa
removed srcupdater file from test scripts
2014-08-18 17:33:33 -04:00
Brian Carrier
1f967c7281
Merge branch 'develop' of github.com:sleuthkit/autopsy into develop
2014-08-18 14:05:02 -04:00
Richard Cordovano
9b923fee00
Merge pull request #861 from millmanorama/with_image_analyzer_module
...
use hasData() instead of removed getRootObjectsCount()> 0
2014-08-18 09:54:19 -04:00
jmillman
36cf7ba569
use hasData() instead of removed getRootObjectsCount()> 0
2014-08-18 09:51:13 -04:00
