Commit graph

1681 commits

Author SHA1 Message Date
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
43045a85d7 Adding full delete user capability. Also removing social beta invite system in prep for launch. 2012-07-28 18:33:07 -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
ff439834c5 Preventing dupe favorites from showing up in activities and interactions. 2012-07-28 13:16:18 -07:00
Samuel Clay
dffdfa75a6 Fixing interactions on favorites, replies (to include titles), and wording in api docs. 2012-07-28 12:37:16 -07:00
Samuel Clay
8eb106612a Converting replies from original messages to reply ids. Also delaying emails on new replies and reshares so authors can change typos. Also dong a much better job with checking for dupe emails so no dupes ever get sent out. 2012-07-27 18:58:35 -07:00
Samuel Clay
2657d714b8 Fixing about 4 bugs that have to do with logging, activating broken premiums, and importing from google reader when the user already has feeds and they aren't being cleared out (broken since friday july 20th, a week ago). Thanks to Luke Dieker for the find. 2012-07-27 12:46:37 -07:00
Samuel Clay
22582e16e9 Fixing bug in unsharing a story. 2012-07-27 10:17:04 -07:00
Samuel Clay
c3c71a7060 Using the correct id when sending emails for new replies. 2012-07-26 23:22:35 -07:00
Samuel Clay
0f1bc37fab The backwards commit. Putting back in old slow river and hiding preferences for order and read filter. This needs to run silently in the background for 2 weeks in order to work. Starting now. 2012-07-26 22:25:56 -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
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
87e471de98 Typo on new global read story key. 2012-07-25 18:26:17 -07:00
Samuel Clay
e6f8157745 Fixing issue around saving new stories to redis. Also adding redis middleware to introspect raw redis calls. 2012-07-25 17:58:00 -07:00
Samuel Clay
e55ef31744 Fixing mongo db raw log to ignore system messages. 2012-07-25 16:58:56 -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
36b3fa92c1 Using wrong cut off for read story deletions. 2012-07-24 22:58:49 -07:00
Samuel Clay
719a88d3e0 Merge branch 'social' into redis
* social:
  Sharing stories from Saved Stories now works if the story has been deleted. Thanks to @ojiikun for the find.
2012-07-24 17:27:29 -07:00
Samuel Clay
01c7a1f638 Sharing stories from Saved Stories now works if the story has been deleted. Thanks to @ojiikun for the find. 2012-07-24 17:27:24 -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
8ca02af7cd Adding sync for user stories and subscriptions for easy shell conversion of users to redis. 2012-07-23 15:16:25 -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
a86dce0dc6 Fixing /social/public_comments to grab public comments. 2012-07-23 13:08:48 -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
0fc1d1f327 Fixing order for river, but hiding read filter (so no All Stories for folders). 2012-07-23 12:09:48 -07:00
Samuel Clay
a1549aa290 Adding a touch of error handling in redis stories. 2012-07-23 10:44:32 -07:00
Samuel Clay
4aaa01ea24 Merge branch 'social' into redis
* social:
  Adding beta site to test redis.
  Fixing logo size.
2012-07-23 10:28:20 -07:00
Samuel Clay
2f8ceeb113 Adding beta site to test redis. 2012-07-23 10:28:15 -07:00
Samuel Clay
71f03f1ccd Merge branch 'social' into redis
* social:
  Better watching for story changes. This is both a speed improvement and usability fix, since now stories that haven't changed recently but did change before will no longer be declared as updated every time they are fetched. Props to @textfiles for the push.
2012-07-22 12:25:13 -07:00
Samuel Clay
72892f0a2b Better watching for story changes. This is both a speed improvement and usability fix, since now stories that haven't changed recently but did change before will no longer be declared as updated every time they are fetched. Props to @textfiles for the push. 2012-07-22 12:25:09 -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
1872b0a091 Adding compacting to user sub folders, to remove dupe subscriptions. 2012-07-20 20:37:35 -07:00
Samuel Clay
351b2763c1 Clearing folders and decoding unicode. 2012-07-20 20:02:37 -07:00
Samuel Clay
d3b58e7cc9 Deferring OPML import if it takes > 20 seconds. Email user when complete. Also, hamburgers. This one's for @torrez. 2012-07-20 19:43:28 -07:00
Samuel Clay
09b7b44ab3 Merge branch 'social' into redis
* social:
  Adding youtube video embeds back in.
  Allowing empty email to be set.
  Fixing issue in munin postgres fabfile.
  Adding postgres standby commands + munin.
2012-07-20 11:18:28 -07:00
Samuel Clay
f8e0f46ea2 Allowing empty email to be set. 2012-07-20 10:39:14 -07:00
Samuel Clay
19734cdc5e Merge branch 'social' into redis
* social:
  Fixing tall floats pulling comments and shares into the story.
  Ignore requests errors and just try urllib fallback.
  Fixing bug where custom css would disappear.
  Don't delete old stories, screws up blurblogs.

Conflicts:
	apps/reader/models.py
2012-07-19 23:31:46 -07:00
Samuel Clay
0acefb2465 Adding blurblog redis story id sets. 2012-07-19 23:29:11 -07:00
Samuel Clay
345bce1e7c Merge branch 'master' into social
* master:
  Ignore requests errors and just try urllib fallback.
2012-07-19 21:29:18 -07:00