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 |
|
Richard Cordovano
|
4b49a5d4fd
|
Merge pull request #4280 from millmanorama/1126-timeline_event_publishing_names
1126 timeline event publishing names
|
2018-11-21 11:48:43 -05:00 |
|
Richard Cordovano
|
46d261aa5b
|
Merge pull request #4271 from dannysmyda/4389-sqlite-stream-impl
4389 content viewer stream impl
|
2018-11-21 11:48:13 -05:00 |
|
Richard Cordovano
|
4d40ffb4b8
|
Merge pull request #4294 from raman-bt/1136-group-seen-error
1136: Intermittent error: "Error marking group as seen"
|
2018-11-21 09:57:03 -05:00 |
|
Raman
|
3acf779e95
|
1136: Intermittent error: "Error marking group as seen"
|
2018-11-21 09:22:51 -05: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 |
|
Richard Cordovano
|
e50cac3947
|
Merge pull request #4277 from millmanorama/1091-update-filters
1091 update filters
|
2018-11-20 13:08:27 -05:00 |
|
Richard Cordovano
|
4647e0605c
|
Merge pull request #4291 from dannysmyda/makeAutopsyBuildAgain
Removed old functions that caused build error
|
2018-11-20 13:05:56 -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 |
|
U-BASIS\dsmyda
|
a363337011
|
Added logging statement and changed variable names
|
2018-11-20 10:50:47 -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
|
599b1f50da
|
Merge pull request #4289 from rcordovano/sqlitereader-codacy-fixes
SQLiteTableReader codacy fixes
|
2018-11-20 10:14:52 -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 |
|
Richard Cordovano
|
868dc3b95d
|
Merge pull request #4287 from rcordovano/ig_closes_drawable_db
Eliminate drawables db creation side effect
|
2018-11-19 19:40:53 -05:00 |
|
Richard Cordovano
|
c769af555c
|
Eliminate drawables db creation side effect
|
2018-11-19 19:38:46 -05:00 |
|
Richard Cordovano
|
28ecc7e73c
|
Merge pull request #4285 from rcordovano/ig_closes_drawable_db
Close IG database, propagate exceptions
|
2018-11-19 17:15:02 -05:00 |
|
Richard Cordovano
|
80cd3a08e5
|
Remove commented out code and unused case db trans from DrawableDB
|
2018-11-19 17:13:52 -05:00 |
|
Richard Cordovano
|
5bf6037b78
|
Merge remote-tracking branch 'upstream/develop' into ig_closes_drawable_db
|
2018-11-19 14:28:06 -05:00 |
|
Richard Cordovano
|
0184156d39
|
Merge pull request #4286 from rcordovano/filter-out-catalog-sql
Update db dump script to ignore pg_catalog SQL
|
2018-11-19 13:03:53 -05:00 |
|
Richard Cordovano
|
2b84fde7e6
|
Correct typo in DrawableDB comment
|
2018-11-19 09:25:31 -05:00 |
|
Richard Cordovano
|
cc6c6aa472
|
Close IG database, propagate exceptions
|
2018-11-19 09:21:28 -05:00 |
|
rcordovano
|
e3c352ed5e
|
Update db dump script to ignore pg_catalog SQL
|
2018-11-16 18:31:16 -05:00 |
|
Richard Cordovano
|
8f8ba08297
|
Merge pull request #4273 from wschaeferB/4354-AddObjectIdToCR
4354 add object id to cr
|
2018-11-16 12:38:04 -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 |
|