Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/support direct upload #27

Merged
merged 11 commits into from
Mar 1, 2017
Merged

Feature/support direct upload #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7ca9af
Add support for referenced content in the main collection
Roblinde Feb 14, 2017
8a9aa4d
First implementation of upload methods
Roblinde Feb 16, 2017
e3960cc
Add convenient method to upload asset
Roblinde Feb 21, 2017
022f105
Merge branch 'master' into feature/support-direct-upload
Roblinde Feb 22, 2017
ce7e258
Update direct upload API to new spec
Roblinde Feb 23, 2017
f35f44e
Increase package version
Roblinde Mar 1, 2017
f232bf4
Update api for upload slightly
Roblinde Mar 1, 2017
9587b7c
Remove unecessary properties for upload method
Roblinde Mar 1, 2017
23a70da
Set content type header correctly
Roblinde Mar 1, 2017
a711b74
Use correct locale for creating asset
Roblinde Mar 1, 2017
3ee4df9
Add async suffix
Roblinde Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update direct upload API to new spec
  • Loading branch information
@Roblinde
Roblinde committed Feb 23, 2017
commit ce7e258c1f78c66d99417e025388d807f9733ce7
82 changes: 0 additions & 82 deletions Contentful.Core/Configuration/FileJsonConverter.cs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion Contentful.Core/Models/File.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Contentful.Core.Models
/// <summary>
/// Represents information about the actual binary file of an <see cref="Asset"/>.
/// </summary>
[JsonConverter(typeof(FileJsonConverter))]
public class File
{
/// <summary>
Expand All @@ -28,10 +27,12 @@ public class File
/// <summary>
/// The url to upload this file from.
/// </summary>
[JsonProperty("upload")]
public string UploadUrl { get; set; }
/// <summary>
/// A reference to a SystemProperties metadata object with a type of upload.
/// </summary>
[JsonProperty("uploadFrom")]
public SystemProperties UploadReference { get; set; }
/// <summary>
/// Detailed information about the file stored by Contentful.
Expand Down