Commit graph

1097 commits

Author SHA1 Message Date
Samuel Clay
6ebaa81ea1 Merge branch 'muserstory_remove' into circular
* muserstory_remove:
  Adding node group to fabfile.
  Using popular instead of homepage user to suggest new users to follow.
  Cleaning up unused detritus. Ready to deploy.
  Final cleanup before deploying.
  Removing MUserStory entirely.
2013-05-14 16:11:44 -07:00
Samuel Clay
26ffd0782f Using dev instead of www. 2013-05-13 18:33:38 -07:00
Samuel Clay
c74fad0feb www -> dev for press. 2013-05-13 18:26:09 -07:00
Samuel Clay
9e6ce31550 Addung RNewUserQueue, an automatically emptying new user queue. Forcing all new users to go through paywall. 2013-05-13 18:03:17 -07:00
Samuel Clay
d38e28f8da Merge branch 'master' into muserstory_remove
* master:
  Publishing realtime update when marking feed as read, only if it was actually marked as read.
  Turning off real-time on mark_feed_as_read. Too much!
2013-05-13 15:09:22 -07:00
Samuel Clay
4f1ffcaa98 Merge branch 'master' into circular
* master:
  Publishing realtime update when marking feed as read, only if it was actually marked as read.
2013-05-13 14:22:56 -07:00
Samuel Clay
ceff5929be Publishing realtime update when marking feed as read, only if it was actually marked as read. 2013-05-13 14:22:49 -07:00
Samuel Clay
66ff837fc5 Merge branch 'master' into circular
* master:
  Turning off real-time on mark_feed_as_read. Too much!
2013-05-13 13:22:24 -07:00
Samuel Clay
9ad6fa2c9d Turning off real-time on mark_feed_as_read. Too much! 2013-05-13 13:21:51 -07:00
Samuel Clay
b98d129d1b Removing MUserStory entirely. 2013-05-10 16:11:30 -07:00
Samuel Clay
7b2ae49ca6 Merge branch 'master' into circular
* master:
  Keeping read_status consistent as an integer, not a boolean.
2013-05-10 13:50:56 -07:00
Samuel Clay
b44b126b41 Keeping read_status consistent as an integer, not a boolean. 2013-05-10 13:50:38 -07:00
Samuel Clay
a8e672d09c Merge branch 'master' into ruserstory
* master:
  Removing unnecessary redis sync call on feed load.
  Android 1.3.2.
2013-05-10 12:41:28 -07:00
Samuel Clay
3df5918f6e Merge branch 'master' into circular
* master:
  Removing unnecessary redis sync call on feed load.
2013-05-09 17:36:35 -07:00
Samuel Clay
91c31d4c80 Removing unnecessary redis sync call on feed load. 2013-05-09 17:36:30 -07:00
Samuel Clay
24201a496b Merge branch 'ruserstory' into circular
* ruserstory:
  Adding real-time update on marking feed as read.
  Remvoing unused everything_unread param from river stories.
  Using story_hashes instead of fetch_stories parameter.
  Moving read stories over to RUserStory when merging feeds.
  Cleaning up MUserStory imports.
  Speeding up blurblog sub counter b yonly using unread stories instead of all stories since a certain date.
  Speeding up unread story counts.
  Speeding up unread story counts.
  Adding force calculate sub scores option.
  Showing starred and shared status on global/river blurblog.
  Fixing global feed to show read stories.
  Fixing reading stories in river blurblog.
  Moving river blurblog to no longer use MUserStory.
  Adding MUserStory back in when reading and unreading, to maintain backwards compatibility.
  Fully converting feeds and folders to use redis-only read stories (removing MUserStory). Still need to do socialsubs.

Conflicts:
	apps/reader/views.py
	apps/social/models.py
2013-05-09 17:00:30 -07:00
Samuel Clay
71aa961262 Adding real-time update on marking feed as read. 2013-05-09 16:42:58 -07:00
Samuel Clay
0483273840 Remvoing unused everything_unread param from river stories. 2013-05-09 16:40:06 -07:00
Samuel Clay
cc5d87f795 Using story_hashes instead of fetch_stories parameter. 2013-05-09 16:16:14 -07:00
Samuel Clay
d1cb05a09e Fixing reading stories in river blurblog. 2013-05-03 15:08:12 -07:00
Samuel Clay
670625acf6 Adding MUserStory back in when reading and unreading, to maintain backwards compatibility. 2013-05-02 17:42:04 -07:00
Samuel Clay
ed017514e6 Fully converting feeds and folders to use redis-only read stories (removing MUserStory). Still need to do socialsubs. 2013-05-02 16:49:44 -07:00
Samuel Clay
c01d8e7ba9 Using new story_hashes instead of story object ids. 2013-05-01 14:33:12 -07:00
Samuel Clay
b6e84c1a9a Merge branch 'story_hash_2' into circular
* story_hash_2:
  Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.
  Fixing Global shared stories by checking for missing story hashes properly.
  Using index in msharedstory search.
  Using new story_hashes instead of story object ids.

Conflicts:
	apps/social/models.py
2013-05-01 13:47:57 -07:00
Samuel Clay
e1b04bd041 Using new story_hashes instead of story object ids. 2013-04-29 15:27:22 -07:00
Samuel Clay
ce933b6013 Removing stupid debugging line. 2013-04-23 11:54:19 -07:00
Samuel Clay
e91c642a58 Moving story loading indicator into story traversal controls. Adding mail icon. Cleaning up segmented controls. 2013-04-23 11:52:34 -07:00
Samuel Clay
2412dc8b4e Merge branch 'master' into circular
* master:
  Fixing huge bug in mark_feed_read for socialsubs.
  Increasing logging on read social sub stories.
  Shift+a to mark as read for blurblogs.
  Shift+a to mark as read for blurblogs.
  Marking as read covers both socialsubs and feeds.

Conflicts:
	apps/reader/views.py
2013-04-22 13:53:56 -07:00
Samuel Clay
fc06797747 Marking as read covers both socialsubs and feeds. 2013-04-22 13:30:29 -07:00
Samuel Clay
4a0b698b95 Adding socialsubs to mark all as read. 2013-04-22 11:25:04 -07:00
Samuel Clay
48cab9ac20 Unread counts only for logged in users. 2013-04-15 15:43:54 -07:00
Samuel Clay
046429a024 Fixing story email in dev. 2013-04-15 15:43:18 -07:00
Samuel Clay
817c0cbfec Merge branch 'master' into circular
* master:
  Adding some crazy refresh logging.
2013-04-14 20:44:59 -07:00
Samuel Clay
3e7ec958ea Adding some crazy refresh logging. 2013-04-14 20:44:47 -07:00
Samuel Clay
c75bb15e48 Merge branch 'master' into circular
* master:
  Syncing redis on 1% of feed loads.
  Cutting off syncable stories.
  Adding pipeline for redis sync on usersub.
  Adding user+feed user story sync, to be used soon on feed requests to clean out users read stories.
  Forcing pipeline to flush every 1000 stories.
2013-04-08 18:40:11 -07:00
Samuel Clay
1f51941027 Syncing redis on 1% of feed loads. 2013-04-08 18:40:05 -07:00
Samuel Clay
c42689a99e Merge branch 'master' into circular
* master:
  Cleaning up queue migration.
  Handling decayed feeds with no more active subscribers. They don't get returned to the scheduled_updates queue until there are enough active users.
  Only need next scheduled update.
  Fixing feeds that fall through.
  Moving task queue from postgres db backed to redis backed.
2013-04-03 16:08:29 -07:00
Samuel Clay
9d7aeb1a51 Merge branch 'master' into queue
# By Samuel Clay (2) and Lance Johnson (1)
# Via Lance Johnson (2) and Samuel Clay (2)
* master:
  Adding feed id to feed selector.
  Giving error on empty mark read endpoint.
  Fix duplicate feed listing bug and fix issus with remembering folder collapse/expande perferences in main feed list view
2013-04-03 15:25:22 -07:00
Samuel Clay
5bca0ecb36 Merge branch 'master' into circular
# By Samuel Clay (2) and Lance Johnson (1)
# Via Lance Johnson (2) and Samuel Clay (2)
* master:
  Adding feed id to feed selector.
  Giving error on empty mark read endpoint.
  Fix duplicate feed listing bug and fix issus with remembering folder collapse/expande perferences in main feed list view
2013-04-02 16:26:36 -07:00
Samuel Clay
add5187529 Giving error on empty mark read endpoint. 2013-04-02 09:36:43 -07:00
Samuel Clay
842afe7068 Handling decayed feeds with no more active subscribers. They don't get returned to the scheduled_updates queue until there are enough active users. 2013-04-01 15:45:22 -07:00
Samuel Clay
07d1fcb207 Fixing feeds that fall through. 2013-04-01 12:21:00 -07:00
Samuel Clay
2f49cb3a07 Merge branch 'master' into circular
* master:
  Fixing port for real-time over SSL.
  Fixing port for real-time over SSL.
  Fixing broken CSS line.
  Boosting feed fetches.
  Premiums users with no active feeds should get all of their feeds activated.
2013-03-25 14:42:45 -07:00
Samuel Clay
4e178b12dd Premiums users with no active feeds should get all of their feeds activated. 2013-03-25 13:01:04 -07:00
Samuel Clay
fa2ad949ab Merge branch 'master' into circular
* master:
  Locking the mouse indicator by default.
  Grabbing forced refresh feeds.
  Fixing pgsql backup.
  Fixing autologin with no next param.
  Bootstrapping redis sessions.
  Using redis pipeline for speeeeed in django db sessions -> redis sessions.
  Adding redis session pool and migration script for sessions.
  Redis session db.
2013-03-21 11:09:09 -07:00
Samuel Clay
41709f0696 Fixing autologin with no next param. 2013-03-21 10:35:38 -07:00
Samuel Clay
b3744e3ac6 Merge branch 'master' into circular
* master:
  Warning on missing maintenance.
  Further pushing out feed updates.
  Using @dcramer's excellent getsentry.com for all exceptions. Turning off exception emails.
  Further pushing down feed fetches to handle load until db is scaled out.
  Scrolling code blocks.
  New task servers.
  Turning down feed fetches.
  If requests.raw won't work, sut fudge it with a StringIO for now.
  Further turning down feed fetches until mongo is ready to replicate.
  Fixing Facebook image calculation.
  Fixing facebook posting.
  Moving shared story unread recalc to background task. Will greatly speed up sharing.
  Ramping down feed fetching until they can be handled.
  Only show time breakdown when > 1 sec.
  Fixed API docs for /reader/river_stories
  make fabfile.py use requirements.txt
  Make sure to send the proper content-type with social feeds
  Restore default whitespace to pre/code blocks
  Phase 2: switching to using story_hash index instead of compound unique story_feed_id/story_guid index.
  document keyboard shortcut to add site/folder

Conflicts:
	apps/social/views.py
2013-03-20 10:49:09 -07:00
Samuel Clay
2ec2e8cbb1 Only show time breakdown when > 1 sec. 2013-03-19 13:53:58 -07:00
Samuel Clay
e15bf40fdc Merge branch 'master' into circular
* master:
  Fixing homepage copy.
  Using redisstore for socketio.
  Forcing reconnection for socket.io.
  Upgrading node modules.
  Reconnecting to socket.io when disconnected or failing reconnection.
  Updating website copy to show /year instead of .
  Upgrading socket.io, widening reconnection delay.

Conflicts:
	media/js/newsblur/reader/reader.js
2013-03-15 18:58:54 -07:00
Samuel Clay
6114aaefe4 Reconnecting to socket.io when disconnected or failing reconnection. 2013-03-15 17:05:44 -07:00