Commit Graph
16236 Commits
Author SHA1 Message Date
Richard Cordovano e4a63704ea Merge pull request #3275 from zhhl/3246-calcSlackFiles
3246: Calc file type of some slack files
2017-12-07 15:04:26 -05:00
Richard Cordovano 330bdd63d7 Merge pull request #3266 from wschaeferB/2999-adjustSingleUserCaseDbLocks
2999 ensure lock is always release in AddRawImageTask
2017-12-07 14:48:24 -05:00
Richard Cordovano 4ce116d42e Merge pull request #3271 from dgrove727/3172_ThrowTskCoreException
Added TSK_CORE_ERROR to exception checks.
2017-12-07 14:42:41 -05:00
U-BASIS\zhaohui 26345aea8c 3246: Calc file type of some slack files 2017-12-07 13:18:59 -05:00
Richard Cordovano 35c4939ace Merge pull request #3274 from sleuthkit/accounts_relationships
907: merge account_relationships to develop
2017-12-07 09:32:50 -05:00
U-BASIS\dgrove 2cd3be0c20 Minor tweak. 2017-12-06 14:24:10 -05:00
U-BASIS\dgrove ac68f48669 Merge remote-tracking branch 'upstream/develop' into 3172_ThrowTskCoreException 2017-12-06 14:11:25 -05:00
U-BASIS\dgrove 4b3364d050 Implemented new JobMetricsCollectionException. 2017-12-06 14:10:43 -05:00
Richard Cordovano 66ab9b79f3 Merge pull request #3261 from raman-bt/accounts_relationships
Handle build error after merging develop to accounts_relationships br…
2017-12-06 12:34:58 -05:00
Richard Cordovano b58c91b8bf Merge pull request #3270 from benhbasis/patch-1
Update Server.java
2017-12-06 12:01:24 -05:00
U-BASIS\dgrove 2b4f2790fa Added TSK_CORE_ERROR to exception checks. 2017-12-06 11:56:23 -05:00
benhbasis 697575a167 Update Server.java
Changing max connections to 32, as requested in ticket 3293 and tested in ticket 2979 and 3071
2017-12-06 11:08:21 -05:00
Raman 9364640b5e Fixed lost log message in case there's an exception while logging it. 2017-12-06 10:25:27 -05:00
Raman 1464d73ea4 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into accounts_relationships
# Conflicts:
#	Core/nbproject/project.properties
#	Core/nbproject/project.xml
#	InternalPythonModules/android/calllog.py
#	InternalPythonModules/android/contact.py
#	InternalPythonModules/android/textmessage.py
#	InternalPythonModules/android/wwfmessage.py
2017-12-06 10:18:51 -05:00
Richard Cordovano b90bb0e1fe Merge pull request #3268 from dgrove727/3150_CentralRepositoryDefaultHost
3150 central repository default host
2017-12-06 10:02:34 -05:00
Richard Cordovano c3d88699e8 Merge pull request #3264 from rcordovano/periodic-kws-backoff
Make SearchRunner in keywordsearch non-public
2017-12-06 09:43:16 -05:00
U-BASIS\dgrove cefedafd44 Merge remote-tracking branch 'upstream/develop' into 3150_CentralRepositoryDefaultHost 2017-12-06 01:29:11 -05:00
U-BASIS\dgrove 7265d9f1f0 Removed 'localhost' default value. 2017-12-06 01:28:31 -05:00
William Schaefer 3d086ed97d 2999 ensure lock is always release in AddRawImageTask 2017-12-05 17:23:22 -05:00
Richard Cordovano 38650b0084 Make SearchRunner in keywordsearch non-public 2017-12-05 13:38:13 -05:00
Richard Cordovano a6f9e76d96 Merge pull request #3251 from wschaeferB/3226-AddMemorySettings
3226 add memory settings
2017-12-05 13:31:07 -05:00
Richard Cordovano 872ab74e21 Merge pull request #3263 from esaunders/3229_jvm_heap
Update default JVM max heap size and document.
2017-12-05 13:30:35 -05:00
Richard Cordovano c571148586 Merge pull request #3260 from rcordovano/search-handles-job-cancel-better
Make search responsive to both job and thread cancellation
2017-12-05 13:19:03 -05:00
esaunders ec2a6bf3ba Update default JVM max heap size and document. 2017-12-05 13:12:19 -05:00
Raman 1db2c9b043 Handle build error after merging develop to accounts_relationships branch 2017-12-05 12:31:40 -05:00
Richard Cordovano f2d31e5882 Make search responsive to both job and thread cancellation 2017-12-05 12:21:16 -05:00
William Schaefer b69bc2731e 3226 fix horizontal allignment of notifications 2017-12-05 12:05:20 -05:00
William Schaefer 5f338c4f13 3226 Fixed error displaying current memory setting, and layout issues 2017-12-05 11:32:15 -05:00
Richard Cordovano 728fef52ab Merge pull request #3254 from benhbasis/develop
Update StringsTextExtractor.java
2017-12-05 10:30:18 -05:00
Richard Cordovano a647305ac7 Merge pull request #3259 from millmanorama/disable_Visualize_tab
Disable visualize tab
2017-12-05 09:21:48 -05:00
Richard Cordovano 59571e6996 Merge pull request #3253 from millmanorama/883_user-friendly-device-ids
883 user friendly device ids
2017-12-05 09:21:07 -05:00
Richard Cordovano 96b4ae24d0 Merge pull request #3252 from millmanorama/accounts_relationships
fix python android modules
2017-12-05 09:20:31 -05:00
millmanorama 85e9f375ca disable Visualize tab. 2017-12-05 14:01:46 +01:00
Richard Cordovano 0a3271a4bc Merge pull request #3257 from rcordovano/fix-ingest-cancel-msg-inaccuracy
Fix ingest cancel message inaccuracy
2017-12-04 17:07:58 -05:00
Richard Cordovano 9af3bd183d Merge remote-tracking branch 'upstream/develop' into fix-ingest-cancel-msg-inaccuracy 2017-12-04 16:26:57 -05:00
Richard Cordovano 4151082c5a Remove inaccurate ingest job cancellatino msg details 2017-12-04 16:26:14 -05:00
Richard Cordovano 7512fea5d1 Merge pull request #3256 from rcordovano/ingest-job-cancel-off-edt
Remove completion check from DataSourceIngestJob.cancel
2017-12-04 16:08:57 -05:00
Richard Cordovano 87167854da Remove completion check from DataSourceIngestJob.cancel 2017-12-04 15:42:25 -05:00
benhbasis 6bb0c8b70c Update StringsTextExtractor.java
At the request of Brian Carrier, as suggested and tested in VIK-2979
2017-12-04 07:49:32 -05:00
millmanorama 63174e0dfc inline method 2017-12-02 16:38:58 +01:00
millmanorama d27d13ba68 WIP
Merge branch 'accounts_relationships' into 883_user-friendly-device-ids
2017-12-02 16:22:56 +01:00
millmanorama 2f468dd1a1 fix python android modules 2017-12-02 14:45:30 +01:00
Brian Carrier 5b8278cda8 Merge pull request #3249 from millmanorama/relationship-type
use RelationshipTypeFilter to exclude contacts
2017-12-01 16:12:54 -05:00
Brian Carrier 551cdfd03b Merge pull request #3250 from sleuthkit/cr_refactor
open CR case by Autopsy Case, error if DB doesn't exist, return case …
2017-12-01 16:11:38 -05:00
William Schaefer 81c677d828 3226 check Developer mode for enabling of memory settings 2017-12-01 15:56:02 -05:00
Brian Carrier 2131255245 Merge branch 'develop' into cr_refactor 2017-12-01 15:32:12 -05:00
Brian Carrier 51eac3dfa9 open CR case by Autopsy Case, error if DB doesn't exist, return case after creating 2017-12-01 15:27:50 -05:00
William Schaefer e7c38d3f26 3226 clean up memory settings code and add additional comments 2017-12-01 14:30:04 -05:00
William Schaefer 80705a39f7 3226 add 4 gigabyte default JVM heap size for developers 2017-12-01 13:24:05 -05:00
William Schaefer f3360d1ec6 3226 add memory setting to Application Options panel 2017-12-01 13:19:48 -05:00