Commit graph

4653 commits

Author SHA1 Message Date
Samuel Clay
2400794306 Fixing payment date. 2012-12-03 16:12:13 -08:00
Samuel Clay
8cf18d93e8 Handling username changes on payment history. 2012-12-03 16:02:59 -08:00
Samuel Clay
367336beb8 Fixing typo on year. 2012-12-03 15:51:17 -08:00
Samuel Clay
e9544084f4 Calculating payment history for all premium users. 2012-12-03 15:48:40 -08:00
Samuel Clay
e71e4a9e84 Keeping payment history uptodate based on signals. 2012-12-03 15:17:35 -08:00
Samuel Clay
20401fefab Showing payment history. 2012-12-03 15:03:47 -08:00
Samuel Clay
b87bb34073 Adding models for payment history. 2012-12-03 14:35:21 -08:00
Samuel Clay
8dcc19cbbe Styling price on homepage. 2012-11-30 18:38:55 -08:00
Samuel Clay
14afae14c3 Adding privacy to pricing. 2012-11-30 18:05:27 -08:00
Samuel Clay
3b83569c2d Gradientizing the header background so it looks good before the image loads. 2012-11-30 18:02:33 -08:00
Samuel Clay
bc7b745096 Restyling the header and footer backgrounds. Cleaning the styles. 2012-11-30 17:48:57 -08:00
Samuel Clay
ec3f8ded9e Typo 2012-11-30 16:14:22 -08:00
Samuel Clay
16045f2411 Marking global social stories as read even if the user is not subscribed to them. 2012-11-30 16:12:40 -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
5f38cc30f1 Moving saved stories to the bottom. 2012-11-29 13:10:11 -08:00
Samuel Clay
72eef3825f Spacing 2012-11-29 13:00:05 -08:00
Samuel Clay
58a6e3b73e Fixing missing stories for feeds that have no unread stories. 2012-11-29 10:41:02 -08:00
Samuel Clay
2bda6c3e80 Showing follow status in profile. 2012-11-29 10:21:33 -08:00
Samuel Clay
c994982d6f Pushing new version of iOS app with side-swiping of stories (v1.8). 2012-11-28 16:33:21 -08:00
Samuel Clay
02f58c26ee Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Added fixes for encoding issue, null rounding image issue
2012-11-28 16:28:43 -08:00
Samuel Clay
e72ac79859 Merge branch 'ios_story'
* ios_story: (32 commits)
  Preparing for enterprise distribution of 1.8.
  Fixing scroll to comment for reply replies.
  Fixing bug around losing the reference to the active story after sharing it.
  Fixing the infernal scrolling issue when sharing a story. All that's left is reattaching the new shared story to the active story list.
  Shrinking blurblog feed titles on both iPad and iPhone.
  Fixing broken HUD for favoriting comments.
  Fixing tests.
  Updating tests.
  Fixing paging issues on iOS.
  Fixing long-time bug that crashed the ios app on feed refresh, when a feed had stories but was refreshed to no longer show stories.
  Fixing page counting.
  Fixing sharing to twitter/fb, blank pages, perf improvements for iphone.
  Failing to mark a story as read now shows a correct error message on iOS.
  Provisioning profile.
  Eureka, got a third 'previous' page in the mix for story page controls on iOS. This could be it. No bounce, no redraw, and flawless movement.
  Shadow colors on feed list and feed detail pages.
  Fixing stretching of icon in title view on story detail page in ios.
  Fixing sharing and comments and replying with new page controls.
  Fixing issue with blanking the story on Original view.
  Handling rotations correctly on iOS.
  ...
2012-11-28 16:28:27 -08:00
Samuel Clay
121c7cdebd Preparing for enterprise distribution of 1.8. 2012-11-28 16:28:14 -08:00
Samuel Clay
ca693b9987 Fixing scroll to comment for reply replies. 2012-11-28 16:24:15 -08:00
Samuel Clay
edafac7124 Fixing bug around losing the reference to the active story after sharing it. 2012-11-28 15:46:11 -08:00
Samuel Clay
c6d6471d1d Fixing the infernal scrolling issue when sharing a story. All that's left is reattaching the new shared story to the active story list. 2012-11-28 15:21:44 -08:00
Samuel Clay
ae99fb053c Shrinking blurblog feed titles on both iPad and iPhone. 2012-11-28 12:36:48 -08:00
RyanBateman
855b8d0220 Added fixes for encoding issue, null rounding image issue 2012-11-28 11:24:20 +00:00
Samuel Clay
3160245722 Fixing broken HUD for favoriting comments. 2012-11-27 17:50:33 -08:00
Samuel Clay
17c1450951 Merge branch 'master' into ios_story
* master:
  Cleanup.
  Gutting dynamodb and just keeping good changes.
  Bumped version number.
  Modified to remove default URL-encoding for GSON.
  Fixed email field not being visible on some smaller screen devices.
  Modified CSS to include max-width for divs, overriding inline styles and reduce max-width.
  Added padding to share button.
  Shifting mgirations for DStory.
  Optional backked by dynamodb.
  First half of DynamoDB trial, converting stories from mongo to dynamodb. Still needs to be updated/inserted on feed update, and then processed with all MStory uses.
2012-11-27 17:34:53 -08:00
Samuel Clay
ad70f9da89 Merge branch 'dynamodb'
* dynamodb:
  Cleanup.
  Gutting dynamodb and just keeping good changes.
  Shifting mgirations for DStory.
  Optional backked by dynamodb.
  First half of DynamoDB trial, converting stories from mongo to dynamodb. Still needs to be updated/inserted on feed update, and then processed with all MStory uses.
2012-11-27 17:12:14 -08:00
Samuel Clay
f5292fa9a1 Cleanup. 2012-11-27 17:12:10 -08:00
Samuel Clay
8c085b0a3c Gutting dynamodb and just keeping good changes. 2012-11-27 16:44:10 -08:00
Samuel Clay
61aac7fc06 Merge branch 'master' into dynamodb
* master: (331 commits)
  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.
  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.
  Adding bs facebook assets.
  ...

Conflicts:
	apps/rss_feeds/models.py
	settings.py
	utils/feed_fetcher.py
2012-11-27 16:39:39 -08:00
Samuel Clay
618570526f Merge branch 'android'
* android:
  Bumped version number.
  Modified to remove default URL-encoding for GSON.
  Fixed email field not being visible on some smaller screen devices.
  Modified CSS to include max-width for divs, overriding inline styles and reduce max-width.
  Added padding to share button.
2012-11-27 16:26:55 -08:00
Samuel Clay
1ad7031fbb Fixing tests. 2012-11-27 16:22:03 -08:00
Samuel Clay
a67ecf4440 Updating tests. 2012-11-27 15:18:23 -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
9deff7a336 Re-enabling message property for facebook. 2012-11-27 09:06:39 -08:00
Samuel Clay
ca4b2884cb Ignoring image for facebook shares. 2012-11-26 17:57:51 -08:00
Samuel Clay
6c3a59764a Commenting out facebook share message until they approve it. 2012-11-26 17:55:48 -08:00
Samuel Clay
8607fa69f9 Cleaning up Facebook og description. 2012-11-26 17:26:01 -08:00
Samuel Clay
258a52a87a Facebook using a website instead of article. 2012-11-26 17:01:19 -08:00
Samuel Clay
54fa1250a3 Fixing paging issues on iOS. 2012-11-26 16:47:20 -08:00
Samuel Clay
c85de5d3df Fixing long-time bug that crashed the ios app on feed refresh, when a feed had stories but was refreshed to no longer show stories. 2012-11-26 15:51:50 -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
6e864ffb7d Facebook being a PITA. 2012-11-26 15:03:04 -08:00
Samuel Clay
8fad5de228 Facebook wants ISO8601 datetime format. 2012-11-26 14:23:28 -08:00