codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-22 18:47:44 +00:00
Code Issues Releases Wiki Activity
4,564 Commits 24 Branches 52 Tags
6284bc6aa195d45170ff5fd1d7abc85d7e40860e
Commit Graph
4564 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Cordovano 6284bc6aa1 Merge pull request #457 from alexjacks92/master 
Added reset command before checkout.
 2014-01-27 13:18:11 -08:00
alexjacks92 883636510d Added reset command before checkout. 2014-01-27 16:11:05 -05:00
Richard Cordovano b156cfea40 Merge pull request #455 from alexjacks92/master 
Python Scripts
 2014-01-27 12:15:37 -08:00
Richard Cordovano d0ff0151a0 Fixed: adding python changes to master. 2014-01-27 14:20:06 -05:00
alexjacks92 e8d265102c Revert "Adding python changes to master branch." 
This reverts commit 372d29e736.
 2014-01-27 14:13:42 -05:00
Richard Cordovano 372d29e736 Adding python changes to master branch. 2014-01-27 14:12:34 -05:00
Brian Carrier 2050dfd9d2 Merge branch 'master' of github.com:sleuthkit/autopsy 2014-01-19 21:43:11 -05:00
Richard Cordovano 8ad8d8ccbb Merge pull request #432 from alexjacks92/master 
Fixed line endings.
 2014-01-17 08:22:29 -08:00
alexjacks92 e37fd10d81 Fixed line endings. 2014-01-17 11:20:17 -05:00
Richard Cordovano bfb10f3692 Merge pull request #424 from alexjacks92/master 
Jenkins: adding develop branch testing
 2014-01-14 13:48:26 -08:00
alexjacks92 dce2811acb Wrong commit last time. Fixing that. 2014-01-14 16:39:56 -05:00
alexjacks92 1a1d4daed1 Added ability to choose either master or develop branch for Jenkins testing. 2014-01-14 16:31:16 -05:00
Richard Cordovano 99e50efd62 Update line endings 2014-01-08 12:27:43 -05:00
Brian Carrier 835fbf1124 line endings 2013-12-28 15:08:59 -05:00
Richard Cordovano 43b5dfbb78 Merge pull request #406 from jawallace/testing 
give solr time to die after each test.
 2013-12-20 13:23:32 -08:00
Jeff Wallace 1a8cf1817c give solr time to die after each test. 2013-12-20 13:00:11 -05:00
Richard Cordovano 261fb48f27 Merge pull request #331 from jawallace/testing 
Testing
 2013-12-19 09:01:07 -08:00
Richard Cordovano 5b8d35422a Merge pull request #388 from jawallace/keyword_search 
Keyword search performance improvements
 2013-12-18 07:34:56 -08:00
Jeff Wallace dfd6a966da Fixed timeout exception. 2013-12-18 10:13:28 -05:00
Jeff Wallace 6bd183995b Changed default setting for showing keyword search snippets to true. 2013-12-13 10:19:24 -05:00
Jeff Wallace 947e4372b7 Fixed change that was missed during merge 2013-12-12 15:14:27 -05:00
Jeff Wallace 5b7f705682 Merge branch 'master' of https://github.com/sleuthkit/autopsy into testing 
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/docs/keywordsearch-about.html
	test/script/regression.py
	test/script/srcupdater.py
 2013-12-12 14:40:51 -05:00
Richard Cordovano 58f428085e Merge pull request #366 from jawallace/sqliteJarUpdate 
Sqlite jar update
 2013-12-12 10:59:59 -08:00
Richard Cordovano 8b5ddb11bd Merge pull request #395 from jawallace/content_viewer_window_focus 
Bring the floating content viewer to the front when the 'View in new window' action is called.
 2013-12-12 10:59:46 -08:00
Richard Cordovano 4e2c794115 Merge pull request #381 from jawallace/proxy_options 
Show proxy options
 2013-12-12 10:57:49 -08:00
Richard Cordovano 4503280fbc Merge pull request #374 from jawallace/compiler_warnings 
Compiler warnings
 2013-12-12 10:55:05 -08:00
Jeff Wallace d31ed4a82d line endings. 2013-12-11 15:57:19 -05:00
Jeff Wallace ab7dc6ebd2 Updated html file size limit for jericho parser to 50mb 2013-12-11 15:49:11 -05:00
Jeff Wallace 2adae5b08b Bring the floating content viewer to the front when the 'View in new window' action is called. 2013-12-11 15:42:48 -05:00
Jeff Wallace c6dcc8daa5 Bypass jericho on files larger than 10 mb 2013-12-11 12:46:57 -05:00
Richard Cordovano a64a6d26f4 Merge pull request #393 from jawallace/deleted_file_limit 
Updated limit of deleted files to 10000
 2013-12-11 07:54:42 -08:00
Jeff Wallace f1bc3098fe Bypass tika for true type font files to avoid out of memory error. Added notes text file. 2013-12-11 10:22:39 -05:00
Jeff Wallace fd8828fb7a Updated limit of deleted files to 10000 2013-12-10 16:45:14 -05:00
Jeff Wallace bc4705cbd4 Fixed regression test that was broken by the change of a label on a checkbox. 2013-12-10 15:33:15 -05:00
Richard Cordovano f807eedb02 Merge pull request #391 from rcordovano/lazy_nodes_fix 
Fix DataResultViewerTable lazy node creation bugs
 2013-12-10 06:12:36 -08:00
Richard Cordovano 6fd4eb8b68 Fix DataResultViewerTable lazy node creation bugs 2013-12-10 09:08:34 -05:00
Richard Cordovano bf407436a6 Merge remote-tracking branch 'upstream/master' 2013-12-10 09:07:32 -05:00
Brian Carrier 40e55a4f64 Merge pull request #387 from jawallace/hex_viewer 
Fix string out of bounds exception on non-windows.
 2013-12-09 10:27:08 -08:00
Jeff Wallace eb908737ee minor cleanup 2013-12-06 16:14:44 -05:00
Jeff Wallace 0b29c3eee5 cleanup of createKeys 2013-12-06 16:10:02 -05:00
Jeff Wallace d9ca04e476 Don't get a character that's out of range. 2013-12-06 16:01:03 -05:00
Jeff Wallace c88ea02a07 Added option to show keyword snippets or not. 2013-12-06 15:45:36 -05:00
Jeff Wallace 67d2f81252 more performQuery cleanup 2013-12-06 15:28:01 -05:00
Jeff Wallace 23ec64c459 Cleaned up performQuery 2013-12-06 15:19:22 -05:00
Jeff Wallace ec24c347bc Only perform one query to solr for hits and snippets 2013-12-06 14:47:53 -05:00
Jeff Wallace ef61965acf Fixed string out of bounds exception in hex viewer on os x. 2013-12-05 13:16:05 -05:00
Richard Cordovano b42091541b Merge remote-tracking branch 'upstream/master' 2013-12-05 10:33:53 -05:00
Brian Carrier 1f932aca22 Merge pull request #383 from jawallace/report_hang 
Fixed report hang
 2013-12-04 14:29:42 -08:00
Richard Cordovano dd9cae8c5b Merge remote-tracking branch 'upstream/master' 2013-12-04 15:37:27 -05:00
Jeff Wallace a6858d969e minor cleanup 2013-12-04 13:46:20 -05:00