 William Schaefer
|
d4124b7ab0
|
4381 resolve merge conflicts from 4361
|
2018-11-16 13:16:14 -05:00 |
|
|
William Schaefer
|
926abf24b1
|
4361 resolve merge conflicts from 4354
|
2018-11-16 12:37:28 -05:00 |
|
|
William Schaefer
|
7eafe00d1a
|
4354 remove redundant create index statement for file_obj_id on wifi attrs
|
2018-11-16 12:32:20 -05:00 |
|
|
William Schaefer
|
bd1e32a591
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4354-AddObjectIdToCR
|
2018-11-16 12:06:33 -05:00 |
|
|
William Schaefer
|
315782e574
|
4354 rename cr object_id column to file_obj_id
|
2018-11-16 11:47:18 -05:00 |
|
|
William Schaefer
|
1a894a1ca4
|
4381 add conditions for when a correlation attr has MAC_TYPE_ID
|
2018-11-15 18:29:18 -05:00 |
|
|
William Schaefer
|
fa6fc1cdc4
|
4381 add mac address correlation property to CR
|
2018-11-15 18:19:45 -05:00 |
|
|
William Schaefer
|
bace99fd71
|
4361 replace cryptic comment with more descriptive one regarding large query
|
2018-11-15 18:08:28 -05:00 |
|
|
William Schaefer
|
276d15e01c
|
4361 add indexes for datasource_obj_id to creation and upgrade code
|
2018-11-15 18:05:09 -05:00 |
|
|
William Schaefer
|
8d8125abee
|
4361 refactor names adjust comments
|
2018-11-15 17:21:36 -05:00 |
|
|
William Schaefer
|
3e8373d5e2
|
4361 add note regarding not being able to change CR with open case
|
2018-11-15 16:24:03 -05:00 |
|
|
William Schaefer
|
624a829917
|
4361 fix data source cr object id update code
|
2018-11-15 16:04:11 -05:00 |
|
|
U-BASIS\dsmyda
|
6fe69623c1
|
Lined up some txt in the PreferencesPanel
|
2018-11-15 15:50:56 -05:00 |
|
|
U-BASIS\dsmyda
|
c71db47b49
|
Codacy suggestions
|
2018-11-15 15:47:18 -05:00 |
|
|
U-BASIS\dsmyda
|
645ab33f60
|
Removed bundle text not being used
|
2018-11-15 15:38:34 -05:00 |
|
|
U-BASIS\dsmyda
|
ed802b0c3b
|
Fixed ViewPreferncesPanel to cooperate
|
2018-11-15 15:35:58 -05:00 |
|
|
William Schaefer
|
aee7efd6d5
|
4361 AutopsyService to populate object id for data sources in cr
|
2018-11-15 15:24:33 -05:00 |
|
|
U-BASIS\dsmyda
|
8b8196c218
|
Did the refactoring and fleshing out, seems to be working, but will test further
|
2018-11-15 14:40:49 -05:00 |
|
|
William Schaefer
|
9f48caf897
|
4361 enable/disable settings based on CURRENT_CASE events
|
2018-11-15 14:06:21 -05:00 |
|
|
U-BASIS\dgrove
|
9ee54cf46e
|
Renamed feature; added description to dialog.
|
2018-11-15 11:58:22 -05:00 |
|
|
U-BASIS\dgrove
|
4b804ed226
|
Updated access modifiers.
|
2018-11-15 10:03:08 -05:00 |
|
|
millmanorama
|
4f5a1159d1
|
codacy fixes
|
2018-11-15 13:57:46 +01:00 |
|
|
millmanorama
|
663c32df3d
|
add some more mimetypes
|
2018-11-15 13:57:46 +01:00 |
|
|
millmanorama
|
95ac53a1e8
|
rearrange code a bit
|
2018-11-15 13:57:46 +01:00 |
|
|
millmanorama
|
72e3f14ae4
|
flesh out FileTypeCategory. Inline usage of FileTypeCategories. refactor InterCaseCommonAttributeSearcher.determineMimeTypeFilter() for readability.
|
2018-11-15 13:57:46 +01:00 |
|
|
millmanorama
|
69eb3e6d7f
|
first pass at FileTypeUtils
|
2018-11-15 13:57:46 +01:00 |
|
|
millmanorama
|
b787475512
|
Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1126-timeline_event_publishing_names
# Conflicts:
# Core/src/org/sleuthkit/autopsy/timeline/events/TimelineEventAddedEvent.java
|
2018-11-15 13:15:15 +01:00 |
|
|
millmanorama
|
aedd2bd526
|
Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1091-update-filters
# Conflicts:
# Core/src/org/sleuthkit/autopsy/timeline/events/EventAddedEvent.java
|
2018-11-15 13:01:59 +01:00 |
|
|
U-BASIS\dgrove
|
1da24f1aec
|
Cleanup.
|
2018-11-15 00:49:53 -05:00 |
|
|
William Schaefer
|
68eea6d961
|
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4361-AddDataSourceIdColumn
|
2018-11-14 16:05:08 -05:00 |
|
|
William Schaefer
|
6a5d745921
|
4361 make queries use case db datasource id
|
2018-11-14 16:03:38 -05:00 |
|
|
U-BASIS\dsmyda
|
75bb46f0f4
|
Reverted Prefences panel and will try the merge conflict resolution again
|
2018-11-14 13:18:07 -05:00 |
|
|
dannysmyda
|
1ded18d67b
|
Merge branch 'develop' into 4361-SCO-clean-up-and-background-tasks
|
2018-11-14 13:09:30 -05:00 |
|
|
U-BASIS\dsmyda
|
5c59c8937c
|
Changed variable names and minor tweaks
|
2018-11-14 13:05:37 -05:00 |
|
|
U-BASIS\dsmyda
|
d597eea4a8
|
Adjusted some comments
|
2018-11-14 12:59:38 -05:00 |
|
|
U-BASIS\dsmyda
|
cf2dfe899e
|
Implemented all of Richards code review comments
|
2018-11-14 12:54:12 -05:00 |
|
|
U-BASIS\dgrove
|
e20466bc28
|
Added correlation property search. Cleanup still needed.
|
2018-11-14 09:54:22 -05:00 |
|
|
Richard Cordovano
|
9dfddb9a07
|
Merge pull request #4276 from wschaeferB/WirelessNetworkHtmlReportBugFix
Add missing break to case statement for HTML Report generation
|
2018-11-13 16:57:39 -05:00 |
|
|
millmanorama
|
9da50733d3
|
don't use 'extra' field to store id that is also passed to the superclass constructor.
|
2018-11-13 12:52:35 +01:00 |
|
|
millmanorama
|
670d2e6e0c
|
make EventAddedEvent 'reconstitutable'' after transmision over the network.
|
2018-11-13 12:23:36 +01:00 |
|
|
millmanorama
|
11b9c72828
|
rename event enums/classes to specify that they are Timeline related
|
2018-11-13 12:22:00 +01:00 |
|
|
Richard Cordovano
|
8180c713d9
|
Merge pull request #4258 from dgrove727/4371_PlistContentViewerExceptions
Added handling of NSArray data.
|
2018-11-12 13:28:57 -05:00 |
|
|
Richard Cordovano
|
f170e9ce6e
|
Merge pull request #4199 from dannysmyda/Appropriate_SevenZipExtractor_Memory_Fix
Appropriate seven zip extractor memory fix
|
2018-11-12 13:28:40 -05:00 |
|
|
U-BASIS\dsmyda
|
ac54dee5a2
|
Updated method header
|
2018-11-12 13:09:29 -05:00 |
|
|
William Schaefer
|
7a410ade15
|
4361 fix name of column in upgrade code
|
2018-11-12 11:46:45 -05:00 |
|
|
millmanorama
|
ea91542b89
|
fix merge
|
2018-11-12 17:24:00 +01:00 |
|
|
U-BASIS\dsmyda
|
b677d8fa93
|
Merge branch '4388-implement-sqlite-streaming-design' into 4390-text-extraction-stream-impl
|
2018-11-12 09:10:28 -05:00 |
|
|
U-BASIS\dsmyda
|
d8e65c70e7
|
Did codacy suggestions
|
2018-11-12 09:07:29 -05:00 |
|
|
U-BASIS\dsmyda
|
5c7fdf4b71
|
Did some codacy suggestions
|
2018-11-12 09:03:05 -05:00 |
|
|
William Schaefer
|
061a5debb1
|
Add missing break to case statement for HTML Report generation
|
2018-11-09 17:46:55 -05:00 |
|