mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-16 17:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,937 Commits 1 Branch 0 Tags
Commit Graph

11066 Commits

Author SHA1 Message Date
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
millmanorama
ad64be1d0f Merge remote-tracking branch 'upstream/timeline-event-mgr' into 1126-timeline_event_publishing_names 
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
#	Core/src/org/sleuthkit/autopsy/timeline/utils/FilterUtils.java
 2018-11-20 20:49:57 +01:00
U-BASIS\dsmyda
cbfeb44559 Merge branch 'develop' into 4389-sqlite-stream-impl 2018-11-20 14:10:33 -05:00
U-BASIS\dsmyda
3a27cd3ffc Merge remote-tracking branch 'upstream/develop' into 4389-sqlite-stream-impl 2018-11-20 14:07:15 -05:00
Richard Cordovano
a535883d5b
Merge pull request #4292 from dannysmyda/smallFixForSqliteTableReader 
Small fix for SqliteTableReader resource closing
 2018-11-20 13:10:23 -05:00
U-BASIS\dsmyda
d3cc7db995 Changed close() to only close connection and not redundantly close table resources 2018-11-20 13:05:35 -05:00
U-BASIS\dsmyda
ccc0332987 Removed old functions that caused build error 2018-11-20 12:27:22 -05:00
Richard Cordovano
2dd969f0f8
Merge pull request #4269 from dannysmyda/4390-text-extraction-stream-impl 
4390 text extraction stream impl
 2018-11-20 11:37:39 -05:00
Richard Cordovano
a341c903be
Merge pull request #4256 from dannysmyda/4361-SCO-clean-up-and-background-tasks 
4361 sco clean up and background tasks
 2018-11-20 11:35:18 -05:00
dannysmyda
822410a800
Merge branch 'develop' into 4390-text-extraction-stream-impl 2018-11-20 10:25:38 -05:00
dannysmyda
58c1e9b9ce
Merge branch 'develop' into 4389-sqlite-stream-impl 2018-11-20 10:21:09 -05:00
Richard Cordovano
e691425a5d Reformat class docs in SQLiteTableReader 2018-11-20 10:14:01 -05:00
Richard Cordovano
58024fa29a Reformat class docs in SQLiteTableReader 2018-11-20 10:12:30 -05:00
Richard Cordovano
f9a0844cdb Remove unused import in SQLiteTableReader 2018-11-20 10:09:24 -05:00
Richard Cordovano
d36546074c Fix Codacy issues in SQLiteTableReader 2018-11-20 10:07:57 -05:00
Richard Cordovano
31f4b420b0
Merge pull request #4272 from dannysmyda/4388-implement-sqlite-streaming-design 
4388 implement sqlite streaming design
 2018-11-20 09:57:03 -05:00
U-BASIS\dsmyda
fdd2038a3d Fixed a comment to reflect changes 2018-11-20 09:30:27 -05:00
U-BASIS\dsmyda
036da13f8f Removed SCO from background task 2018-11-20 09:22:31 -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
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
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\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
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
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
William Schaefer
8feb1314f1 4354 fix issues found in PR review and ordering issue with upgrade 2018-11-09 16:09:19 -05:00
millmanorama
08be5da09a fix codacy issues 2018-11-09 18:38:40 +01:00
millmanorama
1b1a68a998 fix comments and method name 2018-11-09 18:38:19 +01:00
millmanorama
6198b1fcf3 new filters have the correct enabled/disabled state 2018-11-09 18:38:19 +01:00
millmanorama
8503d8b756 log Exceptions from executor thread. correctly populate filters for new datasources. refactor cache invalidation some. 2018-11-09 18:38:19 +01:00