Commit graph

142 commits

Author SHA1 Message Date
Samuel Clay
284c0aafbe Fixing bug when setting autofollow_friends to false when the user has not setup any twitter/fb login details. 2012-08-12 16:50:42 -07:00
Samuel Clay
9cc0b80a76 Freshening homepage on social subs too. 2012-08-09 20:42:04 -07:00
Samuel Clay
b15dc457f6 Adding social launch email. 2012-08-09 19:50:47 -07:00
Samuel Clay
15df6b6b47 Making the icon importer a bit faster and more slave lag resilient by using page fetch data. Also fixing title on blurblogs. 2012-07-30 11:12:58 -07:00
Samuel Clay
1b96b97163 Extending permissions for facebook. 2012-07-29 23:53:02 -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
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
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
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
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
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
2c69fc7edc Merge branch 'social' into redis
* social:
  Fixing interactions and activities to only pull what's necessary. Otherwise doubles show up in android + ios.
  Updating the shortcut text for sidebar collapsing.
2012-07-18 23:08:43 -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
0d5a16dc15 Finishing sort by oldest/newest and show only unread/all stories. 2012-07-18 20:19:54 -07:00
Samuel Clay
db49bb35b5 Adding user profile/preferences to flat feeds (for android and ios). 2012-07-13 18:42:44 -07:00
Samuel Clay
cdf42f323e Adding elapsed time to all requests logging. 2012-07-13 14:56:12 -07:00
Samuel Clay
803278bb08 Updating celery calls in prep for upgrade to celery 3.0. 2012-07-12 23:58:29 -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
a8c9862385 Moving new user and new premiums to background task. 2012-07-05 22:20:49 -07:00
Samuel Clay
05ec54c61c The Simpsons commit. Adding X-headers so everybody who visits NewsBlur gets that Simpsons boost, whether they know it or not. 2012-07-05 18:30:16 -07:00
Samuel Clay
8be6f106ed Only one dashboard date migration needed. 2012-04-21 18:50:34 -07:00
Samuel Clay
2bb48300f7 Merge branch 'master' into social
* master:
  Adding dashboard date to master to apply to both social and new accounts on master.
2012-04-21 18:44:52 -07:00
Samuel Clay
690849df82 Adding dashboard date to master to apply to both social and new accounts on master. 2012-04-21 18:44:47 -07:00
Samuel Clay
74bb4780ea Adding dashboard date and auto-highlighting new interactions, to be cleared on dashboard view. 2012-04-21 18:20:49 -07:00
Samuel Clay
deff56dc76 Fixing username changes. 2012-04-20 08:45:29 -07:00
Samuel Clay
40c8171f42 Fixing broken paging on user activities. 2012-04-19 19:18:22 -07:00
Samuel Clay
6053de66be Fixing broken paging on user activities. 2012-04-19 19:17:06 -07:00
Samuel Clay
31d18752f2 Merge branch 'master' into social
* master:
  Changing the color of sql duration times in debug logging. Yeah, nobody but me will see this, but boy is it pretty. Ask me sometime and I'd love to show you my insanely colorful logs.
  Correctly handling story that lack titles but have content. Using a parsed and shucked truncation of content in place of missing titles.
  Sanity check on deleted feeds.
  Read it Later -> Pocket
  Read it Later -> Pocket

Conflicts:
	media/js/newsblur/reader/reader.js
2012-04-17 12:12:41 -07:00
Samuel Clay
e281e1ee91 Changing the color of sql duration times in debug logging. Yeah, nobody but me will see this, but boy is it pretty. Ask me sometime and I'd love to show you my insanely colorful logs. 2012-04-17 12:12:05 -07:00
Samuel Clay
afdf766a1c Checking case-insensitive invites. 2012-04-16 14:43:36 -07:00
Samuel Clay
aa42f098cf Adding a ton of activities. Fixing numerous bug saround interactions. 2012-04-16 11:21:52 -07:00
Samuel Clay
4612bedb49 Adding paging to interactions and activities on dashboard. 2012-04-12 11:18:56 -07:00
Samuel Clay
4cf027d135 Typos 2012-04-11 17:21:33 -07:00
Samuel Clay
ce18a4eab7 Adding beta email. Sending out a slow trickle of invites... 2012-04-11 17:13:54 -07:00
Samuel Clay
15e08e653a Hooking up starred stories and new subscription activities. 2012-04-11 15:53:53 -07:00
Samuel Clay
451485d32e Splitting interactions into public/private interactions and activities. 2012-04-11 12:14:18 -07:00
Samuel Clay
b9d8b91f6d Showing interactions in module. Adding interactivity. 2012-04-10 18:24:57 -07:00
Samuel Clay
3f7810287b Refactoring features module and adding interactions module + model. Stubbed in interactions module. 2012-04-09 17:20:47 -07:00
Samuel Clay
3c31c0c6a6 Merge branch 'master' into social
* master:
  Adding MongoDB logging for debug.
  Being far kinder during feed exception handling and showing users error text. Cannot believe this wasn't there.

Conflicts:
	media/css/reader.css
	templates/base.html
	utils/json_functions.py
2012-04-06 18:35:40 -07:00
Samuel Clay
2ab37d20e1 Adding MongoDB logging for debug. 2012-04-06 18:28:26 -07:00
Samuel Clay
fca70d9e60 Nulling fields for profile that don't work in prod yet. 2012-03-21 12:28:51 -07:00
Samuel Clay
637f4201b8 Replacing tutorial_finished boolean bakc in db so I can run development and production against the same db. 2012-03-20 11:15:40 -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
e7f32ad3c3 Fixing tryfeed for social subs. 2012-03-14 17:48:28 -07:00
Samuel Clay
cb1bbe25bc Merge branch 'master' into social
* master:
  Adding press story.
  Fixing forgot password links by blanking out old passwords.
  Document the key to toggle read/unread
2012-03-12 09:00:28 -07:00
Samuel Clay
546f22acfb Fixing forgot password links by blanking out old passwords. 2012-03-11 13:26:57 -07:00
Samuel Clay
98b45a5e84 Autofollowing preference now saved. 2012-03-07 16:32:02 -08:00