Skip to content

Commit

Permalink
merging master
Browse files Browse the repository at this point in the history
  • Loading branch information
Dustin Noyes committed Nov 12, 2018
2 parents 6181247 + 902bb5b commit 22565ca
Show file tree
Hide file tree
Showing 74 changed files with 1,256 additions and 10,970 deletions.
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
<a href="https://gitter.im/AWS-Amplify/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link" target="_blank">
<img src="https://badges.gitter.im/aws/aws-amplify.png" alt="Gitter Chat" />
</a>
<a href="https://npmjs.org/aws-amplify">
<img src="https://img.shields.io/npm/dm/aws-amplify.svg" alt="npm downloads" height="18">
</a>
<a href="https://codecov.io/gh/aws-amplify/amplify-js">
<img src="https://codecov.io/gh/aws-amplify/amplify-js/branch/master/graph/badge.svg" />
</a>
Expand All @@ -32,7 +29,7 @@ [email protected] has structural changes. For details please check [Amplify Modulari
### Features / APIs

- [__Authentication__](https://aws.github.io/aws-amplify/media/authentication_guide): APIs and building blocks for developers who want to create user authentication experiences.
- [__Analytics__](https://aws.github.io/aws-amplify/media/analytics_guide): Easily collect analytics data for you app. Analytics data includes user sessions and other custom events that you want to track in your app.
- [__Analytics__](https://aws.github.io/aws-amplify/media/analytics_guide): Easily collect analytics data for your app. Analytics data includes user sessions and other custom events that you want to track in your app.
- [__API__](https://aws.github.io/aws-amplify/media/api_guide): Provides a simple solution when making HTTP requests. It provides an automatic, lightweight signing process which complies with AWS Signature Version 4.
- [__GraphQL Client__](https://aws.github.io/aws-amplify/media/api_guide#configuration-for-graphql-server): Interact with your GraphQL server or AWS AppSync API with an easy to use & configure GraphQL client.
- [__Storage__](https://aws.github.io/aws-amplify/media/storage_guide): Provides a simple mechanism for managing user content for your app in public, protected or private storage buckets.
Expand Down Expand Up @@ -345,7 +342,7 @@ Storage.put(key, fileObj, {level: 'private'})
.then (result => console.log(result))
.catch(err => console.log(err));

// Store data with specifying its MIME type
// Stores data with specifying its MIME type
Storage.put(key, fileObj, {
level: 'private',
contentType: 'text/plain'
Expand Down
2 changes: 1 addition & 1 deletion docs/media/analytics_guide.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<meta http-equiv="refresh" content="0; URL='https://aws-amplify.github.io/docs/js/analytics'" />
<meta http-equiv="refresh" content="0; URL='https://aws-amplify.github.io/docs/js/analytics'" />
Loading

0 comments on commit 22565ca

Please sign in to comment.