fix bug, file wasn't added
Merge branch 'master' of https://github.com/tyrbo/tunefish into sub_modal
Merge branch 'youtube-subs' of https://github.com/wfro/tunefish into sub_modal
ember is talking to rails for subscriptions
Fixed a broken img link on the landing page.
Changed the auth window to use a different URL if in production
youtube subscriptions show up in youtube modal
Removed belongs_to from activity serializer
Fixed the open auth window thing that I broke.
Better naming in youtube_subscription_spec.rb
Fixed omniauth and various prod/dev env settings
subscriptions have a tracked or untracked status in ember
ember updates rails models when changed
stylized modal
:
resolve merge conflicts
remove youtube subscription routes and templates
Updating environment for ember and the sidekiq redis settings
Fixed our API endpoints to point to the proper location in production
Merge pull request #24 from allisonlarson/sub_modal

Sub modal
Move saving additional provider info down to models

This part is likely subject to change for twitter once we start figuring out oauth
tokens and secrets for twitter.  It was a temporary workaround to make
the requests based on twitter nicknames, as those requests are covered
under general discovery (but not feasible long term, we need to
authenticate on behalf of a user).