mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-16 01:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,208 Commits 1 Branch 0 Tags
Commit Graph

13208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
William Schaefer
37e3656bb6 2197 integrated fix for null pointer exception from 2199 2017-02-14 11:21:32 -05:00
Richard Cordovano
ccb60ec6df Merge pull request #2501 from zhhl/2102-refactorRegresssionTest 
2102: refactor the regression tests
 2017-02-14 11:20:05 -05:00
William Schaefer
b905f007d3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2199-ProfilesInAddDataWizard 2017-02-13 15:34:31 -05:00
Richard Cordovano
2c5462b730 Merge remote-tracking branch 'upstream/develop-4.3.1' into develop 2017-02-11 14:12:56 -05:00
Richard Cordovano
043e0fb288 Disable CustomArtifactsCreatorIngestModuleFactory 2017-02-11 13:48:34 -05:00
Richard Cordovano
bd729b3ea7 Reset of build.type in project properties 2017-02-11 11:16:30 -05:00
Dmitry Charit
74fea7bcce corrected the update 2017-02-09 18:43:05 +00:00
Richard Cordovano
8377953e62 Turn off CustomArtifactsCreatorIngestModuleFactory 2017-02-09 10:03:21 -05:00
Richard Cordovano
fa9cfbc40b Update comment in ArtifactStringContent.java 2017-02-09 06:36:46 -05:00
Richard Cordovano
d18ef89bf1 Merge remote-tracking branch 'upstream/develop-4.3.1' into develop 2017-02-08 19:57:21 -05:00
Richard Cordovano
34c549615b Merge pull request #2517 from rcordovano/attrs_with_multiple_sources 
Attrs with multiple sources
 2017-02-08 19:50:50 -05:00
Richard Cordovano
7a467d0e91 Improvements to attributes with multiple sources code 2017-02-08 19:48:46 -05:00
Richard Cordovano
3ed67b1df8 Add attribute sources to ArtifactStringContent 2017-02-08 19:06:35 -05:00
Richard Cordovano
332110c003 Merge pull request #2516 from rcordovano/attrs_with_multiple_sources 
Change custom artifact names for test ingest module
 2017-02-08 18:12:23 -05:00
Richard Cordovano
2ca451b46e Change custom artifact names for test ingest module 2017-02-08 18:10:53 -05:00
Richard Cordovano
bc5cd4b31e Merge pull request #2515 from rcordovano/attrs_with_multiple_sources 
Attrs with multiple sources
 2017-02-08 18:03:56 -05:00
Richard Cordovano
f22a453377 Clean and fix ArtifactStringContent 2017-02-08 17:59:18 -05:00
Richard Cordovano
4234d2c82d Merge pull request #2510 from millmanorama/2249-scroll-thumb 
remove bottom gap and make scroll pane vertically resizable.
 2017-02-08 12:12:55 -05:00
William Schaefer
ce1771f685 Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard 2017-02-08 10:59:07 -05:00
William Schaefer
bfa75149da 2198 default run ingest modules context renamed for backwards compatability 2017-02-08 10:58:13 -05:00
millmanorama
ed46fd5498 remove bottom gap and make scroll pane vertically resizable. 2017-02-08 13:11:17 +01:00
William Schaefer
49ef665ec2 Merge branch '2198-RunIngestModulesWizard' of https://github.com/wschaeferB/autopsy into 2199-ProfilesInAddDataWizard 2017-02-07 18:45:59 -05:00
William Schaefer
8bde21f108 2198 fixed issue with Ingest Settings Panel when ok was chosen with nothing to save 2017-02-07 18:44:09 -05:00
William Schaefer
89088e2db4 2198 merged in bug fixes from 2197, resolved conflicts 2017-02-07 17:58:28 -05:00
William Schaefer
9f8f63f885 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2197-ProfileOptionsPanel 2017-02-07 17:55:14 -05:00
William Schaefer
4701057c57 2197-Fixed bug with making a profile with same name as one just deleted 2017-02-07 17:53:30 -05:00
William Schaefer
5c2706cd17 2197 - profile no longer has issues when there is a trailing space in name 2017-02-07 17:39:28 -05:00
William Schaefer
c636d06d69 2197 Can no longer delete filters before the profiles that use them 2017-02-07 17:02:58 -05:00
U-BASIS\zhaohui
7058760797 2102: add/update license header of source file 2017-02-07 16:37:26 -05:00