Commit Graph
24378 Commits
Author SHA1 Message Date
U-BASIS\dgrove af9657ade5 Minor tweak to size. 2018-11-27 16:12:14 -05:00
U-BASIS\dgrove e38d85c0e2 Cleanup; fixed default radio selection bug. 2018-11-27 15:49:45 -05:00
U-BASIS\dgrove 50049d7b7c Revised signature. 2018-11-27 11:43:18 -05:00
Ann Priestman 83aa813a16 Merge remote-tracking branch 'upstream/develop' into 4395_dsHashModule 2018-11-27 09:57:52 -05:00
Richard Cordovano 0ec13857a6 Merge pull request #4309 from millmanorama/merge-develop-into-timeline
Merge develop into timeline
2018-11-27 09:33:37 -05:00
millmanorama 8fcb42f231 fix merge 2018-11-27 11:16:58 +01:00
millmanorama d9ed59ef16 Merge remote-tracking branch 'upstream/develop' into merge-develop-into-timeline 2018-11-27 10:47:53 +01:00
U-BASIS\dgrove ab242a0ab1 Fixed sizing. 2018-11-27 02:46:08 -05:00
Brian Carrier bbc65f6afd Fixed JIRA-1144 about incorrect dialogs when opening single-user case with single data source during ingest 2018-11-26 17:45:16 -05:00
esaunders 0175664d1a Added max results label and removed deleted limit label. 2018-11-26 17:27:05 -05:00
William Schaefer 97c0de2835 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4402-FlagPastOccurences 2018-11-26 16:47:07 -05:00
William Schaefer 46bd72cd40 Merge branch '4381-MacAddressCorrelationAttr' of https://github.com/wschaeferB/autopsy into 4402-FlagPastOccurences 2018-11-26 16:46:47 -05:00
Richard Cordovano 044df7c1d7 Merge pull request #4298 from wschaeferB/4381-MacAddressCorrelationAttr
4381 + 4380 mac, imei, imsi, iccid correlation attrs
2018-11-26 16:39:09 -05:00
William Schaefer 6727c8a10b 4381 rename Artifact Type column to Result Type 2018-11-26 16:37:46 -05:00
William Schaefer 903084a5f3 4381 remove Artifact from the end of Artifact type column entries 2018-11-26 16:37:09 -05:00
William Schaefer 107a8b23e0 4381 capitalize MAC Address properly 2018-11-26 14:20:15 -05:00
William Schaefer e49e8e066a 4381 rename variable to match comment and for clarity 2018-11-26 14:09:24 -05:00
Richard Cordovano adc0095c98 Merge pull request #4306 from APriestman/doxygenFixes
Fixing doxygen warnings
2018-11-26 13:03:03 -05:00
Richard Cordovano f8c684ff71 Merge pull request #4297 from raman-bt/1133-cache-groupseen
1133: cache the group seen status.
2018-11-26 13:01:50 -05:00
Ann Priestman b934bc0099 Fixing doxygen warnings 2018-11-26 12:57:39 -05:00
U-BASIS\dgrove a051a0ba2b Reapplied trimming to correlation search. 2018-11-26 12:21:24 -05:00
esaunders 4326dc0bdc Merge branch 'develop' of github.com:sleuthkit/autopsy into 4430_limit_results 2018-11-26 12:19:26 -05:00
Richard Cordovano ef9814103d Merge pull request #4290 from esaunders/4151-remove-columns
4151 Removed columns from results table.
2018-11-26 12:05:48 -05:00
Richard Cordovano 220f19b383 Merge pull request #4278 from millmanorama/1117-FileTypeUtils
1117 file type utils
2018-11-26 11:48:21 -05:00
Jonathan Millman fbb29d4e8d fix type in method name 2018-11-26 16:17:25 +01:00
Richard Cordovano 29215a6844 Merge pull request #4299 from millmanorama/timeline-event-mgr
fix merge mistake
2018-11-26 10:01:04 -05:00
Richard Cordovano b3c72008f8 Merge pull request #4295 from millmanorama/1121-escape_TL_SQL_statements
1121 - escape TL SQL statements
2018-11-26 09:58:10 -05:00
millmanorama 6d78372a3b remove static initialization block. minor cleanup. 2018-11-26 15:46:09 +01:00
Raman 91dc573d08 1133: cache group seen status
- address review comments.
2018-11-21 18:29:24 -05:00
U-BASIS\dgrove 1b3b8ee094 Other correlation types supported. 2018-11-21 17:42:14 -05:00
William Schaefer cae6485ba4 4402 add comment to new method for adding interesting item 2018-11-21 16:57:54 -05:00
Eugene Livis 074b1bb658 Fixes based on feedback from CASE/USO verification tool 2018-11-21 16:54:57 -05:00
William Schaefer 1f21552a22 4402 remove comment attr from interesting item for previous devices 2018-11-21 16:49:15 -05:00
Richard Cordovano 47d8bc29b3 Merge pull request #4296 from millmanorama/merge-develop-into-timeline
Merge develop into timeline
2018-11-21 22:47:42 +01:00
millmanorama 6c7a0c09f8 slight refactoring 2018-11-21 22:35:42 +01:00
millmanorama a3aac87b1c update comments 2018-11-21 22:35:42 +01:00
millmanorama 3a64f638ce update to match tsk API 2018-11-21 22:35:41 +01:00
William Schaefer 832fde1c44 Merge branch '4381-MacAddressCorrelationAttr' of https://github.com/wschaeferB/autopsy into 4402-FlagPastOccurences 2018-11-21 16:31:19 -05:00
William Schaefer f784af2b6f 4381 remove no longer needed fallthrough ignore annotation 2018-11-21 16:27:11 -05:00
William Schaefer ef44bed17e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4381-MacAddressCorrelationAttr 2018-11-21 16:18:08 -05:00
Richard Cordovano d81fd4dd84 Merge pull request #4281 from dgrove727/4374_Md5Search
4374 md5 search
2018-11-21 16:13:18 -05:00
Richard Cordovano b420185dab Merge pull request #4283 from wschaeferB/4361-AddDataSourceIdColumn
4361 add data source id column
2018-11-21 16:08:30 -05:00
Eugene Livis 07f98df84e Merged latest develop 2018-11-21 16:02:27 -05:00
Raman 5e8dac43a9 1133: cache the group seen status. 2018-11-21 16:02:26 -05:00
Richard Cordovano 16c790b785 Merge pull request #4296 from millmanorama/merge-develop-into-timeline
Merge develop into timeline
2018-11-21 15:37:22 -05:00
William Schaefer eba5d9cebc 4381 change looping conditional in EamArtifactUtil to Switch/Case 2018-11-21 15:32:55 -05:00
millmanorama 0131d3b15d Merge remote-tracking branch 'upstream/develop' into merge-develop-into-timeline
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
2018-11-21 21:11:45 +01:00
millmanorama 91da6b408c Merge branch 'timeline-event-mgr' into merge-develop-into-timeline 2018-11-21 21:10:03 +01:00
William Schaefer 64cf085c14 Merge branch '4381-MacAddressCorrelationAttr' of https://github.com/wschaeferB/autopsy into 4402-FlagPastOccurences 2018-11-21 12:14:01 -05:00
William Schaefer edcb050a25 4381 uncomment correlation attr creation code for new tsk artifacts 2018-11-21 12:13:19 -05:00