CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-04 04:06:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #117 from alanedwardes/master

Browse source 
Added support for custom Amazon S3 endpoints, and DreamObjects compatibility.
This commit is contained in:
Jaex 2014-05-05 15:46:40 +03:00
commit 5afff15045
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UploadersLib/FileUploaders/AmazonS3.cs
View file

@ -63,7 +63,7 @@ private string GetPolicyDocument(string fileName)
{
var policyDocument = new
{
expiration = DateTime.UtcNow.AddDays(2).ToString("o"), // The policy is valid for 2 days
expiration = DateTime.UtcNow.AddDays(2).ToString("yyyy-MM-ddTHH:mm:ssZ"), // The policy is valid for 2 days
conditions = new List<S3PolicyCondition> {
new S3PolicyCondition("acl", "public-read"),
new S3PolicyCondition("bucket", S3Settings.Bucket),

1
UploadersLib/GUI/UploadersConfigForm.Designer.cs generated
View file

@ -1902,7 +1902,6 @@ private void InitializeComponent()
//
// cbAmazonS3Endpoint
//
this.cbAmazonS3Endpoint.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbAmazonS3Endpoint.FormattingEnabled = true;
this.cbAmazonS3Endpoint.Items.AddRange(new object[] {
"https://s3-ap-northeast-1.amazonaws.com/",