Commit Graph
13237 Commits
Author SHA1 Message Date
Richard Cordovano e7eb1019a4 Update copyright AddBlackboardArtifactTagAction 2017-02-28 13:40:42 -05:00
Richard Cordovano b05391e74a Merge pull request #2543 from dgrove727/DgCopyrightUpdate
Update copyright for Services.java
2017-02-27 18:00:01 -05:00
U-BASIS\dgrove 15b5f22766 Update copyright for Services.java 2017-02-27 17:54:21 -05:00
Richard Cordovano 157a4379be Merge pull request #2530 from wschaeferB/2312-AutoIngestOptionsSize
2312 Auto Ingest Options now has scroll bar
2017-02-27 14:29:04 -05:00
Richard Cordovano ae89cc2a7f Merge upstream/develop, resolve conflicts 2017-02-27 14:10:36 -05:00
Richard Cordovano ddb16f4fa2 Remove unused OptionsCategory_Name_General bundle from Exp NBM 2017-02-27 13:55:02 -05:00
Richard Cordovano 08a6c615d2 Merge pull request #2531 from wschaeferB/2315-RenameAutopsyOptions
2315 Autopsy Options panel renamed to View Options Panel
2017-02-27 13:52:49 -05:00
Richard Cordovano 6c47dca2e1 Merge pull request #2527 from wschaeferB/2309-ProfileDetailReadability
2309 - Modified Profile Settings Panel to be more readable
2017-02-27 13:42:26 -05:00
William Schaefer 6acb5db6c2 2315 Autopsy Options panel renamed to View Options Panel 2017-02-21 15:21:39 -05:00
William Schaefer 45183026d1 2312 Auto Ingest Options now has scroll bar 2017-02-21 15:09:29 -05:00
William Schaefer bcd7b39b91 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2309-ProfileDetailReadability 2017-02-21 13:39:57 -05:00
Richard Cordovano bf513ccae5 Merge pull request #2526 from wschaeferB/2306-FileTypesTreeFix
2306 File Types Tree will no longer blow up and disappear with non …
2017-02-21 10:03:31 -05:00
William Schaefer 8d355382ec 2309 - Modified Profile Settings Panel to be more readable 2017-02-17 17:26:43 -05:00
Richard Cordovano 3a6738324c Fix Run Ingest Module wizard bugs 2017-02-17 16:09:05 -05:00
William Schaefer d98d80f031 2306 File Types Tree will no longer blow up and disappear with non standard mimeTypes 2017-02-17 15:32:24 -05:00
Richard Cordovano 50be46cdee Merge pull request #2509 from wschaeferB/2199-ProfilesInAddDataWizard
2199 profiles in add data wizard
2017-02-16 13:01:50 -05:00
Richard Cordovano 53d687a740 Fix logging error message for PhotoRecCarver 2017-02-15 17:47:29 -05:00
William Schaefer cd5a435ed6 Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard 2017-02-15 16:39:52 -05:00
William Schaefer 7b634fbad9 2198- made Ingest Options panel save and load filters in a more logical manner 2017-02-15 16:38:00 -05:00
Richard Cordovano 996031e340 Merge pull request #2508 from wschaeferB/2198-RunIngestModulesWizard
2198 run ingest modules wizard
2017-02-15 16:16:14 -05:00
Richard Cordovano 0d3ccc3110 Merge pull request #2507 from wschaeferB/2197-ProfileOptionsPanel
2197 profile options panel
2017-02-15 15:05:29 -05:00
William Schaefer fe9bb7741f 2199 merged in multi-line description change from 2198, resolved conflict 2017-02-15 15:00:53 -05:00
William Schaefer 8909d4e1a1 2198 multi line descriptions enabled for radio button scroll window 2017-02-15 14:51:42 -05:00
William Schaefer 773cf26198 2199 Formatting, copyright, and netbeans tips resolution 2017-02-15 12:18:35 -05:00
William Schaefer 6c3d280424 2199 fixed bug with highlighting of proper step in AddImageWizard 2017-02-15 11:19:10 -05:00
William Schaefer e2f2435b76 2199 resolve conflicts from 2198 merge 2017-02-14 19:38:01 -05:00
William Schaefer efef1b8077 2198 changed overridable methods to be used outside of constructor 2017-02-14 19:33:18 -05:00
William Schaefer 9702a52007 Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModulesWizard 2017-02-14 19:11:03 -05:00
William Schaefer b9b02e1bed 2197 fixed encapsulation issue regarding enabled modules list 2017-02-14 19:08:43 -05:00
William Schaefer cd82f49d45 2199 resolve conflicts from merge and fix formatting on modified files 2017-02-14 17:12:15 -05:00
William Schaefer cd606317eb Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard 2017-02-14 17:08:31 -05:00
William Schaefer 2e28f72d85 2198 removed netbeans warning regarding method which could be overridden 2017-02-14 17:07:37 -05:00
William Schaefer e91b638795 Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard 2017-02-14 16:50:01 -05:00
William Schaefer 2ceffc5788 Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModulesWizard 2017-02-14 16:49:09 -05:00
William Schaefer 181cca420e 2197 formating of ingestProfiles 2017-02-14 16:45:53 -05:00
William Schaefer 8cb855e39e 2197 fixed unchecked conversion in getIngestProfiles 2017-02-14 16:44:54 -05:00
William Schaefer 4163db9db8 2199 merge and resolve conflicts from 2198 2017-02-14 16:29:29 -05:00
William Schaefer c4c7cbb9f8 2198 formatting fixes to all modified files 2017-02-14 16:25:10 -05:00
William Schaefer 8e78f17f93 Merge branch '2197-ProfileOptionsPanel' of https://github.com/wschaeferB/autopsy into 2198-RunIngestModulesWizard 2017-02-14 16:08:05 -05:00
William Schaefer 064df7fedf 2197 removing Options from the options panel name 2017-02-14 16:07:27 -05:00
William Schaefer 8b4b2b2fb5 2198 resolve some additional conflicts from IngestProfiles rename 2017-02-14 15:56:21 -05:00
William Schaefer 640e08b8af 2198 - merged changes from 2197 and resolved conflicts 2017-02-14 15:44:07 -05:00
William Schaefer 47b2f11a75 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2197-ProfileOptionsPanel 2017-02-14 15:37:28 -05:00
William Schaefer 043db65453 2197 fixed doc version number accidently reverted 2017-02-14 15:37:19 -05:00
William Schaefer 3eda78669b 2197 IngestProfiles getter now static and synchronized 2017-02-14 15:27:51 -05:00
Richard Cordovano 0c77364c0a Merge pull request #2520 from dcharit/docs
corrected the update
2017-02-14 13:53:02 -05:00
William Schaefer b42b4c128c 2197 fixed formatting in all files which were modified 2017-02-14 13:47:44 -05:00
Dmitry Charit aa2be4b681 corrected 2017-02-14 18:25:40 +00:00
William Schaefer 4cefd75345 2197 removed copy past code from IngestProfiles 2017-02-14 12:28:09 -05:00
William Schaefer 515b84f5bc 2197 enable edit and delete profile buttons with listener 2017-02-14 11:31:56 -05:00