U-BASIS\dgrove
|
28820c482e
|
Merge conflict resolved.
|
2019-02-19 17:44:32 -05:00 |
|
Richard Cordovano
|
8617e6a6d9
|
Merge pull request #4536 from wschaeferB/4730-FixSleuthkitBranchScript
4730 fix sleuthkit branch script
|
2019-02-19 15:38:29 -05:00 |
|
Brian Carrier
|
bd5c6ba37e
|
Merge pull request #4543 from sleuthkit/translate_docs
Added initial version of documentation about translations
|
2019-02-18 21:54:02 -05:00 |
|
Brian Carrier
|
db858324cf
|
Added initial version of documetation about translations
|
2019-02-18 21:53:21 -05:00 |
|
Richard Cordovano
|
4ee0a68d0a
|
Merge pull request #4541 from sleuthkit/revert-4534-3912_merge_bundles
Revert "Copy merged bundles into src folder so that they can be checked in."
|
2019-02-15 13:33:58 -05:00 |
|
Richard Cordovano
|
bd2866819f
|
Revert "Copy merged bundles into src folder so that they can be checked in."
|
2019-02-15 13:33:42 -05:00 |
|
Richard Cordovano
|
9822765c62
|
Merge pull request #4534 from sleuthkit/3912_merge_bundles
Copy merged bundles into src folder so that they can be checked in.
|
2019-02-15 10:17:18 -05:00 |
|
U-BASIS\dgrove
|
a53fc9333d
|
New path; review comments addressed.
|
2019-02-15 02:50:58 -05:00 |
|
William Schaefer
|
7ad7a797d4
|
4730-Suggested modifications for readability, some minor changes to logic
|
2019-02-14 12:28:52 -05:00 |
|
Richard Cordovano
|
b55e97d99b
|
Merge pull request #4525 from sleuthkit/update_tsk_version
Update Unix_setup.sh version via script. Not Ant.
|
2019-02-13 15:47:26 -05:00 |
|
Richard Cordovano
|
f10d9cb022
|
Merge pull request #4539 from sleuthkit/revert-4510-Optimization-Tika-Content-Extraction
Revert "Optimization and Bug fix - Make Tika use AbstractFile mimetype instead of recomputing"
|
2019-02-13 15:43:23 -05:00 |
|
Richard Cordovano
|
3c3d92f03c
|
Revert "Optimization and Bug fix - Make Tika use AbstractFile mimetype instead of recomputing"
|
2019-02-13 15:43:04 -05:00 |
|
U-BASIS\dgrove
|
dc6628e787
|
Merge conflict resolved.
|
2019-02-13 14:15:15 -05:00 |
|
Brian Carrier
|
00c92f5bf6
|
Fixed line ending
|
2019-02-13 12:55:58 -05:00 |
|
William Schaefer
|
270d5ef67c
|
4730 fix incorrect variable name in script
|
2019-02-13 12:42:59 -05:00 |
|
William Schaefer
|
a3bff33fd6
|
4730 adjust for use case where a branch other than develop is targeted
|
2019-02-13 12:36:12 -05:00 |
|
William Schaefer
|
e33aa22bea
|
4730 adjust pull location when owner is origin
|
2019-02-12 18:23:15 -05:00 |
|
William Schaefer
|
2d2df5212f
|
4730 manually set branch owner when origin and non-develop branch
|
2019-02-12 18:05:13 -05:00 |
|
William Schaefer
|
9ac389ac7a
|
4730 try and fix checkout for origin branches other than develop
|
2019-02-12 17:47:13 -05:00 |
|
William Schaefer
|
ea86a06765
|
4730 fix equality check for empty string in travis build
|
2019-02-12 17:31:38 -05:00 |
|
William Schaefer
|
2b2b479f57
|
4730 adjust logic for getting branch for travis
|
2019-02-12 17:26:15 -05:00 |
|
William Schaefer
|
ef142cfb1b
|
4730 adjust travis branch determination
|
2019-02-12 17:13:25 -05:00 |
|
William Schaefer
|
f01bf350a0
|
4730 add temporary prints for debugging purposes
|
2019-02-12 17:00:56 -05:00 |
|
William Schaefer
|
5eae25cf9e
|
4730 get default appveyor / travis branch if it isn't develop
|
2019-02-12 16:48:54 -05:00 |
|
William Schaefer
|
287be8bb5f
|
4730 change default value for os.getEnv variables to useful default
|
2019-02-12 16:28:57 -05:00 |
|
Brian Carrier
|
c4548389ca
|
Copy merged buncles into src folder so that they can be checked in
|
2019-02-12 15:39:53 -05:00 |
|
Richard Cordovano
|
417659bb84
|
Merge pull request #4510 from dannysmyda/Optimization-Tika-Content-Extraction
Optimization and Bug fix - Make Tika use AbstractFile mimetype instead of recomputing
|
2019-02-12 10:20:04 -05:00 |
|
Richard Cordovano
|
c9e557a241
|
Merge pull request #4507 from APriestman/4681_dontStartRelativePathsWithSlash
4681 Remove leading slash and normalize the rest
|
2019-02-12 10:18:49 -05:00 |
|
U-BASIS\dsmyda
|
3d0d70b036
|
removed unused import
|
2019-02-12 09:29:32 -05:00 |
|
Richard Cordovano
|
f2e61ec0ec
|
Merge pull request #4496 from eugene7646/command_line_4412
Support for running from command line 4412
|
2019-02-12 09:08:33 -05:00 |
|
U-BASIS\dsmyda
|
e4f4491148
|
Added edge case for empty mime type
|
2019-02-11 16:16:38 -05:00 |
|
U-BASIS\dsmyda
|
1244110ab8
|
Ran source formatter on code
|
2019-02-11 13:37:31 -05:00 |
|
U-BASIS\dsmyda
|
ef98f2e2bf
|
Marked variable as final
|
2019-02-11 13:36:52 -05:00 |
|
U-BASIS\dsmyda
|
a445d799a4
|
Comments
|
2019-02-11 13:36:29 -05:00 |
|
U-BASIS\dsmyda
|
dd17770a05
|
Cleaned up the logic to be less verbose
|
2019-02-11 13:35:15 -05:00 |
|
U-BASIS\dsmyda
|
d28a857599
|
Solved the edge case of no mime-type
|
2019-02-11 13:18:36 -05:00 |
|
Richard Cordovano
|
0ba9b769e0
|
Merge pull request #4530 from dannysmyda/4680-suppress-inserts-image-gallery-groups
Removed the image_galley_group_seen inserts in the multi-user dumps
|
2019-02-11 12:41:25 -05:00 |
|
Richard Cordovano
|
c267492e09
|
Merge branch 'develop' into 4680-suppress-inserts-image-gallery-groups
|
2019-02-11 12:41:18 -05:00 |
|
Richard Cordovano
|
4789970910
|
Merge pull request #4529 from wschaeferB/4726-NormalizeDataSourceArtifacts
4726 normalize data source artifacts
|
2019-02-11 12:39:32 -05:00 |
|
Richard Cordovano
|
413dadc8b6
|
Merge pull request #4481 from dannysmyda/4609-Improve-Domain-Validation
4609 Improve domain verification
|
2019-02-11 12:39:07 -05:00 |
|
Richard Cordovano
|
2fa42f9386
|
Merge pull request #4480 from dannysmyda/4659-audio-mpeg-fix
4659 Verify Tikas audio/mpeg mimetype
|
2019-02-11 12:38:48 -05:00 |
|
Richard Cordovano
|
ae6024b1b7
|
Merge pull request #4498 from APriestman/4682_supportEmptyImagePaths
4682 Avoid NPE if an image has no paths
|
2019-02-11 12:19:39 -05:00 |
|
Richard Cordovano
|
dbc370a36c
|
Merge pull request #4506 from dannysmyda/4692-Fix-HxD-Editor
4692 fix hxd editor bugs
|
2019-02-11 12:10:39 -05:00 |
|
U-BASIS\dsmyda
|
9c7f2dd141
|
Fixed typo
|
2019-02-11 11:08:58 -05:00 |
|
Richard Cordovano
|
5b0ab1ba71
|
Merge pull request #4524 from esaunders/4642_solr_heap
Made requested modifications to Runtime settings UI.
|
2019-02-10 08:08:35 -05:00 |
|
Richard Cordovano
|
2452b87b8e
|
Merge pull request #4521 from wschaeferB/4690-MatchAutopsyBranchToTskBranch
4690 match autopsy branch to tsk branch
|
2019-02-10 08:07:44 -05:00 |
|
Richard Cordovano
|
d0d5370984
|
Merge pull request #4490 from wschaeferB/4632-4630-4629-DetectOsSpecificFiles
4632 4630 4629 detect os specific files
|
2019-02-10 07:09:28 -05:00 |
|
Richard Cordovano
|
4c88ec9d47
|
Merge pull request #4526 from wschaeferB/4722-HandleOSErrorBetter
4722 handle os error better
|
2019-02-10 07:07:55 -05:00 |
|
Richard Cordovano
|
e814109439
|
Merge pull request #4502 from wschaeferB/4637-FixObjectIdColumnTypes
4637 fix object id column types
|
2019-02-10 07:05:35 -05:00 |
|
Eugene Livis
|
bbd3303b84
|
Merge branch 'develop' of github.com:sleuthkit/autopsy into command_line_4412
|
2019-02-08 14:00:50 -05:00 |
|