public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6221 commits 16 branches 12 tags 925 MiB
Commit graph

799 commits

Author SHA1 Message Date
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
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
Samuel Clay
0b6a5bd7ce Use average stories per month in calc. 2013-04-23 15:58:02 -07:00
Samuel Clay
cb89798d74 Merge branch 'schedule' into schedule_dev 
* schedule:
  Complete rewrite of feed update schedule.
  Forcing earlier fetch if stats calc is less than scheduled fetch.
 2013-04-23 15:45:03 -07:00
Samuel Clay
630029cfcb Complete rewrite of feed update schedule. 2013-04-23 15:44:31 -07:00
Samuel Clay
2b991fd031 Forcing earlier fetch if stats calc is less than scheduled fetch. 2013-04-23 13:46:07 -07:00
Samuel Clay
5f4cbe41cf Merge branch 'master' into circular 
* master:
  Fixing small bug for feeds that have no feed link.
 2013-04-19 11:10:52 -07:00
Samuel Clay
e24a30bbed Fixing small bug for feeds that have no feed link. 2013-04-19 11:09:31 -07:00
Samuel Clay
23ad62c6d2 Merge branch 'master' into circular 
* master:
  Fixing credit card images. Doh\!
  Upping feed fetching.
  Removing random interval in feed fetches.
  No longer random intervals for dead feeds.
  Fixing mark as unread in redis hash migration.
  Fix group type caching in FolderList, and much refactoring for readability therein.
  Remove special All Stories group and make the now-visible root folder perform it's function.
  Formalize top-level folder name workaround.
  Nonfunctional refactoring in list adapter (unused vars, method visibilities, annotations).
  Fix an initialization edge case in creating column/resource ID mappings.
  Fix regression in API to get /reader/feeds and set update_counts to true.
  Factor out duplicate code in APIClient to ensure parameterized GETs behave like bare GETs.
  Refactor FolderListFragment and associated Adapter.
  Fix bad merge.
  Remove accidentally added swapfile.
  Removed missing root feed workaround. Refactoring FolderListFragment for readability.
  Clean up parsing of /reader/feeds response and work around problems with empty-named root folder.
  Fix NPE crash when adding new feed.

Conflicts:
	apps/rss_feeds/views.py
 2013-04-19 09:52:34 -07:00
Samuel Clay
7468a8e305 Upping feed fetching. 2013-04-18 17:19:27 -07:00
Samuel Clay
5db1cebecf Removing random interval in feed fetches. 2013-04-18 16:56:54 -07:00
Samuel Clay
2d1a81694a No longer random intervals for dead feeds. 2013-04-18 16:47:55 -07:00
Samuel Clay
9b1e2da689 Merge branch 'master' into circular 
* master:
  Clearing shared stories from popular.
  Fixing autocomplete errors when feed address is invalid.

Conflicts:
	apps/social/models.py
 2013-04-17 15:18:59 -07:00
Samuel Clay
409b829d24 Fixing autocomplete errors when feed address is invalid. 2013-04-17 09:04:45 -07:00
Samuel Clay
f9b98e3a2d Merge branch 'master' into circular 
* master:
  Boosting the hell out of feed fetches.
 2013-04-16 16:07:47 -07:00
Samuel Clay
cafab8c86b Boosting the hell out of feed fetches. 2013-04-16 11:49:37 -07:00
Samuel Clay
976a5f15d1 Merge branch 'master' into circular 
* master:
  Upping feed fetches.
  Adding meta refresh to maintenance page.
  Adding work to fabfile. Changing deploy to deploy_code.
 2013-04-15 19:26:45 -07:00
Samuel Clay
45e137b22c Upping feed fetches. 2013-04-15 19:26:41 -07:00
Samuel Clay
f6b5262c4f Merge branch 'master' into circular 
* master:
  Fixing small bug around missing feeds during update pipeline.
  Fixing race condition between primary adn secondaries when creating feed fetch histories.
  Reversing order for fetch histories.
  Moving from feed/page/push histories to capped fetch history.

Conflicts:
	apps/rss_feeds/views.py
 2013-04-15 15:17:29 -07:00
Samuel Clay
2ccd7b6cfe Fixing race condition between primary adn secondaries when creating feed fetch histories. 2013-04-15 15:09:04 -07:00
Samuel Clay
abbc05660f Reversing order for fetch histories. 2013-04-15 14:38:43 -07:00
Samuel Clay
6011e4f2da Moving from feed/page/push histories to capped fetch history. 2013-04-15 14:30:31 -07:00
Samuel Clay
8c55fe2491 Merge branch 'master' into circular 
* master:
  Beginning big redis migration from story objectid to story guid hash.
 2013-04-13 22:31:15 -07:00
Samuel Clay
1b482a78c6 Beginning big redis migration from story objectid to story guid hash. 2013-04-13 22:31:05 -07:00
Samuel Clay
e9f7fdd4cc Merge branch 'master' into circular 
* master:
  Dumb, dumb bug causing division by zero errors because the autocomplete boost was 0.
  Upping feed fetches.
 2013-04-13 19:44:48 -07:00
Samuel Clay
13616665c1 Dumb, dumb bug causing division by zero errors because the autocomplete boost was 0. 2013-04-13 19:44:43 -07:00
Samuel Clay
3eaad16adf Upping feed fetches. 2013-04-12 17:41:18 -07:00
Samuel Clay
74d39a4de1 Merge branch 'master' into circular 
* master:
  Further pushing up feed fetches. Let the good times roll.
 2013-04-11 16:57:16 -07:00
Samuel Clay
bd2ad514ea Further pushing up feed fetches. Let the good times roll. 2013-04-11 16:57:10 -07:00
Samuel Clay
3c84e79ec6 Merge branch 'master' into circular 
* master:
  Upping feed fetching (4->3, still need 3->2 and 2->1) before I crank it.
 2013-04-11 13:41:54 -07:00
Samuel Clay
4ee659a1a4 Upping feed fetching (4->3, still need 3->2 and 2->1) before I crank it. 2013-04-11 13:41:44 -07:00
Samuel Clay
54a8366813 Merge branch 'master' into circular 
* master:
  Adding support for automatically converting google alerts.
 2013-04-10 19:15:01 -07:00
Samuel Clay
ccb6d38fa3 Adding support for automatically converting google alerts. 2013-04-10 19:14:19 -07:00
Samuel Clay
ce29e7688d Merge branch 'master' into circular 
* master:
  Rejiggering autocomplete to only include > 10 subs.
  Have RegisterProgressFragment finished via noHistory Manifest option rather than hackish finish with Fragment. Improve comments
  Fix registration regression bug caused by #151
  Fix for #159 force close during add feed (auto complete) now that is is enabled again
  Remove log call from DeleteFeedFragment
  Fix #140. Delete feed now works and confirmation dialog has been added.
  Fix issue where selection within stories was hidden
 2013-04-10 11:28:43 -07:00
Samuel Clay
20c089175b Rejiggering autocomplete to only include > 10 subs. 2013-04-10 11:23:03 -07:00
Samuel Clay
eddcf1eddb Merge branch 'master' into circular 
* master:
  Using regular expressions for comment stripping, unless the feed has an error count, in which case switch to lxml.
 2013-04-08 16:15:29 -07:00
Samuel Clay
47c2257ef7 Using regular expressions for comment stripping, unless the feed has an error count, in which case switch to lxml. 2013-04-08 16:14:48 -07:00
Samuel Clay
404969ad6a Merge branch 'master' into circular 
* master:
  Switch to lxml for comment stripping.
 2013-04-08 15:45:01 -07:00
Samuel Clay
33e605875e Switch to lxml for comment stripping. 2013-04-08 15:38:23 -07:00
Samuel Clay
b29fd7c8c1 Merge branch 'master' into circular 
* master:
  Moving to 1 feed per task queue (from 12).
 2013-04-08 14:39:15 -07:00
Samuel Clay
9565c27784 Moving to 1 feed per task queue (from 12). 2013-04-08 14:39:00 -07:00