20606 Commits

Author SHA1 Message Date
millmanorama
0ef424871f restore isIgnoredUrl usage to merged ExtractIE and FirefoxExtractor 2018-10-22 16:02:01 +02:00
millmanorama
3bdbe2bb48 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/FirefoxExtractor.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
2018-10-22 14:22:29 +02:00
esaunders
3d7fba6a5f
Merge pull request #4223 from esaunders/develop
Fix bug I introduced with handling of image gallery tables.
2018-10-17 10:12:49 -04:00
esaunders
c429d7af46 Fix bug I introduced with handling of image gallery tables. 2018-10-17 10:11:48 -04:00
esaunders
1bf627ca4f
Merge pull request #4222 from esaunders/develop
Add special handling for image gallery tables.
2018-10-15 17:40:33 -04:00
esaunders
9882ada225 Add special handling for image gallery tables. 2018-10-15 17:39:15 -04:00
esaunders
ee1f9dd216
Merge pull request #4221 from esaunders/develop
Merge release-4.9.0 into develop
2018-10-15 16:26:19 -04:00
esaunders
23eda3c98d Merge remote-tracking branch 'upstream/release-4.9.0' into develop 2018-10-15 15:51:01 -04:00
Brian Carrier
5035b7074f Changed back to develop 2018-10-15 15:02:00 -04:00
millmanorama
91a486234a Merge remote-tracking branch 'upstream/timeline-event-mgr' into timeline-event-mgr 2018-10-15 16:50:19 +02:00
millmanorama
11274bce62 Merge branch 'develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java
#	branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
#	branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
2018-10-15 16:35:28 +02:00
Brian Carrier
e032ab67e5 Set to release 2018-10-14 23:54:27 -04:00
Brian Carrier
3ac311689d
Merge pull request #4217 from sleuthkit/sql_fix
fix Keyword Search SQLiteUtil compile error
2018-10-14 21:49:01 -04:00
Brian Carrier
66476b9693 fix Keyword Search SQLiteUtil compile error 2018-10-14 21:47:11 -04:00
Brian Carrier
5e4a296f7c
Merge pull request #4216 from wschaeferB/4313-FileLimitOption
4313 add option to disable limiting of deleted file display to 10k
2018-10-14 21:18:06 -04:00
Richard Cordovano
9230451cb7 Remove SQLiteUtil from public API for future work 2018-10-13 21:08:04 -04:00
William Schaefer
a59eadb393 4313 add option to disable limiting of deleted file display to 10k 2018-10-12 16:07:35 -04:00
Brian Carrier
863a82c6ff Merge branch 'release-4.9.0' of github.com:sleuthkit/autopsy into release-4.9.0 2018-10-12 12:24:02 -04:00
Brian Carrier
f94d8e6da3 Updated for 4.9.0 release 2018-10-12 12:23:44 -04:00
Richard Cordovano
5a8196e5dd
Merge pull request #4215 from rcordovano/nbm-version-updates-for-4.9.0
NBM version updates for 4.9.0
2018-10-12 12:10:07 -04:00
Richard Cordovano
6bf58a0d3a NBM versioning updates for release 4.9.0 2018-10-12 12:07:41 -04:00
Brian Carrier
c3efd28c14
Merge pull request #4207 from APriestman/ingestDsFix
Run all ingest modules on logical file sets
2018-10-12 11:30:05 -04:00
Brian Carrier
1029f4fcdb
Merge pull request #4214 from sleuthkit/4262_domain_check
validate domains don't have special characters
2018-10-12 11:21:04 -04:00
Brian Carrier
2582ede1c4 Updated to TSK 4.6.3 2018-10-11 21:50:33 -04:00
Brian Carrier
ab3338ba6b Updated to TSK version 4.6.3 2018-10-11 21:40:18 -04:00
Brian Carrier
e80553351c validate domains don't have special characters 2018-10-11 18:49:32 -04:00
Richard Cordovano
a7b46a62d2
Merge pull request #4213 from rcordovano/release-4.9.0
Restore encapsulation of OutlineView in DataResultViewerTable
2018-10-11 18:25:47 -04:00
Richard Cordovano
eccf778925 Merge upstream, restore encapsulation of DataResultViewerTable 2018-10-11 18:23:06 -04:00
Richard Cordovano
4a8aecb939 Restore encapsulation of OutlineView in DataResultViewerTable 2018-10-11 18:16:46 -04:00
Richard Cordovano
3d6df1d9ea
Merge pull request #4212 from rcordovano/tree-table-node-public-api-fixes
Refactor to remove public API additions for common properties search
2018-10-11 18:14:28 -04:00
Brian Carrier
8b622cfdb3
Merge pull request #4211 from dgrove727/4262_InvalidDomainsFix
4262 invalid domains fix
2018-10-11 15:49:19 -04:00
Richard Cordovano
7d7484aaef Refactor to remove public API additions for common properties search 2018-10-11 15:47:41 -04:00
Richard Cordovano
1bf1d77532 Refactor to remove public API additions for common properties search 2018-10-11 15:43:29 -04:00
Richard Cordovano
df419009c4 Refactor to remove public API additions for common properties search 2018-10-11 15:39:57 -04:00
U-BASIS\dgrove
49c001e69f Cleanup. 2018-10-11 15:12:33 -04:00
U-BASIS\dgrove
6977f4d69d Simplified user@host parsing. 2018-10-11 15:11:51 -04:00
U-BASIS\dgrove
3c1db06fc4 Minimal fixes. 2018-10-11 15:03:25 -04:00
Brian Carrier
0e4664967b
Merge pull request #4210 from raman-bt/1066-cam-make-by-ds
1066: Grouping by Camera Make/Model depends on data source selection,…
2018-10-11 13:29:29 -04:00
Raman
aee36df5ea 1066: Grouping by Camera Make/Model depends on data source selection, despite being told otherwise 2018-10-11 13:22:01 -04:00
Brian Carrier
8d7213f095 Added space to SQL 2018-10-11 12:58:36 -04:00
Brian Carrier
09def81220
Merge pull request #4208 from raman-bt/1081-npe-groups
1081: NPE in ImageGallery while switching groups
2018-10-11 12:34:04 -04:00
eugene7646
32d2b61ddd
Merge pull request #4209 from eugene7646/pythonfixes
Fixed broken URL links
2018-10-11 12:29:01 -04:00
Eugene Livis
98a850de3e Fixed broken URL links 2018-10-11 12:13:28 -04:00
Raman
1b60038931 1081: NPE in ImageGallery while switching groups 2018-10-11 11:35:16 -04:00
Ann Priestman
154eec8cd7 Run all ingest modules on logical file sets 2018-10-11 11:26:07 -04:00
Brian Carrier
bc1c206618
Merge pull request #4206 from raman-bt/1082-sqlexception
1082: SQLException from ImageGallery while ingesting a data source in…
2018-10-11 11:13:28 -04:00
Raman
e66b57e285 1082: SQLException from ImageGallery while ingesting a data source in a multi-user case 2018-10-11 10:50:11 -04:00
Brian Carrier
7cce72f591
Merge pull request #4194 from rcordovano/fix-copyright
Correct copyright notice in new AutopsyOptionProcessor class
2018-10-11 09:49:21 -04:00
Brian Carrier
5f3844e2ee
Merge pull request #4200 from esaunders/4229_add_interesting_item_hits_in_bulk
In HitsFactory.createKeys() add artifact hits in bulk to speed up dis…
2018-10-11 09:48:51 -04:00
Brian Carrier
81718a1a32
Merge pull request #4203 from sleuthkit/1075_ig_group_update
advance groups when none shown, update group when unseen is updated, …
2018-10-11 09:48:00 -04:00