This is just a bandaid PR so the main PR only reflects changes made during week 2. - #21
Merged
jnf merged 70 commits intoAug 13, 2015
Conversation
Twitter feed/edm+acw
…an we thought it would be. Yay.
…#search and feeds#people.
Model tests
can now add a user to twitter people followed.
…ore into assassinate-people
…ate people, use ugly but cool polymorphic path to kill people.
… response, but response isn't formatted correctly yet.
…ore into ninjaparty/master
Instagram feed - can retrieve feed information to display
Revised feeds_controller to deal with merge conflict
…stagram has_many InstagramPosts. User has_many InstagramPosts through Instagram.
… requests by media id and updated path for HTTParty in instagrams controller so that it would work with the updated INSTAGRAM_URI. Revised method for showing feed for instagram posts in feeds controller.
…gram post_id in db. The post_id is used to retrieve instagram data for each post in the db, then display it.
Author
|
See #10 for original discussion and review. |
jnf
added a commit
that referenced
this pull request
Aug 13, 2015
This is just a bandaid PR so the main PR only reflects changes made during week 2.
catchingash
pushed a commit
that referenced
this pull request
Feb 25, 2016
…lkers Adds indices to grams + tweets tables
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.