8123 Commits

Author SHA1 Message Date
Richard Cordovano
303bde7bd2 Merge pull request #1186 from sidheshenator/regression_logical_file_fix
content of the dir is considered as logical file set
2015-04-09 12:18:18 -04:00
sidheshenator
8f15885153 content of the dir is considered as logical file set 2015-04-09 12:16:50 -04:00
Brian Carrier
976e0ee692 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2015-04-09 12:15:33 -04:00
Brian Carrier
2f0f0e37fc removed uneeded index 2015-04-09 12:14:20 -04:00
Brian Carrier
72b5f96125 fixed query when new data source is added to get files from only the new data source 2015-04-09 12:13:17 -04:00
Richard Cordovano
1e6f4a4361 Merge pull request #1184 from sidheshenator/regression_logical_file_fix
appropriately escape the path properties set by ANT
2015-04-09 12:00:57 -04:00
sidheshenator
671ddf05db appropriately escape the path properties set by ANT 2015-04-09 11:58:43 -04:00
Eamonn Saunders
0bb37a029e - Added support for connecting to remote Solr server.
- Refactored local Solr server startup logic.
2015-04-09 11:58:26 -04:00
Richard Cordovano
c13f8fdffa Merge pull request #1182 from sleuthkit/revert-1152-logical_file_regression_test
Revert "Add logical files set to regression tests"
2015-04-08 13:41:54 -04:00
Richard Cordovano
907c7a265b Revert "Add logical files set to regression tests" 2015-04-08 13:41:20 -04:00
esaunders
8e6383feb1 Fix for ZeroDivisionError exception. 2015-04-07 12:47:39 -04:00
Richard Cordovano
c09705fbf9 Merge pull request #1181 from sidheshenator/replace_ATTRIBUTE_TYPE.TSK_ENCRYPTION_DETECTED
replaced deprecate ATTRIBUTE_TYPE.TSK_ENCRYPTION_DETECTED
2015-04-07 12:40:32 -04:00
Richard Cordovano
ab16088e6f Merge pull request #1180 from esaunders/collaborative
Fix for ZeroDivisionError exception.
2015-04-07 12:40:01 -04:00
sidheshenator
8b9f683ae6 replaced deprecate ATTRIBUTE_TYPE.TSK_ENCRYPTION_DETECTED 2015-04-07 10:30:07 -04:00
esaunders
a04af7ba35 Fix for ZeroDivisionError exception. 2015-04-07 10:16:41 -04:00
Richard Cordovano
48d95fc880 Merge pull request #1152 from sidheshenator/logical_file_regression_test
Add logical files set to regression tests
2015-04-07 09:30:58 -04:00
Richard Cordovano
0bb623292d Merge pull request #1175 from esaunders/collaborative
Yet more protection against UnicodeDecodeError.
2015-04-06 11:26:23 -04:00
esaunders
0bebe3e907 Yet more protection against UnicodeDecodeError. 2015-04-06 11:19:45 -04:00
Richard Cordovano
339defb5f0 Merge remote-tracking branch 'upstream/develop' into collaborative 2015-04-06 10:04:07 -04:00
Brian Carrier
1801692f8f Merge pull request #1174 from sleuthkit/check_for_nonfiles
Add check for non-files to ingest modules
2015-04-03 21:35:01 -04:00
Brian Carrier
4450707e63 Add check for non-files to ingest modules 2015-04-03 21:33:37 -04:00
Richard Cordovano
4539da0f93 Merge pull request #1173 from esaunders/collaborative
Fixed another spot that could encounter a UnicodeDecodeError exception.
2015-04-03 16:50:05 -04:00
esaunders
83408f8d0f Fixed another spot that could encounter a UnicodeDecodeError exception. 2015-04-03 16:47:51 -04:00
Richard Cordovano
ae1441ab1b Merge remote-tracking branch 'upstream/develop' into collaborative 2015-04-03 14:35:36 -04:00
Richard Cordovano
bb1592385e Merge pull request #1172 from sidheshenator/diff_file_renamed
diff file named appropriately
2015-04-03 14:31:37 -04:00
sidheshenator
3d1f5b9299 diff file named appropriately 2015-04-03 13:51:56 -04:00
Richard Cordovano
23368a50af Merge pull request #1171 from sidheshenator/unicodedecodeerror_handling
Unicodedecodeerror handled
2015-04-03 12:51:51 -04:00
sidheshenator
ef5964ca23 Unicodedecodeerror handled 2015-04-03 12:49:34 -04:00
Richard Cordovano
dd91ea187d Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into collaborative 2015-04-03 12:43:57 -04:00
Richard Cordovano
d3ac7cab2c Disable (temporarily) Messenger in Case class 2015-04-03 12:43:24 -04:00
Richard Cordovano
d251c805ad Merge pull request #1170 from karlmortensen/xsd
force CaseType and DatabaseName to occur together. Either we have 0 or 1...
2015-04-03 12:42:27 -04:00
Karl Mortensen
0947a9ccd1 force CaseType and DatabaseName to occur together. Either we have 0 or 1 sets of them, and a set MUST include both of them. 2015-04-03 11:45:34 -04:00
Richard Cordovano
28ed311fa7 Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into collaborative 2015-04-03 09:45:20 -04:00
Richard Cordovano
80ca71ca16 Merge remote-tracking branch 'upstream/develop' into collaborative 2015-04-03 09:44:17 -04:00
Richard Cordovano
610ae94eb5 Merge pull request #1160 from karlmortensen/change_options_menu
Collaborative UI
2015-04-03 09:40:43 -04:00
Brian Carrier
aab7710c0a Merge pull request #1169 from sleuthkit/move-tags-node
Move tags node
2015-04-02 23:57:41 -04:00
Brian Carrier
a7c188fdf2 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2015-04-02 23:43:50 -04:00
Karl Mortensen
0d0f5c9bf7 figured out what merged poorly 2015-04-02 17:20:01 -04:00
Karl Mortensen
570497c1b2 reremerge 2015-04-02 17:15:25 -04:00
Karl Mortensen
2ef66884c8 remerge 2015-04-02 17:10:56 -04:00
Richard Cordovano
e196f724fd Merge pull request #1168 from sidheshenator/doxygen_ref_python_examples
modDevPython.dox references appropriate files on github
2015-04-02 17:02:08 -04:00
sidheshenator
dd7a602553 modDevPython.dox references appropriate files on github 2015-04-02 16:35:48 -04:00
Karl Mortensen
4a5a5ffa46 automerge 2015-04-02 16:23:11 -04:00
Karl Mortensen
a365b39268 code review updates 2015-04-02 16:16:04 -04:00
Richard Cordovano
67522ccb11 Merge pull request #1165 from sidheshenator/build_xml_user_docs_dir_check
dir location checked before copying. No new dir created
2015-04-02 16:11:10 -04:00
Richard Cordovano
1a0ad0ef8c Merge pull request #1167 from rcordovano/gui_refresh
Remove unneeded file refs from project.properties for Core nbm
2015-04-02 15:53:37 -04:00
Richard Cordovano
399d1e91a1 Remove unneeded file refs from project.properties for Core nbm 2015-04-02 15:51:44 -04:00
Richard Cordovano
25fa976211 Merge pull request #1166 from rcordovano/messaging_prototype
Messaging prototype
2015-04-02 13:29:46 -04:00
Richard Cordovano
d2e954b28d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into messaging_prototype 2015-04-02 13:25:31 -04:00
sidheshenator
170fdc7a5f dir location checked before copying. No new dir created 2015-04-02 13:20:33 -04:00