Commit graph

52 commits

Author SHA1 Message Date
Samuel Clay
5d609355ee Merge branch 'master' into circular
# By Samuel Clay (2) and Lance Johnson (1)
# Via Samuel Clay (2) and Lance Johnson (1)
* master:
  Moving from MongoDB's page_loads analytics table to Redis page loads.
  Adding MongoDB MMS agent.
  Several changes in one commit (bad me)
2013-03-29 13:19:12 -07:00
Samuel Clay
02a0a0646a Adding MongoDB MMS agent. 2013-03-29 11:04:46 -07:00
Nick Peelman
640e396036 Adding primitive Safari Extension for NewsBlur 2013-03-25 00:25:50 -04:00
Samuel Clay
b3744e3ac6 Merge branch 'master' into circular
* master:
  Warning on missing maintenance.
  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.
  Moving shared story unread recalc to background task. Will greatly speed up sharing.
  Ramping down feed fetching until they can be handled.
  Only show time breakdown when > 1 sec.
  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
  Phase 2: switching to using story_hash index instead of compound unique story_feed_id/story_guid index.
  document keyboard shortcut to add site/folder

Conflicts:
	apps/social/views.py
2013-03-20 10:49:09 -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
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
a90518fd31 Merge branch 'master' into original_pages_node
* master: (81 commits)
  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.
  Fixing typo in logging.
  Fixing autocomplete behavior on add dialog.
  Adding broken search for feeds.
  Logging
  Switching to guid-based read story counts from range based counts. Let's see what this screws up.
  Everybody gets unread count in title.
  Backporting collections.Counter to python2.6
  Fixing broken reply interaction with links.
  Prototype of a dupe checker using real-time update times to figure out which feeds are the same. Last time I walked down this road I got run over.
  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.
  ...

Conflicts:
	fabfile.py
2013-01-07 10:48:42 -08:00
Samuel Clay
f17060f202 Adding sass cache ignore. 2013-01-04 17:57:38 -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
9c930e33b3 Adding new maintenance page. 2012-12-21 15:05:50 -08:00
Samuel Clay
21c56b1a62 Removing originals. Meant to put in a db. 2012-12-14 17:31:03 -08:00
Samuel Clay
000ef47e8f Merge branch 'master' into android
* master: (73 commits)
  Updating iOS for iOS 6 and the new iPhone 5.
  Fixing typos in iOS app.
  Fixing a bunch of feed fetch errors.
  Fixing these damn Link: text urls in story modifications.
  Unloading the story iframe when changing feeds.
  Fixing sent emails for new premiums.
  Adding folder collapse for blurblogs.
  Forcing all munin graphs to start at 0.
  Ordering and smoothing munin graphs.
  Showing total fetches in task munin graph.
  Deprecating FeedLoadtime and moving to MongoDB-backed aggregate data for feed load time graphs.
  Cleaning analytics as a beat task. Fixing server status codes in munin, and removing app feed fetches from analytics.
  Fixing paths munin.
  Normalizing paths and adding graphs for browser breakdowns, paths, and task feed status codes.
  Permissions on munin.
  Fixing typo in munin task config.
  Changing munin names for better graphs.
  New Munin views: task server breakdowns by feeds fetched, total time taken per server, and aggregate stats in the pipeline.
  Fixing JS issues around stories with no feeds clobbering the river view.
  Finishing off new feed selector. Now scrolls to matched feed, correctly loads top feed, handles errors, and handles esc.
  ...

Conflicts:
	.gitignore
2012-10-02 12:19:57 -07:00
Samuel Clay
f9ed7fdd26 Deprecating FeedLoadtime and moving to MongoDB-backed aggregate data for feed load time graphs. 2012-09-27 15:21:38 -07:00
Samuel Clay
8c8e02b0dd Adding ec2 mdadm setup. 2012-09-19 12:00:41 -07:00
Samuel Clay
dc532ac4b7 Merge branch 'master' into android
* master: (1098 commits)
  Upgrading iphone/ipad app to support both ios 6 and tall-iphone.
  New folder options: add subfolder.
  Adding location to find friends.
  Trimming mongodb lag cutoff to force feeds to correct themselves when slave lag becomes an issue.
  Fixing 'r' refresh command for All Site Stories.
  Fixing broken social page.
  Upgrading to jQuery UI latest to fix slide animation on window panes.
  Splitting up dashboard into unauthed and authed templates, needed to redesign to unauthed view.
  Adding collapsed folder icons.
  Ignore skip of unread counts if theres no mongodb lag.
  Adding readability vendorized package.
  Adding two new functions for stories: collect image sizes and grab original article text. Useful for future features.
  Being stricter about non-english characters.
  Fixing popular story algorithm to remove non-english stories.
  Fixing follow user on blurblogs. Abstracting unshare so I can more easily unshare.
  Fixing trainer for stories in social feeds.
  Fixing small bug in story titles header now showing socialsubs correctly.
  Fixing headers for Everything river and river blurblog.
  Massive refactor around feedbar, brought on by @afita, in order to give Folders a menu in the story titles header (and then make the mark as read button work on folders in the header.)
  Updating story position in closed story titles when pane is re-opened. Thanks to @afita for the bug.
  ...

Conflicts:
	.gitignore
2012-09-14 17:36:14 -07:00
Samuel Clay
923fcff14e Ignoring sass cache 2012-08-19 14:10:05 -07:00
Samuel Clay
4fcddbf398 Merge branch 'master' into circular
* master:
  Ignoring Circular's css in master, to be removed in Circular.
  Turning off stickiness of twitter/facebook buttons.

Conflicts:
	.gitignore
2012-08-19 14:09:43 -07:00
Samuel Clay
7f42a7ae10 Ignoring Circular's css in master, to be removed in Circular. 2012-08-19 14:09:25 -07:00
Roy Yang
b4fe7a627c removing unused files 2012-08-17 18:51:17 -07:00
Roy Yang
84a2622c0b adding in more styles 2012-08-16 00:45:20 -07:00
Samuel Clay
2a7af9d20e Forcing unread recalcs on feed open. May fix a bunch of mis-calced unreads. 2012-08-10 14:22:51 -07:00
Samuel Clay
b15dc457f6 Adding social launch email. 2012-08-09 19:50:47 -07:00
Ryan Bateman
f57be00805 Added projects for NewsBlur Android app and testing. 2012-06-11 20:46:58 -04:00
Samuel Clay
c52e5c562b Copying server settings. 2012-05-02 16:46:00 -07:00
Samuel Clay
d1fff25cdb Adding PID files to gitignore. 2012-02-08 12:48:33 -08:00
Samuel Clay
4ed0322252 Ignoring files. 2012-02-08 12:47:00 -08:00
Samuel Clay
ac8bd1e9e2 Adding certificates to ignore. 2012-02-08 12:44:45 -08:00
Samuel Clay
06652b3110 Adding build/ back to .gitignore. 2012-02-02 17:22:28 -08:00
Samuel Clay
c94cd60163 Updating .gitignore. 2012-02-02 10:55:13 -08:00
Samuel Clay
346d38096f Adding static/ to gitignore. 2012-01-02 17:11:18 -08:00
Samuel Clay
8b943e0dc1 Ignoring mobile assets packages. 2011-08-26 23:43:15 -07:00
Samuel Clay
ba0d3bd43f Forcing refresh fo story positions when feed is fully loaded. 2011-07-24 23:00:05 -07:00
Samuel Clay
6acf782df1 Removing xcuserdata. 2011-07-22 17:40:34 -07:00
Samuel Clay
0864a1db33 Scrolling in the feed view loads more stories! Need a progress indicator and a bottom of the feed indicator. 2011-07-22 09:10:13 -07:00
Samuel Clay
e2d60ea480 Adding xcode user data to gitignore. 2011-07-17 22:33:11 -07:00
Samuel Clay
833da6e83b Ignoring these ridiculous xcode file changes. 2011-07-15 17:53:22 -07:00
Samuel Clay
81d7220be5 Ignoring these ridiculous xcode file changes. 2011-07-15 17:52:43 -07:00
Samuel Clay
2b78b83fcb Fixing logout button in iPhone app. 2010-11-15 19:40:17 -05:00
Samuel Clay
f71dda9cfd Add original story view (safari view) in iPhone app. 2010-11-13 18:32:43 -05:00
Samuel Clay
30e6bd4a26 Adding mongo/ to gitignore. 2010-10-03 16:43:29 -04:00
Samuel Clay
e9f5fc3350 More .gitignore, and adding cron jobs to fetch feeds. These will be replaced by celery within the next day or two. 2010-08-30 23:56:53 -04:00
Samuel Clay
a3cb4648bb .gitignore MongoDB data directory 2010-08-21 14:03:30 -04:00
Samuel Clay
cfd807fa10 Updating feed error codes. Accidentally deleted the 200 OK feed fetch history. 2010-07-23 18:56:29 -04:00
Samuel Clay
a85f94a7ce Ignoring lots of iphone crap. 2010-06-24 12:58:26 -04:00
Samuel Clay
c2f080fd09 Fuller .gitignore for iphone build dir. 2010-06-21 20:46:25 -04:00
Samuel Clay
0575ecfb24 Moving iPhone build directory for ignoring. 2010-06-21 20:41:09 -04:00
Samuel Clay
31b6dca63a Removing iPhone build stuff from the repo. 2010-06-21 20:40:22 -04:00
Samuel Clay
83a136865a Updating .gitignore to reflect moved media. 2010-04-05 03:25:46 -04:00
Samuel Clay
18031c40cd Time to move to local_settings 2010-04-05 00:47:21 -04:00
Samuel Clay
ae4684b6e2 .gitignore 2010-02-05 22:54:24 +00:00