Commit graph

4 commits

Author SHA1 Message Date
Samuel Clay
d96ed5db54 Big change to tryfeed. Handling sites that the user isn't subscribed to now downloads them successfully. Useful for sharing stories on feeds you do not subscribe to. 2012-04-19 22:38:00 -07:00
Samuel Clay
8f0afbb7c2 All setup module items now disappear/appear or show a Done title appropriately. 2012-03-19 14:15:38 -07:00
Samuel Clay
8ef2bf31b1 Merge branch 'master' into social
* master:
  Re-styling the crap out of all taskbar buttons. Much more streamlined now.
  Tweaking the living crap out of the intelligence control's colors. Lightened.
  User feedback: hiding positive and negative unread counts in title if there are no unread stories outside of neutral.
  Correcting typo in dupe feed resolution.
  Local settings in fabfile.
  Fixing up a minor detail in the new intelligence control.
  Rewriting intelligence slider to be an intelligence control (segmented control). Should make a ton more intuitive sense.
  Trying to fix IE troubles by forcing single requests per read story.
  Fixing nginx conf to support ssl.
  Adding PID files to gitignore.
  Ignoring files.
  Adding certificates to ignore.
  Adding https to nginx.

Conflicts:
	media/css/reader.css
	media/js/newsblur/common/assetmodel.js
2012-02-10 09:24:48 -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_tutorial.js (Browse further)