codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-17 16:26:19 +00:00
Code Issues Releases Wiki Activity
20,007 Commits 24 Branches 52 Tags
a2a0970e48873f449d8b4fe9809ce802f7bc2df7
Commit Graph
20007 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
William Schaefer a2a0970e48 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4167-UpdateCommonAttributeGUI 2018-09-17 10:30:26 -04:00
William Schaefer 3357c7fc02 4167 adjust title of common property search to include percent 2018-09-17 10:30:14 -04:00
Richard Cordovano eb2193dd6f Merge pull request #4100 from millmanorama/1012-examiner_seen_UI_integration 
1012 examiner seen ui integration
 2018-09-17 09:06:41 -04:00
Richard Cordovano a2d56b357a Merge pull request #4086 from millmanorama/threading-review-bug-fixes 
IG datasource filtering including threading review and bug fixes
 2018-09-17 09:06:18 -04:00
millmanorama 0203db6596 codacy fixes 2018-09-17 14:50:08 +02:00
millmanorama 7f5420e305 fix codacy issues 2018-09-17 12:55:32 +02:00
millmanorama 2d4ae925de fix next unseen button state and text 2018-09-16 13:05:52 +02:00
millmanorama 17bef5c68f wire seen by other examiners check box 2018-09-16 12:24:24 +02:00
millmanorama b2823dace1 Merge branch 'threading-review-bug-fixes' into 1012-examiner_seen_UI_integration 
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
 2018-09-15 14:55:06 +02:00
millmanorama fad5cd5121 Merge remote-tracking branch 'upstream/develop' into threading-review-bug-fixes 2018-09-15 13:28:13 +02:00
millmanorama 942b6a6c6b Merge remote-tracking branch 'upstream/image-gallery-db-migration' into threading-review-bug-fixes 
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
 2018-09-15 13:27:33 +02:00
millmanorama df567df149 cleanup 2018-09-15 12:46:01 +02:00
Richard Cordovano 2f8e0de9ea Merge pull request #4091 from raman-bt/1012-group-seen-by-user 
1012: Allow user to view groups that are either new to them or new to…
 2018-09-14 15:34:04 -04:00
Raman 64306fe235 Merge branch 'image-gallery-db-migration' of https://github.com/sleuthkit/autopsy into 1012-group-seen-by-user 
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
 2018-09-14 14:24:58 -04:00
William Schaefer 02d888274b 4167 rename action text and messages as Common Property Search 2018-09-14 14:08:39 -04:00
William Schaefer e9052745e2 4167 fix typos and message text in Common Property Search 2018-09-14 14:01:27 -04:00
Richard Cordovano 06bbb425a1 Merge pull request #4084 from APriestman/4156_groupDataSourceFiltering 
4156 group data source filtering
 2018-09-14 13:46:30 -04:00
William Schaefer e2e6037c92 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4167-UpdateCommonAttributeGUI 2018-09-14 11:53:53 -04:00
Richard Cordovano d61e1c609f Merge pull request #4064 from raman-bt/1010-ig-by-datasource 
1010: Filter by datasource, for path based groups only.
 2018-09-14 11:49:12 -04:00
Raman 3d4bab09ad Removed 'seen' column from groups table. 2018-09-14 11:33:17 -04:00
Richard Cordovano 722e95cdcd Merge pull request #4099 from wschaeferB/FixExceptionIssueWith4114 
4114 fix build error with new exception thrown
 2018-09-14 11:20:20 -04:00
William Schaefer 6df55b82b3 remove unused import of Exceptions 2018-09-14 11:18:49 -04:00
William Schaefer 94765e190e 4114 fix build error with new exception thrown by getCountUniqueCaseDataSourceTuplesHavingTypeValue 2018-09-14 11:10:18 -04:00
millmanorama 037181192f Merge branch '1012-group-seen-by-user' into 1012-examiner_seen_UI_integration 
# Conflicts:
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
#	ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
 2018-09-14 13:18:13 +02:00
millmanorama 78575254ee don't reset controller if it is not changing. (and thus don't cancel db update). 2018-09-14 12:37:09 +02:00
Richard Cordovano 5302935346 Merge pull request #4085 from wschaeferB/4113-AddCountColumn 
4113 add count column
 2018-09-13 15:41:11 -04:00
Richard Cordovano a19fb0a8e2 Merge pull request #4078 from wschaeferB/4112-AddCrStatusColumn 
4112 add cr status column
 2018-09-13 15:40:46 -04:00
Richard Cordovano 035a3a5d81 Merge pull request #4065 from wschaeferB/4114-AddHasCommentColumn 
4114 add has comment column
 2018-09-13 15:39:24 -04:00
William Schaefer 8344fc3b33 Merge branch '4112-AddCrStatusColumn' of https://github.com/wschaeferB/autopsy into 4113-AddCountColumn 2018-09-13 15:01:33 -04:00
William Schaefer 8a8903ce4b Merge branch '4114-AddHasCommentColumn' of https://github.com/wschaeferB/autopsy into 4112-AddCrStatusColumn 2018-09-13 15:00:53 -04:00
William Schaefer 5f1ff9573a 4114 resolve merge conflicts with develop 2018-09-13 14:55:03 -04:00
Richard Cordovano 835c1b4da8 Merge pull request #4095 from wschaeferB/4121_correlation_types 
4121 correlation types
 2018-09-13 14:39:59 -04:00
Richard Cordovano 4b85b74a04 Merge pull request #4094 from wschaeferB/FixNewExceptionError 
Fix error resulting from merge issue of exception being added to method
 2018-09-13 14:39:17 -04:00
William Schaefer 450ef528d2 Merge branch '4121_correlation_types' of https://github.com/wschaeferB/autopsy into 4167-UpdateCommonAttributeGUI 2018-09-13 14:25:36 -04:00
William Schaefer e05c697473 4121 add common file attrs test image links to google drive 2018-09-13 14:15:26 -04:00
William Schaefer d819a966ff 4121 update note in CommonAttributeSearchInterCaseTests to include jira number 4166 2018-09-13 13:57:30 -04:00
William Schaefer 6042b1ec34 Merge branch 'FixNewExceptionError' of https://github.com/wschaeferB/autopsy into 4121_correlation_types 2018-09-13 13:32:46 -04:00
William Schaefer 77c39994a7 Catch exception seperately 2018-09-13 13:25:57 -04:00
William Schaefer 17ea6ee74b Merge branch 'FixNewExceptionError' of https://github.com/wschaeferB/autopsy into 4121_correlation_types 2018-09-13 12:52:37 -04:00
William Schaefer 0c36fc6281 Fix error resulting from merge issue of exception being added to method 2018-09-13 12:43:49 -04:00
William Schaefer ca8ace09a4 4121 resolve merge conflicts between 4121 and develop 2018-09-13 12:27:52 -04:00
William Schaefer ad3a196d12 4167 clean up and add comments to CommonAttributePanel 2018-09-13 12:17:56 -04:00
William Schaefer 6a20eef257 4167 clean up IntraCasePanel and InterCasePanel classes and add comments 2018-09-13 11:26:18 -04:00
Richard Cordovano 759a3a5447 Merge pull request #4089 from eugene7646/hashsets_AppData_4177 
Hashsets in windows user directory (4177)
 2018-09-13 11:07:20 -04:00
Richard Cordovano 3077079fce Merge pull request #4077 from wschaeferB/4165-FixInterestingFileReportColumns 
4165 fix interesting file report columns
 2018-09-13 11:05:58 -04:00
Richard Cordovano 7f33c39ade Merge pull request #4072 from dgrove727/4153_AnnotationsContentViewer 
4153 annotations content viewer
 2018-09-13 11:03:03 -04:00
Richard Cordovano 94a079c2b5 Merge pull request #4041 from briangsweeney/3868-normalize-cr 
3868 normalize cr
 2018-09-13 11:02:09 -04:00
millmanorama ec9ab46aca fix initialization of listeningEnabled and stale properties. 2018-09-13 13:30:58 +02:00
William Schaefer 91d08d5565 4167 replace GUI common attribute search gui 2018-09-12 15:55:57 -04:00
Raman 722af489aa 1012: Allow user to view groups that are either new to them or new to everyone 
- Added image_gallery_groups_seen table to track which groups have been seen by which examiner.
 2018-09-12 13:34:02 -04:00