16572 Commits

Author SHA1 Message Date
U-BASIS\zhaohui
62e96ff4e0 3449: Failed to generate report if couldn't create a report directory. 2018-01-09 17:11:45 -05:00
Richard Cordovano
0d9a474202 Merge remote-tracking branch 'upstream/custom-release-2.11.0' into develop 2018-01-09 15:22:13 -05:00
esaunders
d48fd00805 Merge branch 'custom-release-2.11.0' of github.com:sleuthkit/autopsy into 3197_tika_upgrade 2018-01-09 15:19:52 -05:00
Richard Cordovano
ba9e2f7fcc
Merge pull request #3345 from zhhl/3412-updatehtmlreportPath
3412: rename index.html to report.html and move html report files to …
2018-01-09 15:04:14 -05:00
U-BASIS\zhaohui
26554731ed 3412: Keey the copyright date record 2018-01-09 14:54:00 -05:00
Richard Cordovano
cb1d795c99
Merge pull request #3350 from raman-bt/3414_appcontentviewer
3414: Generic Application Content Viewer
2018-01-09 14:12:58 -05:00
U-BASIS\zhaohui
d10714fdb4 3412: Update regression.py to take care of the new HTML report path 2018-01-09 10:28:00 -05:00
Ann Priestman
00e68c44aa Add fix to restore directory when running as admin 2018-01-09 09:44:27 -05:00
Raman
dd10b4778c Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3414_appcontentviewer 2018-01-09 09:42:34 -05:00
Raman
15e296145d Address review comments 2018-01-09 09:39:26 -05:00
U-BASIS\zhaohui
9c02f119bf 3412: cleanup unused memeber 2018-01-08 16:14:39 -05:00
U-BASIS\zhaohui
f82956e353 3412: Update the copyright date 2018-01-08 15:53:19 -05:00
Richard Cordovano
e157dbf53f
Merge pull request #3349 from zhhl/3355-rememberLastKeywordImportPath
3355: The keyword search config panel should remember the last import…
2018-01-08 14:25:36 -05:00
U-BASIS\zhaohui
580bb83b5e 3355: update the copyright date 2018-01-08 14:22:38 -05:00
U-BASIS\zhaohui
316edff6f9 3412: Updates to let base directory not be touched by the modules and stay with ReportGenerator 2018-01-08 14:15:51 -05:00
Ann Priestman
a055757c64 Formatting 2018-01-08 13:48:35 -05:00
Richard Cordovano
09006daa58
Merge pull request #3360 from dgrove727/3435_InvalidPath
Corrected invalid path concatenation.
2018-01-08 13:47:35 -05:00
Ann Priestman
7ff02fa62a Added menu item to create live triage drive 2018-01-08 13:47:24 -05:00
Richard Cordovano
9040bef2e9
Merge pull request #3344 from raman-bt/custom-release-2.11.0
937: Accounts sub-trees do not refresh their contents after being ini…
2018-01-08 13:25:13 -05:00
Richard Cordovano
3759cb94be
Merge pull request #3348 from zhhl/3386-changeFilePermission
3386: Update the files permission from 755 to 644
2018-01-08 12:49:06 -05:00
U-BASIS\dgrove
e433a2717c Additional cleanup. 2018-01-08 12:43:20 -05:00
U-BASIS\dgrove
cc15524c02 Additional fix. 2018-01-08 12:41:32 -05:00
U-BASIS\dgrove
475f624958 Merge remote-tracking branch 'upstream/custom-release-2.11.0' into 3435_InvalidPath 2018-01-08 12:36:40 -05:00
U-BASIS\dgrove
48916a15fb Updated copyright. 2018-01-08 12:35:59 -05:00
Richard Cordovano
c352234608
Merge pull request #3353 from dgrove727/3354_InitMetricsDialog
Moved initialization of AutoIngestMetricsCollector.
2018-01-08 12:16:58 -05:00
U-BASIS\dgrove
c8b0ee9023 Corrected invalid path concatenation. 2018-01-08 12:05:46 -05:00
Raman
1b9165ce31 Merge branch 'custom-release-2.11.0' of https://github.com/sleuthkit/autopsy into custom-release-2.11.0 2018-01-08 10:08:28 -05:00
Richard Cordovano
b6b49f6ebb Merge remote-tracking branch 'upstream/release-4.6.0' into custom-release-2.11.0 2018-01-07 14:35:29 -05:00
Richard Cordovano
4e362d10ec
Merge pull request #3292 from seannicholls/deadlock-url-fix
changed defunct netbeans url (deadlock.netbeans.*) to the current url
2018-01-07 14:14:27 -05:00
Richard Cordovano
1d0ea93b37 Merge remote-tracking branch 'upstream/release-4.6.0' into custom-release-2.11.0 2018-01-07 13:38:46 -05:00
Richard Cordovano
bcfc09591b Merge remote-tracking branch 'upstream/develop' into release-4.6.0 2018-01-07 13:37:27 -05:00
Richard Cordovano
96a9877115
Merge pull request #3357 from rcordovano/file-mime-type-save-fix
Fix behavior of deprecated FileTypeDetector.detect
2018-01-07 13:09:59 -05:00
Richard Cordovano
70037c67ed
Merge pull request #3356 from rcordovano/file-mime-type-save-fix
File mime type save fix
2018-01-07 13:09:10 -05:00
Richard Cordovano
122dc709db
Merge pull request #3355 from rcordovano/file-mime-type-save-fix
File mime type save fix
2018-01-07 13:08:08 -05:00
Richard Cordovano
0fa972a572 Fix behavior of deprecated FileTypeDetector.detect 2018-01-07 13:06:03 -05:00
Richard Cordovano
9f24243bf7
Merge pull request #3354 from rcordovano/file-mime-type-save-fix
Ensure file type saved by file type module
2018-01-07 13:04:42 -05:00
Richard Cordovano
2880234569 Ensure file type saved by file type module 2018-01-07 13:03:40 -05:00
U-BASIS\dgrove
f7df638e9d Moved initialization of AutoIngestMetricsCollector. 2018-01-05 16:44:59 -05:00
Raman
22a04601c3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3414_appcontentviewer
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeDetector.java
2018-01-05 13:35:16 -05:00
Raman
1d0795bbe5 Removed extraneous try/catch for IllegalArgumentException 2018-01-05 11:00:40 -05:00
Richard Cordovano
ad854ed410
Merge pull request #3352 from rcordovano/file-detector-api-changes
File detector API changes
2018-01-05 10:50:14 -05:00
Richard Cordovano
e13d82ee16 Update FileTupeDetector API 2018-01-05 10:44:47 -05:00
Richard Cordovano
1ea14a2656 Update FileTupeDetector API 2018-01-05 10:17:21 -05:00
Richard Cordovano
5d06db99b7 Update FileTupeDetector API 2018-01-05 10:04:28 -05:00
Richard Cordovano
c4ada8d96e Merge remote-tracking branch 'upstream/develop' into file-detector-api-changes 2018-01-05 09:53:26 -05:00
Richard Cordovano
6bed444d24 Update FileTypeDetector API 2018-01-05 09:50:49 -05:00
Richard Cordovano
be15e8d381
Merge pull request #3351 from rcordovano/abstract-file-save-fix
Remove unnecessary parameter from AbstractFile.save
2018-01-05 09:02:56 -05:00
Richard Cordovano
1c1f85b358 Remove unnecessary parameter from AbstractFile.save 2018-01-05 08:57:18 -05:00
Richard Cordovano
00750c1079 Remove duplicate method from FileTypeDetector 2018-01-04 18:35:31 -05:00
Raman
81c6b45984 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3414_appcontentviewer 2018-01-04 15:32:11 -05:00