Commit Graph
18776 Commits
Author SHA1 Message Date
Brian Carrier 6a2e4b856a Merge pull request #1104 from sidheshenator/keywords_list_inappropriate_delete
Keywords list inappropriate delete
2015-03-13 23:12:32 -04:00
Brian Carrier 9b4bae2680 Merge pull request #1103 from APriestman/develop
Convert MD5 hash to lowercase before database query.
2015-03-13 23:11:57 -04:00
sidheshenator 204bb1e47c retrive keywordslist name from the tableModel 2015-03-13 11:38:20 -04:00
Brian Carrier 8d50c8015c Changed for loop 2015-03-13 09:56:20 -04:00
Brian Carrier 215182ade7 Fixed comments, make deleteFileDir use functionality of deleteDir 2015-03-13 09:55:08 -04:00
Brian Carrier 2c7fb17a19 Merge pull request #1096 from sidheshenator/FileUtil_Sanity_Check
sanity check added to FileUtil.deleteDir()
2015-03-13 09:28:12 -04:00
Sidhesh Mhatre 4715c17852 NON-NLS added 2015-03-13 09:27:54 -04:00
APriestman ee77b930cf Convert MD5 hash to lowercase before database query. 2015-03-13 09:21:52 -04:00
Brian Carrier d1ed1c526a Merge pull request #1098 from sidheshenator/duplicate_tagging_isue
Duplicate tagging isue
2015-03-13 09:09:32 -04:00
Brian Carrier b5ebf29cc5 Merge pull request #1102 from APriestman/imageAnalyzer
Image Analyzer speed improvements
2015-03-13 09:03:51 -04:00
sidheshenator 30c3634604 JOptionPanel.showMessageDialog used for consistency 2015-03-12 17:32:07 -04:00
Brian Carrier 8cc9cb258b Merge pull request #1101 from sidheshenator/move_html_report_option_to_top
HTMLReport module swapped to the first place in the list
2015-03-12 15:58:37 -04:00
APriestman f0ca1cf013 Reverted project.properties 2015-03-12 14:03:36 -04:00
APriestman 97b85746a4 Disabled ImageAnalyzer again 2015-03-12 13:59:37 -04:00
APriestman c5c54388d5 Reformatting 2015-03-12 13:56:16 -04:00
APriestman bf8955ee7f Restored new versions of GroupManager.java and SummaryTablePane.java 2015-03-12 13:27:51 -04:00
Karl Mortensen e103989b82 Clarify what needs to be restarted 2015-03-12 13:02:40 -04:00
sidheshenator b845b84c0a HTMLReport module swapped to the first place in the list 2015-03-12 12:28:18 -04:00
APriestman 87473709c1 Merge remote-tracking branch 'upstream/develop' into imageAnalyzer 2015-03-12 11:02:11 -04:00
sidheshenator cb40a3c6a0 Reference to TagsManager saved and reused 2015-03-12 10:46:41 -04:00
sidheshenator 833334d9dc used getContentTagsByContent() instead of getAllContentTags() 2015-03-12 09:45:22 -04:00
APriestman ac7f1ca387 Cleanup 2015-03-12 09:05:46 -04:00
sidheshenator 0806fc2e08 column name checked before executing the query 2015-03-11 14:55:44 -04:00
sidheshenator b257c8ca1d Merge branch 'collaborative' of https://github.com/sleuthkit/autopsy into android_sql_query_validate 2015-03-11 14:06:48 -04:00
sidheshenator 182b00d9e9 User notified in case of duplicate tagging attempt 2015-03-11 12:53:49 -04:00
sidheshenator 9c9a197067 check duplicate tag-file pair before adding to the DB 2015-03-11 12:32:22 -04:00
sidheshenator 256ce5bea2 Offest due to default keywordlists considered. User prompted before deletion 2015-03-10 17:01:16 -04:00
sidheshenator d030494c21 sanity check added to FileUtil.deleteDir() 2015-03-10 15:28:11 -04:00
sidheshenator a89eaf31dc Logs appropriate method in case of exception. Lck files deleted. 2015-03-10 14:22:04 -04:00
Richard Cordovano 534f027e92 Merge pull request #1094 from rcordovano/ingest_task_scheduler_efficiency_improvement
Convert IngestTaskScheduler.tasksInProgress from ArrayList to HashSet
2015-03-09 16:50:31 -04:00
Richard Cordovano e6b325ea4e Convert IngestTaskScheduler.tasksInProgress from ArrayList to HashSet 2015-03-09 16:36:21 -04:00
Eamonn Saunders aa7e4daac1 Updated versions of packages on which Solr depends. 2015-03-09 14:11:52 -04:00
Eamonn Saunders 554089200e Set default jetty.host = localhost. 2015-03-09 14:10:17 -04:00
Eamonn Saunders c4a973d736 Updated Solr version to 4.9.1 2015-03-09 14:06:32 -04:00
Eamonn Saunders a6769d69d5 Added keyword search specific Ivy settings file so that we can get the restlet package. 2015-03-09 14:05:45 -04:00
Eamonn Saunders e99938101f Added clean-all task that clears Ivy cache in addition to running clean. 2015-03-09 14:04:01 -04:00
sidheshenator d4cc1384c0 Importing appropriate classes from the Py Script 2015-03-09 11:14:17 -04:00
Richard Cordovano 6667841b09 Add bypass of file tasks stats to ingest snapshotting 2015-03-09 00:51:10 -04:00
Richard Cordovano 2cbd911c68 Merge pull request #1093 from rcordovano/ingest_task_scheduler_fix
Fix IngestTaskScheduler task cancellation
2015-03-07 21:19:49 -05:00
Richard Cordovano 60bafc0c6d Fix IngestTaskScheduler task cancellation 2015-03-07 21:16:58 -05:00
Richard Cordovano 22b55802f8 Merge pull request #1091 from rcordovano/ingest_manager_cancel_jobs_logging
Add logging of individual job cancellations to IngestManager
2015-03-06 14:30:03 -05:00
Richard Cordovano 8987ca77d1 Add logging of individual job cancellations to IngestManager.cnacelAllIngestJobs() 2015-03-06 14:14:13 -05:00
sidheshenator dd6d665ce6 removes the intance number from the jython settings file name 2015-03-06 14:10:59 -05:00
Richard Cordovano 9fadfa6e20 Merge pull request #1089 from rcordovano/ingest-analysis-error-logging
Ingest logging improvements, minor bug fix
2015-03-06 00:18:12 -05:00
Richard Cordovano 5d56cf1757 Ingest logging improvements, minor bug fix 2015-03-06 00:15:56 -05:00
sidheshenator 730f9670b7 Deletion of NON-NLS markings reverted 2015-03-05 11:02:04 -05:00
sidheshenator 44641e45bd IngestJobSettings handles NullPointerException 2015-03-05 10:55:35 -05:00
Brian Carrier 7697fd8198 Merge branch 'release-3.1.2' into develop 2015-03-04 23:23:41 -05:00
Brian Carrier f2dc553849 Made dev, not release 2015-03-04 23:22:43 -05:00
Brian Carrier f16e48603e Updated NBM module version numbers autopsy-3.1.2 2015-03-04 22:40:01 -05:00