7741 Commits

Author SHA1 Message Date
William Schaefer
c0861d24d9 3287 Fixed wait cursors with use of getGlassPane() 2017-12-08 16:25:28 -05:00
Richard Cordovano
42817363aa
Merge pull request #3265 from APriestman/3245_updateSchema
Added central repository upgrade code
2017-12-07 15:36:20 -05:00
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
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
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
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
Ann Priestman
6e9a9e274b Cleanup 2017-12-05 14:44:26 -05:00
Ann Priestman
e25c97d031 Cleanup 2017-12-05 14:41:30 -05:00
Ann Priestman
f80e57dafb Merge remote-tracking branch 'upstream/develop' into 3245_updateSchema 2017-12-05 14:30:29 -05:00
Ann Priestman
97be15f9d3 Finished upgrade code. 2017-12-05 14:29:59 -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
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
a647305ac7
Merge pull request #3259 from millmanorama/disable_Visualize_tab
Disable visualize tab
2017-12-05 09:21:48 -05:00
millmanorama
85e9f375ca disable Visualize tab. 2017-12-05 14:01:46 +01:00
Richard Cordovano
4151082c5a Remove inaccurate ingest job cancellatino msg details 2017-12-04 16:26:14 -05:00
Richard Cordovano
87167854da Remove completion check from DataSourceIngestJob.cancel 2017-12-04 15:42:25 -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
Ann Priestman
1bb1b65408 Merge remote-tracking branch 'upstream/develop' into 3245_updateSchema 2017-12-01 16:22:33 -05:00
Ann Priestman
8a4b4f3f81 Testing 2017-12-01 16:22:31 -05:00
William Schaefer
81c677d828 3226 check Developer mode for enabling of memory settings 2017-12-01 15:56:02 -05:00
Ann Priestman
fe07114cbc Fixing some database queries.
Improved error handling.
2017-12-01 15:32:19 -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
f3360d1ec6 3226 add memory setting to Application Options panel 2017-12-01 13:19:48 -05:00
Richard Cordovano
87f69cc074 Remove use of deprecated method from AddLocalFilesTask, FileManager 2017-12-01 13:09:17 -05:00
Ann Priestman
d9a40d0bd4 Merge remote-tracking branch 'upstream/develop' into 3245_updateSchema
Conflicts:
	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamDbUtil.java
	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PostgresEamDbSettings.java
	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDbSettings.java
2017-12-01 11:27:19 -05:00
Ann Priestman
d1e0f7243b Moved updateSchema code 2017-12-01 11:17:10 -05:00
millmanorama
802b73163f update to use RelationshipTypeFilter to exclude contacts 2017-11-30 23:29:36 +01:00
millmanorama
fb21914e58 update copyright headers 2017-11-30 23:29:36 +01:00
Richard Cordovano
1ffeff74b5
Merge pull request #3241 from APriestman/3250_hashkeeper
Add support for importing hashkeeper hash sets and md5sum output text
2017-11-30 15:45:28 -05:00
Richard Cordovano
9532c14de7
Merge pull request #3242 from APriestman/3264_defaultOrg
Add a default organization when the central repo db is created
2017-11-30 15:44:56 -05:00
Richard Cordovano
ae79c27d5a
Merge pull request #3243 from APriestman/3259_dialogCleanup
Update text on the create/import hash db dialogs
2017-11-30 14:32:18 -05:00
Richard Cordovano
09d6076f92
Merge pull request #3245 from esaunders/3231_embedded_file_extractor
Modified EmbeddedFileExtractor to use Tika for OOXML files. FileTypeD…
2017-11-30 14:31:26 -05:00
Richard Cordovano
51a1e843af
Merge pull request #3246 from dgrove727/3257_EncryptionDetectionConfiguration
Encryption Detection settings panel implemented.
2017-11-30 14:28:11 -05:00
William Schaefer
0631365319 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3203-TagsContextMenuChanges 2017-11-30 12:58:59 -05:00
Richard Cordovano
2ef153c5d3
Merge pull request #3228 from wschaeferB/3202-TagsMessagingOnStatusChange
3202 tags messaging on status change
2017-11-30 11:03:38 -05:00
U-BASIS\dgrove
42111e272c Minor tweak to settings panel. 2017-11-30 10:29:38 -05:00
U-BASIS\dgrove
1b06cf1ee2 Merge remote-tracking branch 'upstream/develop' into 3257_EncryptionDetectionConfiguration 2017-11-30 10:29:11 -05:00
U-BASIS\dgrove
50223cc0c9 Revised the settings panel. 2017-11-29 17:30:09 -05:00
U-BASIS\dgrove
77cf4a0ebb Encryption Detection settings panel implemented. 2017-11-29 16:34:18 -05:00
Richard Cordovano
b78f179192
Merge pull request #3236 from wschaeferB/3224-DatabaseFileExtView
3224 database file ext view
2017-11-29 16:30:18 -05:00
esaunders
f495a42db8 Fix for extracted file sizes. 2017-11-29 14:29:12 -05:00
esaunders
2d9c20b90c Modified EmbeddedFileExtractor to use Tika for OOXML files. FileTypeDetector needed to be updated to use TikaInputStream because a new version of Apache Compress was pulled in with tika-parsers. 2017-11-29 12:39:36 -05:00