Commit Graph
24378 Commits
Author SHA1 Message Date
William Schaefer a320e80c33 4167 rename title of search results to properties 2018-09-17 11:47:11 -04:00
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
U-BASIS\dgrove 6bd8b6fe48 Modified logic to take checkboxes into account. 2018-09-17 10:14:28 -04:00
millmanorama e1932d4357 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr 2018-09-17 16:02:44 +02:00
U-BASIS\dsmyda 4dff05f58a Small little name change 2018-09-17 09:29:02 -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 f5cf885463 Merge branch 'threading-review-bug-fixes' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/Case.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
2018-09-15 14:14:48 +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 fb77cb4db2 Merge pull request #4092 from millmanorama/SearchEngineURLQueryExtractor-NPE-fix
Search engine url query extractor npe fix
2018-09-14 16:15:10 -04:00
Richard Cordovano 6b21a93117 Merge pull request #4090 from millmanorama/improve-plaso-file-finding
Improve plaso file finding
2018-09-14 16:13:32 -04:00
U-BASIS\dgrove d74f496a09 Hiding columns when checkbox is selected. 2018-09-14 15:34:48 -04: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
Richard Cordovano 56f4683dbb Merge pull request #4069 from raman-bt/timeline-event-mgr
Fix a build error
2018-09-14 12:58:24 -04:00
U-BASIS\dgrove e11e421a69 Merge remote-tracking branch 'upstream/develop' into 4186_DisableIconColumns 2018-09-14 12:44:36 -04:00
U-BASIS\dgrove e6b034e46e Fixed merge conflict. 2018-09-14 11:55:34 -04:00
U-BASIS\dgrove 4d7e5e7f70 Merge remote-tracking branch 'upstream/develop' into 4195_RemoveColumnsFromResults 2018-09-14 11:54:13 -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
U-BASIS\dgrove c4bcbb92ec Removed unused imports. 2018-09-14 10:14:01 -04:00
U-BASIS\dgrove 0117d4ae1b Removed columns with performance impacts. 2018-09-14 10:12:05 -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
U-BASIS\dgrove 3d71afde77 Fixed positioning of controls on panel. 2018-09-13 22:17:29 -04:00
U-BASIS\dsmyda 0e8c25b3fa Changed fileAttributeType name to just attributeType 2018-09-13 16:17:53 -04:00
U-BASIS\dsmyda 9fb24ff6ff Removed instance creation in the loop and passed the attributes themselves directly 2018-09-13 16:16:29 -04:00
William Schaefer ee3fb179c7 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4163-AddCachesToCrResultsDev 2018-09-13 15:52:55 -04: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
U-BASIS\dsmyda c426b2c7ef Added one comment 2018-09-13 15:09:25 -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
U-BASIS\dsmyda a6c3607ea1 Reduced the number of calls to count unique data sources in intercase correlation to one, this will have merge conflicts with brians branch 2018-09-13 14:58:06 -04:00