Commit graph

7 commits

Author SHA1 Message Date
Samuel Clay
ffaa20be66 Merge branch 'master' into social
* master:
  Adding send raw email link to Email Dialog. Thanks to @tylast for the idea.

Conflicts:
	media/js/newsblur/reader/reader_send_email.js
2012-04-25 18:19:26 -07:00
Samuel Clay
bef8fbd6ee Fixing broken cancel button on send email dialog. 2012-04-20 08:39:40 -07:00
Samuel Clay
d27da6cfb0 Fixing broken email dialog. 2012-04-11 18:09:35 -07:00
Samuel Clay
8519d68c36 Including feeds that a user isn't subscribed to in social feeds. Also adding a new url for feed icons. 2012-01-26 18:59:40 -08:00
Samuel Clay
b9cf65c834 Merge branch 'master' into social
* master:
  Renaming static.tar to static.tgz to reflect its gzippedness.
  Fixing ghost unread counts on folder when last story in a feed is read.
  Fixing link to scipy-superpack. (Thanks @boursier)
  Handling negative feature page bug. Also showing server errors on bad emails.
  Fixing missing username in dupe USF.
  Handling errors on river in client. Also fixing starred stories.
  Suppressing error on starring an already starred story.
  Re-enabling mobile site. /m/
  Fixing typo in aggressive feed fetching.
  No longer being aggressive about finding a feed's correct address if it returns a 400 or 500 error code, unless it is still the first run or an exception refresh.
  Adding SSL to nginx conf.

Conflicts:
	apps/reader/views.py
	assets.yml
	media/js/newsblur/reader/reader.js
2012-01-23 17:53:59 -08:00
Samuel Clay
594ce3c469 Merge branch 'master' into social
* master:
  Saving last used recipient email address as a cookie.

Conflicts:
	assets.yml
2012-01-16 10:38:29 -08:00
Samuel Clay
9ea6ee9086 Rearranging javascript. Also backbonizing user models for follower and following collections. 2012-01-04 09:42:35 -08:00
Renamed from media/js/newsblur/reader_send_email.js (Browse further)