codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-22 02:27:43 +00:00
Code Issues Releases Wiki Activity
14,859 Commits 24 Branches 52 Tags
a13c95e1b80da3ef3e2b8afaecc96ce814567ff6
Commit Graph
14859 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Cordovano a13c95e1b8 Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-07-12 17:59:57 -04:00
esaunders 677cc50ba0 Merge pull request #2941 from millmanorama/2075-single-query-for-mime-counts 
2075 single query for mime counts
 2017-07-12 11:19:57 -04:00
millmanorama cb8acc0cfb limit exception type and other cleanup 2017-07-12 16:44:09 +02:00
millmanorama 9508347501 remove outdated comment 2017-07-12 12:39:13 +02:00
millmanorama 2896656374 remove unused field 2017-07-12 12:36:31 +02:00
millmanorama 2afd45d861 use a single query to get all mime type counts. 2017-07-12 12:28:51 +02:00
millmanorama 214fe440c8 fix typo 2017-07-12 12:19:59 +02:00
Richard Cordovano 84fd54a72c Merge pull request #2937 from sleuthkit/release-4.4.1 
Merge release-4.4.1 branch into develop
 2017-07-11 12:42:01 -04:00
esaunders cfa254543c Merge pull request #2932 from dgrove727/2741_FixRegEx 
2741 fix reg ex
 2017-07-11 11:10:11 -04:00
esaunders c35b36ebd3 Merge pull request #2936 from millmanorama/2804-bg-updatedisplayName 
2804 bg updatedisplay name
 2017-07-10 12:53:51 -04:00
millmanorama f4ef33a0d4 use common base class that does bg lookup of counts and has threshold. 2017-07-10 15:22:19 +02:00
millmanorama 408ee20ae0 clean up the merge 2017-07-10 14:02:37 +02:00
millmanorama 08340e69fd calculate child counts background thread and add to displayname when done. 2017-07-10 13:59:51 +02:00
U-BASIS\dgrove 5c38efbfc4 Tweaked the regex to also remove the '$' at the end. 2017-07-07 15:01:20 -04:00
Richard Cordovano 4fcd129448 Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-07-06 11:53:30 -04:00
Richard Cordovano 3f42e770a8 Merge pull request #2923 from wschaeferB/2778-HTMLReportWrapTags 
2778 list of thumbnails and long thumbnails now wrap text in HTML Report
 2017-07-06 11:52:55 -04:00
Richard Cordovano 8efe356415 Merge pull request #2923 from wschaeferB/2778-HTMLReportWrapTags 
2778 list of thumbnails and long thumbnails now wrap text in HTML Report
 2017-07-06 11:50:48 -04:00
Richard Cordovano ac9dd07847 Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-07-06 11:11:31 -04:00
Richard Cordovano 05ce846777 Merge branch 'release-4.4.1' of github.com:sleuthkit/autopsy into release-4.4.1 2017-07-06 11:10:59 -04:00
Richard Cordovano c071a15571 Fix merge error in FileTypesByExtension 2017-07-06 11:10:38 -04:00
Richard Cordovano cc143d0bd6 Merge pull request #2925 from APriestman/crdoc 
Updated central repository documentation
 2017-07-06 09:49:12 -04:00
Richard Cordovano be52ba077a Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-07-06 09:44:54 -04:00
Richard Cordovano a05bc8acb1 Merge pull request #2921 from millmanorama/cleanup-file-types-tree-abit 
clean up file types tree a bit
 2017-07-06 09:44:19 -04:00
Richard Cordovano 6b8c4d06fd Merge pull request #2921 from millmanorama/cleanup-file-types-tree-abit 
clean up file types tree a bit
 2017-07-06 09:43:25 -04:00
Richard Cordovano 2b299999ca Merge branch 'develop' into cleanup-file-types-tree-abit 2017-07-06 09:43:09 -04:00
Richard Cordovano 5dfec7c894 Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-07-06 09:38:36 -04:00
Richard Cordovano cacd5b5c2b Merge pull request #2920 from millmanorama/2791-open-tree-off-EDT 
2791 open tree off edt
 2017-07-06 09:38:08 -04:00
Richard Cordovano 2feaa62032 Merge pull request #2920 from millmanorama/2791-open-tree-off-EDT 
2791 open tree off edt
 2017-07-06 09:36:49 -04:00
Richard Cordovano 9af4980096 Merge branch '2779-RemoveDuplicateReportThumbs' of https://github.com/wschaeferB/autopsy into wschaeferB-2779-RemoveDuplicateReportThumbs 2017-07-06 09:20:32 -04:00
Richard Cordovano e53fba739d Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-07-06 09:19:53 -04:00
Richard Cordovano 841d49c189 Merge pull request #2879 from millmanorama/2643-block-until-IG-is-shutdown 
2643 block until ig is shutdown
 2017-07-06 09:19:21 -04:00
Ann Priestman 5e35e2e7bc Updated central repository documentation 2017-07-06 09:18:59 -04:00
Richard Cordovano 873b7805b4 Merge pull request #2879 from millmanorama/2643-block-until-IG-is-shutdown 
2643 block until ig is shutdown
 2017-07-06 09:14:08 -04:00
millmanorama 2c1bfe2927 replace todos with jira references 2017-07-06 11:20:04 +02:00
millmanorama db3b970018 Merge remote-tracking branch 'upstream/release-4.4.1' into 2791-open-tree-off-EDT 2017-07-06 10:58:52 +02:00
Richard Cordovano 687c9da052 Resolve merge conflicts for KeywordHits tree class 2017-07-05 17:47:15 -04:00
Richard Cordovano c2d2ed5457 Merge pull request #2918 from narfindustries/schema_changes2 
Schema changes2
 2017-07-05 16:12:54 -04:00
Richard Cordovano bf250acc06 Merge branch 'develop' into schema_changes2 2017-07-05 16:12:47 -04:00
Richard Cordovano e64514aaaa Merge pull request #2917 from narfindustries/issue127 
Issue127
 2017-07-05 15:29:21 -04:00
Richard Cordovano 2a0c6a1c1c Merge branch 'develop' into issue127 2017-07-05 15:26:37 -04:00
Richard Cordovano 989292b600 Merge branch 'narfindustries-issue192_fixes' into release-4.4.1 2017-07-05 15:20:47 -04:00
Richard Cordovano 59790a9937 Merge pull request #2913 from narfindustries/issue188 
Issue188
 2017-07-05 15:18:46 -04:00
Richard Cordovano 066ef2a9ac Merge pull request #2912 from narfindustries/issue192 
Issue192
 2017-07-05 15:17:38 -04:00
Richard Cordovano f0c5709311 Merge branch 'issue192_fixes' of https://github.com/narfindustries/autopsy into narfindustries-issue192_fixes 2017-07-05 15:12:21 -04:00
Richard Cordovano 43f103b5ad Merge remote-tracking branch 'upstream/release-4.4.1' into develop 2017-07-05 11:57:10 -04:00
William Schaefer f2724e746c 2778 contents of thumbnail cells now allign with top of cell 2017-07-03 16:23:10 -04:00
William Schaefer ef0bb45774 2778 list of thumbnails and long thumbnails now wrap text in HTML Report 2017-07-03 14:53:22 -04:00
millmanorama abb8079b83 move duplicated node creation visitors into FileTypes.java; make methods static so we don't need to instantiate throw away object. 2017-07-03 16:18:56 +02:00
Nick Davis 0e7409ee4d updated code to handle null values in object init and read from db. updated code to validate correlation type db table name. 2017-06-30 13:56:05 -04:00
Maxwell Koo 7bf0799fec Change query API to use type/value instead of partially constructed artifacts 2017-06-30 13:48:12 -04:00