Commit graph

771 commits

Author SHA1 Message Date
Samuel Clay
116b976b51 Completing flow for sharing using bookmarklet. Just needs to actually share the story, then show shared stories in sidebar. 2012-08-24 14:34:53 -07:00
Samuel Clay
8bb6ff00b7 Cleaning up bookmarklet layout a bit. 2012-08-19 17:24:37 -07:00
Samuel Clay
c2c983ee81 Adding share api calls to bookmarklet. 2012-08-17 23:29:17 -07:00
Samuel Clay
0a1c974c41 Merge branch 'master' into bookmarklet
* master: (376 commits)
  Removing redis db accidentally committed.
  Removing non-ipad changes. -SC
  Adding source attribution in river blurblog. Also changing default view for new users to Feed.
  Cleaning up feed calculation in feed fetching.
  Turning on mongodb replication lag watcher.
  Forcing the feed fetcher to not count scores when there's replica lag. God this had better work.
  Collecting replication lag statistics, to be used to count unreads.
  Typo
  Removing all removal of read stories, so that they stick around for blurblogs. No good answer for this one.
  Fixing comments on river.
  final v1.5
  Moving read date to use shared date.
  final bug squashes
  semi final changes before launch
  Adding signup activity for iPad and web.
  make addsite a popover
  Adding monit for celery on db. Fixing push subscription issue with changing feed ids.
  polishing up first time user experience and fixing sharing nulls
  ftux ui
  adding in first time user experience fixes
  ...
2012-08-17 16:10:19 -07:00
Samuel Clay
6b93ead2e0 Adding signup activity for iPad and web. 2012-08-15 18:35:55 -07:00
Samuel Clay
60f1f6f4cd Adding monit for celery on db. Fixing push subscription issue with changing feed ids. 2012-08-15 17:02:55 -07:00
Samuel Clay
48e405f138 Adding narrow view for Feed view. 2012-08-14 14:39:28 -07:00
Samuel Clay
8925db975b Adding gray icons for twitter/facebook crossposting shares. 2012-08-14 14:39:16 -07:00
Samuel Clay
99976d6f18 Probably a bit too much in one commit: allowing categories to be specified in interactions and activities calls so the iPad won't get category types it doesn't know how to handle. Also added twitter/facebook buttons to comment share on blurblogs. 2012-08-14 00:26:42 -07:00
Samuel Clay
9f233a595b Moving buttons and resurfacing recommended site. 2012-08-13 21:32:47 -07:00
Samuel Clay
7f95a65b8e Fixing a profile bug for new users so their social profile comes through. 2012-08-13 17:06:16 -07:00
Samuel Clay
f05a915d53 Adding error handling to Google Reader import. Fixing extra-wide images in Feed view. Speeding up NewsBlur Blog subscribe. Fixing popular tags. 2012-08-12 20:34:30 -07:00
Samuel Clay
8b0ecf5535 Styling share buttons. 2012-08-12 15:19:41 -07:00
Samuel Clay
c25578c335 Showing correct avatars on blurblogs. 2012-08-12 12:23:50 -07:00
Samuel Clay
89e917e18f Changing colors on share buttons to increase sharing. 2012-08-12 10:52:21 -07:00
Samuel Clay
28d3842776 Two sides to the share bookmarklet. 2012-08-11 17:18:35 -07:00
Samuel Clay
73721f2fb7 Formatting article. 2012-08-11 14:54:44 -07:00
Samuel Clay
4689b47a4e Cleaning up text on share bookmarklet. 2012-08-11 13:53:00 -07:00
Samuel Clay
4892e14f29 OAuth -> OAuth 2! For a better feed import experience. 2012-08-10 23:15:16 -07:00
Samuel Clay
a538816978 Cleanup on aisle 4. 2012-08-09 10:34:41 -07:00
Samuel Clay
90050a795b New comments and shares header on blurblogs. 2012-08-08 19:53:27 -07:00
Samuel Clay
9fac515c1c Rearranging comments and shares in shares bar. Moving sharing bar to top of story. 2012-08-08 19:13:26 -07:00
Samuel Clay
18bade6733 Adding river blurblogs. Still fishy, but it's pulling stories. Going to try to dev it. 2012-08-07 14:37:07 -07:00
Samuel Clay
0ea2cba95a Big changes to blurblogs. Editing comments inline. Deleting comments inline. Removing sideoptions on blurblogs. Streamlining. Robusticizing. Shipping. 2012-08-06 17:52:33 -07:00
Samuel Clay
d8d9c027e3 Truncating story content on blurblogs. 2012-08-02 19:04:20 -07:00
Samuel Clay
9cbb21c91d Moving Oldest-first date from mark_read_date to 2 weeks ago, everytime. 2012-08-01 21:57:55 -07:00
Samuel Clay
acf50174cc Adding endbar padding for the locked mouse indicator folks. Also fixing river issues. And bookmarklet on over aggressive svbtle blog styling. 2012-08-01 12:38:32 -07:00
Samuel Clay
9b343f0104 Cleaning profile data (stripping html). Also sorting find friends. 2012-07-31 23:44:20 -07:00
Samuel Clay
529ab39169 Updating About and FAQ. 2012-07-29 22:20:07 -07:00
Samuel Clay
926432d684 New about page! 2012-07-29 22:06:43 -07:00
Samuel Clay
b7733c71e9 Adding global preference for read filtering (unread/all) and story order (oldest/newest). Fixing colored log. Fixing story by email. 2012-07-29 21:07:03 -07:00
Samuel Clay
90f746d1ff Tons of small styling cleanups. Also fixing refresh throttling. 2012-07-29 00:49:34 -07:00
Samuel Clay
c9645cdd95 New API endpoint: /social/remove_comment_reply. Does what it says. Also integrated into the web. 2012-07-28 22:36:50 -07:00
Samuel Clay
e453ec5c17 Changing colors all over the place. Adding esc keyboard shortcut to return to dashboard. 2012-07-28 20:12:12 -07:00
Samuel Clay
12ec0d1f05 Simplifying dashboard by including current user's profile photo, linking to their profile. 2012-07-28 19:53:38 -07:00
Samuel Clay
215816a15d Restyling the crap out of interactions and activities. Converting old interactions and activities to all use the new feed_id parameter. Also resizing dashboard. 2012-07-28 16:41:17 -07:00
Samuel Clay
e79a4ebc01 Allow the feed list pane to be resized narrower than before. Also hiding intelligence controls text if too narrow. 2012-07-27 13:25:30 -07:00
Samuel Clay
01fd83ccb5 Adding the last necessary pieces for redis to handle blurblogs. Now to strip out oldest/unread filter and put back in the old river so it can be merged upstream. 2012-07-26 22:12:48 -07:00
Samuel Clay
b4d603fd0c Merge branch 'social' into redis
* social:
  Fixing layout issue on intelligence control. Scrolling to active feed on intelligence change.
2012-07-26 21:14:31 -07:00
Samuel Clay
e7389f521d Fixing layout issue on intelligence control. Scrolling to active feed on intelligence change. 2012-07-26 18:35:24 -07:00
Samuel Clay
722bfb8174 Merge branch 'social' into redis
* social:
  BIG CHANGE: Moving from intelligence traffic light to All/Unread/Focus, just like the iPad. Wonderful.
2012-07-26 18:25:44 -07:00
Samuel Clay
ee2085732b BIG CHANGE: Moving from intelligence traffic light to All/Unread/Focus, just like the iPad. Wonderful. 2012-07-26 18:24:41 -07:00
Samuel Clay
c4dc6a1ae1 Merge branch 'social' into redis
* social:
  Refactoring social profiles so that even new users have profiles. Thanks to @roycyang's new db setup for finding all of this.
  Fixing bug if a user has no social profile.

Conflicts:
	apps/social/views.py
2012-07-25 23:58:01 -07:00
Samuel Clay
8f28065154 Refactoring social profiles so that even new users have profiles. Thanks to @roycyang's new db setup for finding all of this. 2012-07-25 23:57:10 -07:00
Samuel Clay
c90ea21b10 Refactoring manage menu items to only show selected background color on hover for real menu items, not subitems (like site controls). 2012-07-25 19:11:59 -07:00
Samuel Clay
57393ead72 Merge branch 'social' into redis
* social:
  Fixing mail tempaltes to center everything. Mac OS X 10.8 broke centering in the new Mail.app.
  Showing better error messages for front-end users.
  Better time breakdowns on site loading.
  Slightly altering styling on feed chooser hamburgers.
  Rewriting new user email. Animating hamburgers.
  Adding images to all footer links.

Conflicts:
	apps/reader/views.py
2012-07-25 16:43:10 -07:00
Samuel Clay
10f6c2008b Showing better error messages for front-end users. 2012-07-25 14:03:15 -07:00
Samuel Clay
38e9b4e490 Better time breakdowns on site loading. 2012-07-25 11:36:28 -07:00
Samuel Clay
5223073aa5 Slightly altering styling on feed chooser hamburgers. 2012-07-25 00:27:16 -07:00
Samuel Clay
fb49b4f0ee Rewriting new user email. Animating hamburgers. 2012-07-25 00:20:36 -07:00