codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-24 03:26:49 +00:00
Code Issues Releases Wiki Activity
7,906 Commits 24 Branches 52 Tags
a04af7ba3523b95e6f552eb6a522a40d6aea99ae
Commit Graph
7906 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
esaunders a04af7ba35 Fix for ZeroDivisionError exception. 2015-04-07 10:16:41 -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
Richard Cordovano e5a694669a Merge remote-tracking branch 'upstream/develop' into collaborative 2015-04-02 13:15:01 -04:00
Richard Cordovano 9a5744319b Merge remote-tracking branch 'upstream/rc-211' into develop 2015-04-02 13:13:47 -04:00
Richard Cordovano bef5f8d978 Merge pull request #1164 from sidheshenator/time_diff_independent_regression_test 
timing test does not impact overall test
 2015-04-02 12:18:46 -04:00
sidheshenator 7a51f102b3 timing test does not impact overall test 2015-04-02 12:16:18 -04:00
Brian Carrier 2069e9b9e8 Fix for image gallery to prevent infinite loop 2015-04-02 12:10:38 -04:00
Richard Cordovano 824d5ac4bf Merge pull request #1162 from esaunders/upgrade_solr 
Solr upgrade
 2015-04-02 09:22:48 -04:00
Karl Mortensen 2ea37fce91 have enum follow same naming convention 2015-04-01 15:50:17 -04:00
Richard Cordovano 90d777fe78 Merge pull request #1161 from sidheshenator/interesting_items_fix_rc211 
added rule.UUID instead rule.hashCode() to the rules HashMap
 2015-04-01 14:51:05 -04:00
Karl Mortensen c1a17f0725 wordsmith text 2015-04-01 14:47:08 -04:00
sidheshenator 8e5e6af9be added rule.UUID instead rule.hashCode() to the rules HashMap 2015-04-01 14:41:44 -04:00
Karl Mortensen b2548935f3 Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into change_options_menu 2015-04-01 14:34:32 -04:00
Karl Mortensen 1805dcf01b Merge branch 'db_connection' of https://github.com/karlmortensen/autopsy into collab_ui 2015-04-01 14:03:24 -04:00
Karl Mortensen 2b376642de Change options panel names and icons a bit 2015-04-01 14:02:05 -04:00
esaunders 6fb891b9d0 Added tika-core-1.5.jar file. 2015-04-01 13:32:43 -04:00
Eamonn Saunders 0dfbd55ec6 Upgrade to Tika 1.5. 2015-04-01 12:41:40 -04:00