Commit graph

330 commits

Author SHA1 Message Date
Samuel Clay
5eebcfc546 Merge branch 'master' into story_hash_2
# By Samuel Clay (10) and others
* master:
  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.
  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
  document keyboard shortcut to add site/folder
2013-03-20 10:22:30 -07:00
Samuel Clay
459065e80e Merge pull request #100 from gms8994/master
Adds content_type header to /social/rss/ requests
2013-03-19 18:09:24 -07:00
Samuel Clay
d9289bd3c8 Merge branch 'master' into story_hash_2
* master:
  Moving shared story unread recalc to background task. Will greatly speed up sharing.
  Ramping down feed fetching until they can be handled.
2013-03-19 16:21:13 -07:00
Samuel Clay
b2e52858ea Moving shared story unread recalc to background task. Will greatly speed up sharing. 2013-03-19 16:14:19 -07:00
Glendon Solsberry
bffe3b11df Make sure to send the proper content-type with social feeds 2013-03-19 08:12:48 -04:00
Samuel Clay
bf167044b0 Posting to ADN inline until deployed. 2013-03-02 13:50:44 -08:00
Samuel Clay
a2c1eb8ae3 Phase 2: switching to using story_hash index instead of compound unique story_feed_id/story_guid index. 2013-02-20 16:08:14 -08:00
Samuel Clay
deebd9b8d9 New comment headers and borders. 2013-02-20 12:03:06 -08:00
Samuel Clay
35f6b70a0f Fixing caching issue in social pages. 2013-02-20 11:31:21 -08:00
Samuel Clay
9ceda47532 Fixing limits on social page. 2013-02-20 11:15:10 -08:00
Samuel Clay
1531218eba Fixing popular blurblogs limit. 2013-02-12 17:13:13 -08:00
Samuel Clay
0b19cd3d46 Fixing limit issues on blurblogs. 2013-01-31 17:36:48 -08:00
Samuel Clay
a066a75eda Rearranging icons. 2013-01-31 12:20:53 -08:00
Samuel Clay
6a1beb3c6f Interactions count badge. 2013-01-30 18:28:37 -08:00
Samuel Clay
e33287bc23 Fixing global paging. 2013-01-23 16:05:43 -08:00
Samuel Clay
32bbf79b0e Correcting URLs and timezones for global stories on circular. 2013-01-23 14:39:03 -08:00
Samuel Clay
5651113a73 Stripping .dev in subdomain. 2013-01-23 14:31:08 -08:00
Samuel Clay
89a1c75b0a Adding Global and Popular tabs. 2013-01-23 14:21:16 -08:00
Samuel Clay
6652492de3 Adding blurblog banner. 2013-01-11 15:51:21 -08:00
Samuel Clay
d7cb43c7ce Editing of replies on blurblogs. Needs delete. 2013-01-10 20:50:43 -08:00
Samuel Clay
33f6a58083 Commenting and replying on blurblogs. Needs reply edit and delete. 2013-01-10 19:44:18 -08:00
Samuel Clay
0e7d729aa6 Renaming NC- to NB-. Fixing paging. Lots of small tweaks. 2013-01-10 17:32:05 -08:00
Samuel Clay
c1725399b2 Merge branch 'master' into circular
* master: (28 commits)
  Adding logging to photo uploading.
  Undoing some broken changes on reading.
  Adding avatar photo uploading.
  Moving bakc to Verdana for Windows font. Ugh, this has to be fixed somehow.
  Fixing deactivation of expired premiums.
  Forgot password flow. Holy crap, this took two years.
  Bumping up duplicate address length for feeds.
  Submitting v1.8 to iOS App Store.
  Fixing db firewall ports.
  Preparing original pages node server for launch.
  Adding font size choices to web preferences.
  Closing #66 with both integration of #68 and using the same fonts. Users can add an optional class if they want these other convenient fonts. Also using a few fonts as backups for non-Mac users.
  Fix default theming hook
  Add multiple targeted font stacks
  Fixing #75: shared stories should use story permalink, not story guid. Doh. Thanks @denubis!
  Categorizing preferences. Adding window title count back in.
  Adding email lookup to forgot password flow.
  Adding email lookup to forgot password flow.
  Removing unused original pages from S3 when stored on node server.
  Refactoring original page saving toa ccount for node server being down.
  ...
2013-01-09 12:54:26 -08:00
Samuel Clay
9303e3d6fb Adding logging to photo uploading. 2013-01-08 14:30:41 -08:00
Samuel Clay
4dd1d10d5a Adding avatar photo uploading. 2013-01-08 14:11:59 -08:00
Samuel Clay
c144469b8b Fixing #75: shared stories should use story permalink, not story guid. Doh. Thanks @denubis! 2013-01-06 16:09:58 -08:00
Samuel Clay
3d12b24042 Merge branch 'master' into circular
* master: (589 commits)
  Adding delete user flow. About time, since I'm sick of doing this myself.
  Deractivating premiums.
  Adding a lock for the intelligence slider for focus stories. If the user selects focus and there are actually focus stories, lock it for the future when there are no unread focus stories.
  Uppiung the find next unread story titles page limit from 12 to 50.
  Hiding folders with no unread stories in Unread/Focus mode.
  Adding autocomplete to emailing a story dialog.
  Using queue for scheduling feed fetches on load.
  Renaming celerybeat supervisor task.
  Fixing insta-fetching.
  Attempting to correctly save duplicate feeds.
  Adding tons of logging (especially user-facing) to feed exception handling. Much much better feed address and link fetch history.
  New enterprise ios build includes full training.
  Changing intelligence training on social feeds to apply to original feed as well.
  Using a popover for training on the iPad. Also adding the train button to the bottom of every story.
  Finishing training on iPad. Works in river too. Just need to test social and it's shipping.
  Fixing title selectin bug when the title was too short to register the selection loupe.
  Training feeds and stories in feeds. Needs testing on ipad, in river, and on social.
  Finish look and feel of ios training for both story and feed. Just need to send requests, redraw intelligence, recount and reclassify stories, and update scores. All already written to support inline training.
  A few more log color tweaks.
  Adding clean stories task. Updating log colors.
  ...

Conflicts:
	.gitignore
	apps/reader/views.py
	apps/social/views.py
	templates/social/social_page.xhtml
	templates/social/social_story.xhtml
	templates/social/story_comments.xhtml
2013-01-03 12:00:09 -08:00
Samuel Clay
f3edf21500 A few more log color tweaks. 2012-12-26 20:03:46 -08:00
Samuel Clay
c223fa892c Adding clean stories task. Updating log colors. 2012-12-26 20:00:38 -08:00
Samuel Clay
327b300fe0 Trying out finding by id for shared stories for when the original story is gone. 2012-12-13 17:49:07 -08:00
Samuel Clay
f9918a4917 Fixing numerous exceptions. Story training when not having a story selected. Forbidden RSS feeds throwing exceptions instead of 403s. 2012-12-12 14:24:51 -08:00
Samuel Clay
dac88c0a25 Adding a better API view decorator for required paramters, their types, and http method used. 2012-12-12 13:58:10 -08:00
Samuel Clay
85d7ff2920 Fixing broken story sharing 2012-12-12 09:08:00 -08:00
Samuel Clay
f4b7d1f72b Being explicit about shared attributes. 2012-12-11 18:27:51 -08:00
Samuel Clay
315628094d Fixing broken story sharing when there are conflicts in shared stories. No longer misattributed source and date when the story no longer exists. 2012-12-11 18:24:24 -08:00
Samuel Clay
ec3f8ded9e Typo 2012-11-30 16:14:22 -08:00
Samuel Clay
c6f50c2ac0 Exposing global feed. 2012-11-30 15:55:05 -08:00
Samuel Clay
6cc67d90a5 Changing global feed to still be relative to the user. 2012-11-30 15:42:15 -08:00
Samuel Clay
9508f1402d Preparing global shared stories feed. 2012-11-30 14:28:55 -08:00
Samuel Clay
2bda6c3e80 Showing follow status in profile. 2012-11-29 10:21:33 -08:00
Samuel Clay
105dd1f576 Merge branch 'master' into ios_story
* master:
  Adding blurblog permalink to story on blurblog. Adding story slug to permalink. Fixing story guid hashes.
  Re-enabling message property for facebook.
  Ignoring image for facebook shares.
  Commenting out facebook share message until they approve it.
  Cleaning up Facebook og description.
  Facebook using a website instead of article.
2012-11-27 12:28:22 -08:00
Samuel Clay
931d4bc991 Adding blurblog permalink to story on blurblog. Adding story slug to permalink. Fixing story guid hashes. 2012-11-27 11:59:54 -08:00
Samuel Clay
8607fa69f9 Cleaning up Facebook og description. 2012-11-26 17:26:01 -08:00
Samuel Clay
ab265c0899 Merge branch 'master' into ios_story
* master:
  Facebook being a PITA.
  Facebook wants ISO8601 datetime format.
  Facebook doesn't like going to other URLs.
  Facebook doesn't like going to other URLs.
  Dumb typo in new facebook og crap.
  Using blurblog permalink for new facebook shares.
  Fixing Facebook share to use fancy actions.
  Adding scroll to comments button to share bar. Thanks @afita.
  Turning off microformats for more errors.
  Fixing errors in timeouts to show the correct error. Also fixing microformats parsing issue and allow IPv6 URLs in enclosures to be ignored, fixing a bunch of feeds.
  Cleaning redis stories for 1% of all feed fetches.
  Refreshing feed on fetch.
  Fiddling with logging on dupe feeds.
  New share by facebook.
2012-11-26 15:03:09 -08:00
Samuel Clay
8fad5de228 Facebook wants ISO8601 datetime format. 2012-11-26 14:23:28 -08:00
Samuel Clay
ea917dcf1f Facebook doesn't like going to other URLs. 2012-11-26 14:17:28 -08:00
Samuel Clay
ad5274eda4 Dumb typo in new facebook og crap. 2012-11-26 14:07:46 -08:00
Samuel Clay
76430575e3 Merge branch 'master' into facebook_share
* master: (107 commits)
  Adding scroll to comments button to share bar. Thanks @afita.
  Turning off microformats for more errors.
  Fixing errors in timeouts to show the correct error. Also fixing microformats parsing issue and allow IPv6 URLs in enclosures to be ignored, fixing a bunch of feeds.
  Cleaning redis stories for 1% of all feed fetches.
  Refreshing feed on fetch.
  Fiddling with logging on dupe feeds.
  Adding bs facebook assets.
  Better to push together than to spread apart. Diffing html is hard.
  Changing logging colors for social activities.
  Delaying Paypal return, fixing privacy css, and adding convenience function.
  Adding esc shortcut key in keyboard shortcuts. Also turning on privacy features for public beta testing.
  Fixing the missing story titles bug. Turns out it happens when a story title is loaded twice but the reuslting map contains an undefined, which nullifies the rest of the stories. Doh!
  Fixing hostname for Firefox content handler.
  Adding share info to saved stories.
  Revert "Failing marking a story as read in ios now shows an error."
  Failing marking a story as read in ios now shows an error.
  Consistency b/w ios and web for unsaving a story.
  Adding unread counter to All Sites.
  Allowing regular users to change read_filter on socialfeeds.
  Changing icons on welcome page.
  ...
2012-11-26 13:42:55 -08:00
Samuel Clay
97e0881ccb Fixing sharing and comments and replying with new page controls. 2012-11-13 12:28:16 -08:00
Samuel Clay
217dc139ae Fixing a few exceptions. 2012-10-31 13:31:37 -07:00