Commit graph

346 commits

Author SHA1 Message Date
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
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
fb006020e3 Adding blurblog oldest/unread order/filter redis support. Includes migration for shared stories. 2012-07-24 17:16:10 -07:00
Samuel Clay
8ae842b5bb Merge branch 'social' into redis
* social:
  Unescaping incorrectly escaped and linkified comments and replies.
  Hiding blurblogs from people who have not shared any stories.
2012-07-23 23:23:41 -07:00
Samuel Clay
6f482e7296 Capping single feeds in river at 200 stories. 2012-07-23 20:30:38 -07:00
Samuel Clay
fb6e3218ba Hiding blurblogs from people who have not shared any stories. 2012-07-23 18:36:18 -07:00
Samuel Clay
d74f71b63c Allowing redis to read 1 day into the future, because that's life and some people can time travel and publish at a time not yet passed. 2012-07-23 15:36:09 -07:00
Samuel Clay
42b80e8a88 Fixing redis bug with shared story dates not yet in the model. 2012-07-23 13:24:04 -07:00
Samuel Clay
f27049bbb6 Merge branch 'social' into redis
* social:
  Fixing /social/public_comments to grab public comments.
  Adding ISO date to comments and replies at @secretsquirrel's request.
2012-07-23 13:20:04 -07:00
Samuel Clay
569f098936 Updating redis sync's to only include current stories. Also syncing redis on story insta-fetch. 2012-07-23 13:06:12 -07:00
Samuel Clay
3ae86a7e14 Adding ISO date to comments and replies at @secretsquirrel's request. 2012-07-23 12:49:16 -07:00
Samuel Clay
a1549aa290 Adding a touch of error handling in redis stories. 2012-07-23 10:44:32 -07:00
Samuel Clay
2b2ef7f15c Merge branch 'social' into redis
* social:
  Auto-linkifying comments and replies, and stripping html from comments, replies, and story titles, tags, and authors.
  Adding compacting to user sub folders, to remove dupe subscriptions.
  Clearing folders and decoding unicode.
  Typo in gunicorn conf.
  Only using appropriate number of gunicorn processes, making this machine agnostic.
  Deferring OPML import if it takes > 20 seconds. Email user when complete. Also, hamburgers. This one's for @torrez.
  Adding vps roles to fabfile.

Conflicts:
	apps/reader/views.py
	apps/social/models.py
2012-07-21 16:43:23 -07:00
Samuel Clay
18428a32a1 Auto-linkifying comments and replies, and stripping html from comments, replies, and story titles, tags, and authors. 2012-07-21 16:38:37 -07:00
Samuel Clay
0acefb2465 Adding blurblog redis story id sets. 2012-07-19 23:29:11 -07:00
Samuel Clay
4383b1148d Fixing interactions and activities to only pull what's necessary. Otherwise doubles show up in android + ios. 2012-07-18 23:06:43 -07:00
Samuel Clay
7be638a735 Fixing typo in social interactions api endpoint. 2012-07-16 18:11:46 -07:00
Samuel Clay
5adc74cd5d Activities and Interactions for favoriting shared story comments. 2012-07-15 19:29:05 -07:00
Samuel Clay
497f610056 Adding likes/favorites to comments. Still needs interaction history and perhaps an email. 2012-07-15 17:59:19 -07:00
Samuel Clay
8d8514080f Fixing bugs around follow information. 2012-07-13 15:32:27 -07:00
Samuel Clay
febd0ae0a3 Lots of little bugs: avatar images, icon importer, page importer, adding analytics tracking to intro. 2012-07-12 12:57:35 -07:00
Samuel Clay
75337a65fb Fixing following bug due to array truncation of following list. 2012-07-12 01:21:09 -07:00
Samuel Clay
9b5d9bdea9 Fixing bug when a story changes its guid (like on a tumblr rename), but it still thinks it has comments. Forcing each story to recount its comments if comments are claimed, just in case. 2012-07-11 10:52:50 -07:00
Samuel Clay
01c2ae46f1 Showing social service fetch status in real-time (actually polling every 3 seconds) in both intro and friends dialogs. 2012-07-11 00:43:53 -07:00
Samuel Clay
87350c5bc5 Trying to outwit IE by adding in a fake console. 2012-07-10 15:37:39 -07:00
Samuel Clay
bf8f474abf Adding sync status and tasking facebook/twitter friend imports. 2012-07-10 15:24:54 -07:00
Samuel Clay
bfbcf54d80 Showing Twitter/Facebook posting links more prominently. 2012-07-10 14:43:33 -07:00
Samuel Clay
64d607d7e9 Fully customizable blurblogs: title, background color, and custom css. 2012-07-10 00:17:45 -07:00
Samuel Clay
07bd7f5c94 Adding in a collection to track sent emails so new follow emails don't go out more than once per day. 2012-07-09 13:55:29 -07:00
Samuel Clay
c9efa52f89 Fixing broken interactions object in /social/interactions. 2012-07-09 12:50:46 -07:00
Samuel Clay
2fa6f847b5 Restyling the crap out of the blurblog header. Still needs a follow button. 2012-07-06 19:54:33 -07:00
Samuel Clay
c3145486f0 Adding error handling to social page. Looks pretty classy. 2012-07-06 14:41:20 -07:00
Samuel Clay
b0402f293c Adding re-share emails that go to the source if the re-share adds comments. 2012-07-05 19:50:02 -07:00
Samuel Clay
6a3cba1581 Adding emails for new replies to comments. 2012-07-05 18:29:38 -07:00
Samuel Clay
feadee3c5f Posting replies (and handling error cases) on blurblogs. 2012-07-03 17:00:09 -07:00
Samuel Clay
a82492f928 Big conversion from only displaying friends comments to showing both friends and public, still separated. Big design changes to comments on blurblogs, as well. 2012-07-03 12:53:56 -07:00
Samuel Clay
1efd8fca47 Fixing issues around sharing and unsharing a story when the user is attributed as the source by another user, so their profile still needs to come down the pipe, even though they are no longer sharing the story. 2012-07-02 10:40:45 -07:00
Samuel Clay
1e044b07e8 Showing share and save buttons (that don't do much). 2012-07-01 18:34:34 -07:00
Samuel Clay
642d323fdb Fixing a half dozen issues around adding folders, sharing stories, and infinite loops on prefetches. 2012-06-30 11:59:17 -07:00
Samuel Clay
db3a809dd1 Adding first JS to blurblogs: loading public comments. 2012-06-29 21:06:33 -07:00
Samuel Clay
8897836021 Adding links to blurblogs. Fixing favicons to take any feed, not just subscribed feeds. 2012-06-28 21:11:35 -07:00
Samuel Clay
bc229afb14 Fixing usernames and missing avatars in new follower emails. 2012-06-28 13:01:31 -07:00
Samuel Clay
75eb93b7b0 Adding common followers to new follower email. 2012-06-28 10:14:42 -07:00
Samuel Clay
16781c6450 Adding post to twitter/facebook during share. Also adding email for new followers, which includes common followers and common followings. 2012-06-27 23:57:57 -07:00
Samuel Clay
75d574990b Removing self from followers. 2012-06-27 16:46:30 -07:00
Samuel Clay
ef9cfddc6f Fixing small bugs around social source ids, unsharing, and story mods on original blurblog. 2012-06-26 19:19:57 -07:00
Samuel Clay
7e9d2f8055 Mark story as unshared. 2012-06-20 20:53:32 -07:00
Samuel Clay
f969fbf45b Correctly rendering, updating, and flashing changes to feeds. 2012-05-22 15:02:37 -07:00