public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-08-05 16:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6169 commits 2 branches 0 tags 863 MiB
Commit graph

789 commits

Author SHA1 Message Date
Samuel Clay
f1bfcaa1aa Little bit of future padding for new charts. 2013-05-20 17:29:28 -07:00
Samuel Clay
1e1433de06 Merge branch 'master' into circular 
* master:
  Fixing fabfile.
  Fixing bug where dupe feed has no link.
 2013-05-15 17:46:49 -07:00
Samuel Clay
f5eac30a5a Fixing bug where dupe feed has no link. 2013-05-15 17:21:10 -07:00
Samuel Clay
fd148e106f Merge branch 'master' into circular 
* master:
  Temporarily commenting out story hash switching on read stories because of massive redis locking.
 2013-05-15 17:13:11 -07:00
Samuel Clay
88d474d62b Temporarily commenting out story hash switching on read stories because of massive redis locking. 2013-05-15 17:13:06 -07:00
Samuel Clay
be3bc8d16b Merge branch 'master' into muserstory_remove 
* master:
  Typo on duplicate feed saving truncation.
  Adding duplicate feed address+link truncation.
  Adding duplicate feed address+link truncation.
 2013-05-15 16:06:26 -07:00
Samuel Clay
ede28f2373 Merge branch 'master' into circular 
* master:
  Typo on duplicate feed saving truncation.
 2013-05-15 15:43:10 -07:00
Samuel Clay
44b4559d0b Typo on duplicate feed saving truncation. 2013-05-15 15:43:07 -07:00
Samuel Clay
f21f8231bf Merge branch 'master' into circular 
* master:
  Adding duplicate feed address+link truncation.
 2013-05-15 15:41:43 -07:00
Samuel Clay
3a0cded0d9 Adding duplicate feed address+link truncation. 2013-05-15 15:41:39 -07:00
Samuel Clay
21ad2d400e Merge branch 'master' into circular 
* master:
  Adding duplicate feed address+link truncation.
 2013-05-15 15:40:43 -07:00
Samuel Clay
f6f053b285 Adding duplicate feed address+link truncation. 2013-05-15 15:40:38 -07:00
Samuel Clay
be33aba026 Merge branch 'muserstory_remove' into circular 
* muserstory_remove:
  Removing story blurblog permalink, making it called explicitly.

Conflicts:
	apps/social/views.py
 2013-05-14 16:38:28 -07:00
Samuel Clay
7068119208 Removing story blurblog permalink, making it called explicitly. 2013-05-14 16:36:03 -07:00
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
dd6e33ac33 Merge branch 'master' into circular 
# By Samuel Clay (2) and ojiikun (2)
* master:
  Adding node group to fabfile.
  Fix crash on empty use pictures.
  Correcting for feedburner stupidity.
  Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.
 2013-05-14 16:01:34 -07:00
Samuel Clay
9a5a4f9562 Merge branch 'master' into muserstory_remove 
# By Samuel Clay (1) and ojiikun (1)
* master:
  Correcting for feedburner stupidity.
  Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.
 2013-05-13 18:56:15 -07:00
Samuel Clay
f7f9565756 Correcting for feedburner stupidity. 2013-05-13 15:41:58 -07:00
Samuel Clay
b98d129d1b Removing MUserStory entirely. 2013-05-10 16:11:30 -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
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
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
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
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
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
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