2441 commits

Author	SHA1	Message	Date
Samuel Clay	d509568442	Fixing Global Feed on dev.	2013-05-08 17:46:50 -07:00
Samuel Clay	a6bc5e68f4	Merge branch 'master' into circular ... # By Samuel Clay (4) and ojiikun (1) * master: ES requires valid url. Overriding haystack elasticsearch url. Removing Redis autocomplete. Upgrading elasticsearch. Using haystack and elasticsearch for a third autocomplete feature. Refactor/fix mark-as-read-while-reading workflow.	2013-05-08 12:23:14 -07:00
Samuel Clay	777d5a5e9c	Removing Redis autocomplete. Upgrading elasticsearch.	2013-05-08 12:23:10 -07:00
Samuel Clay	365e0c2813	Using haystack and elasticsearch for a third autocomplete feature.	2013-05-08 12:23:09 -07:00
Samuel Clay	4ae44c02bc	Merge branch 'master' into circular ... * master: Preventing infinite loop on merged dupe feeds.	2013-05-07 16:23:34 -07:00
Samuel Clay	d91cc66178	Preventing infinite loop on merged dupe feeds.	2013-05-07 16:23:30 -07:00
Samuel Clay	1d4ad3b3be	Merge branch 'master' into circular ... * master: Migrating comment feeds to non-comment feeds.	2013-05-07 15:37:46 -07:00
Samuel Clay	5ceb0c45bf	Migrating comment feeds to non-comment feeds.	2013-05-07 15:37:36 -07:00
Samuel Clay	774028d0d6	Merge branch 'master' into circular ... * master: Disallowing branched feeds from feed search.	2013-05-07 11:37:21 -07:00
Samuel Clay	477d928d70	Disallowing branched feeds from feed search.	2013-05-07 11:37:01 -07:00
Samuel Clay	0cbf23fdf2	Handling errors correctly in account settings dialog.	2013-05-06 15:21:17 -07:00
Samuel Clay	007481ebff	Handling username changes for users with no passwords.	2013-05-06 15:12:18 -07:00
Samuel Clay	af75b90509	Merge branch 'master' into circular ... * master: Removing sparse constraint on MStory's story_hash index. Goodbye old stories that didn't make the cut. Adding optional force param to sub counter.	2013-05-04 19:50:50 -07:00
Samuel Clay	e27b7f5688	Removing sparse constraint on MStory's story_hash index. Goodbye old stories that didn't make the cut.	2013-05-04 19:03:02 -07:00
Samuel Clay	b54c062442	Adding optional force param to sub counter.	2013-05-03 17:42:41 -07:00
Samuel Clay	23a7aa84d7	Merge branch 'master' into circular ... * master: Using story cache when calculating unreads, for those who need unread counts updating.	2013-05-03 13:17:07 -07:00
Samuel Clay	550a33d9ab	Using story cache when calculating unreads, for those who need unread counts updating.	2013-05-03 09:43:21 -07:00
Samuel Clay	2f99f03e0d	Merge branch 'master' into circular ... * master: Fixing bug in autocomplete returning lost feeds. Conflicts: apps/rss_feeds/views.py	2013-05-02 18:09:00 -07:00
Samuel Clay	89c3b5222e	Fixing bug in autocomplete returning lost feeds.	2013-05-02 18:06:04 -07:00
Samuel Clay	191738b621	Merge branch 'master' into circular ... * master: Fixing issue where user agent doesn't exist. Change crossover to narrow view from 700 to 720px. Conflicts: media/js/newsblur/reader/reader.js	2013-05-02 17:52:59 -07:00
Samuel Clay	2e6f1af4a2	Fixing issue where user agent doesn't exist.	2013-05-02 17:52:21 -07:00
Samuel Clay	75059d7dd1	Merge branch 'preshard' into circular ... * preshard: Removing unused redis story objectid db. Force all feed queries to use redis.	2013-05-02 12:33:27 -07:00
Samuel Clay	009010f879	Removing unused redis story objectid db.	2013-05-02 12:27:37 -07:00
Samuel Clay	0ff3d41c09	Force all feed queries to use redis.	2013-05-02 11:27:33 -07:00
Samuel Clay	f3e43c3f38	Merge branch 'master' into circular ... * master: 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. Updating Android from v1.3 to v1.3.1, fixing duplicate All Site Stories bug. Conflicts: apps/social/models.py	2013-05-01 14:37:14 -07:00
Samuel Clay	49245ce9e3	Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.	2013-05-01 14:33:12 -07:00
Samuel Clay	38d01df4ab	Fixing Global shared stories by checking for missing story hashes properly.	2013-05-01 14:33:12 -07:00
Samuel Clay	ed1e71e407	Using index in msharedstory search.	2013-05-01 14:33:12 -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	3889517bfd	Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.	2013-04-30 16:59:02 -07:00
Samuel Clay	e19c0851fd	Fixing Global shared stories by checking for missing story hashes properly.	2013-04-30 15:49:44 -07:00
Samuel Clay	d44018e900	Using index in msharedstory search.	2013-04-30 15:28:00 -07:00
Samuel Clay	ed0a7cf969	Merge branch 'master' into story_hash_2 ... * master: Switching to real prod database for migration. Fixing story hash migration to run by user.	2013-04-29 18:05:42 -07:00
Samuel Clay	a36f453ffd	Switching to real prod database for migration.	2013-04-29 18:05:33 -07:00
Samuel Clay	284dd23ef5	Switching to real prod database for migration.	2013-04-29 18:04:48 -07:00
Samuel Clay	97041dece7	Merge branch 'master' into circular ... * master: Fixing story hash migration to run by user. Adding story_hash to starred stories, user stories, and shared stories. Adding redis backup script.	2013-04-29 18:00:55 -07:00
Samuel Clay	97a6768d67	Fixing story hash migration to run by user.	2013-04-29 18:00:43 -07:00
Samuel Clay	eb0faefadb	Merge branch 'story_hash_1' into story_hash_2 ... * story_hash_1: Adding story_hash to starred stories, user stories, and shared stories.	2013-04-29 16:07:24 -07:00
Samuel Clay	8d516fc493	Adding story_hash to starred stories, user stories, and shared stories.	2013-04-29 16:07:08 -07:00
Samuel Clay	e1b04bd041	Using new story_hashes instead of story object ids.	2013-04-29 15:27:22 -07:00
Samuel Clay	66b7fa5af2	Merge branch 'master' into circular ... * master: If a feed has no stories, don't choke on latest story.	2013-04-23 21:23:01 -07:00
Samuel Clay	fbe5f4422e	If a feed has no stories, don't choke on latest story.	2013-04-23 21:22:49 -07:00
Samuel Clay	070591de35	Merge branch 'master' into circular ... * master: Upping to 5000 feeds per minute.	2013-04-23 21:17:11 -07:00
Samuel Clay	6a3d043ced	Upping to 5000 feeds per minute.	2013-04-23 21:17:03 -07:00
Samuel Clay	42b85d485a	Merge branch 'schedule' into schedule_dev ... * schedule: Adding metric for last story date, used to calculate next scheduled update.	2013-04-23 17:04:27 -07:00
Samuel Clay	1584208677	Adding metric for last story date, used to calculate next scheduled update.	2013-04-23 17:04:21 -07:00
Samuel Clay	b076f3a120	Merge branch 'schedule' into schedule_dev ... * schedule: Correcting for premiums being counted twice.	2013-04-23 16:03:51 -07:00
Samuel Clay	9f8009632a	Correcting for premiums being counted twice.	2013-04-23 16:03:45 -07:00
Samuel Clay	15160bcc74	Merge branch 'schedule' into schedule_dev ... * schedule: Use average stories per month in calc.	2013-04-23 15:58:08 -07:00