* master:
Minor changes to fabfile. Needs to only run the pre_deploy step once.
Adding uglify-js.
Fixing paypal return.
Fixing default state while waiting for statistics data to come in.
Adding feed update interval for non-premium users in Statistics.
Adding Chrome Notifier to Goodies page.
Adding Tumblr to share menu.
Ordering unmoderated recommended feeds by date.
Conflicts:
utils/json_functions.py
* 'master' of github.com:samuelclay/NewsBlur:
Adding 'a' keyboard shoftcut to open the add site dialog.
Changing the hiding/showing of saved star in hopes tha tit fixes the persistent display bug.
Fixing broken opml export due to missing feed icons.
Fixing slight bug in how active premiums were applied to feed update times.
Shift+U switches between read and unread. Thanks to @MLACitation: https://twitter.com/mlacitation/status/155371014560288768
* master:
Fixing broken opml export due to missing feed icons.
Fixing slight bug in how active premiums were applied to feed update times.
Shift+U switches between read and unread. Thanks to @MLACitation: https://twitter.com/mlacitation/status/155371014560288768
Adding active_premium count. Setting a minimum of 1 hour fetches for feeds with any active premiums.
Allowing username refinement in fetching starred stories.
Increasing timeout on gunicorn to 2 min.
Adding management command to fetch starred stories on command.
* master:
Adding active_premium count. Setting a minimum of 1 hour fetches for feeds with any active premiums.
Allowing username refinement in fetching starred stories.
Increasing timeout on gunicorn to 2 min.
Adding management command to fetch starred stories on command.
Adding error handling for insta-fetching stories.
Turning off the page fetcher requests vs. urllib2 discrepency checker. I bet I've caught them all by now.
The @kennethreitz commit: logging all discrepencies between requests and urllib2. This should take a few hours.
* master:
Adding error handling for insta-fetching stories.
Turning off the page fetcher requests vs. urllib2 discrepency checker. I bet I've caught them all by now.
The @kennethreitz commit: logging all discrepencies between requests and urllib2. This should take a few hours.
* jammit:
Adding new iphone mask image.
Moving to proper unicode string for feed fetching.
Colorizing feed fetching.
Colorizing feed fetching.
Adding two error classes to requests exception handling.
Adding two error classes to requests exception handling.
Adding two error classes to requests exception handling.
jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues.
Adding shift+u as a shortcut for marking a story unread.
Adding more advanced exception handling for new requests module, with fallback to urllib2.
Adding urllib fallback to requests in page fetching.
Adding a little bit more leeway in page importer by falling back to urllib2 when requests fail.
Adding slight bit of color to feed fetcher.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Conflicts:
assets.yml
local_settings.py.template
media/js/jquery-1.7.1.js
media/js/jquery-1.7.js
media/js/vendor/jquery-1.7.js
* master:
Moving to proper unicode string for feed fetching.
Colorizing feed fetching.
Colorizing feed fetching.
Adding two error classes to requests exception handling.
Adding two error classes to requests exception handling.
Adding two error classes to requests exception handling.
jQuery 1.6.1 -> 1.7.1. Fixes massive Chrome issues.
Adding shift+u as a shortcut for marking a story unread.
Adding more advanced exception handling for new requests module, with fallback to urllib2.
Adding urllib fallback to requests in page fetching.
Adding a little bit more leeway in page importer by falling back to urllib2 when requests fail.
Adding slight bit of color to feed fetcher.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Conflicts:
media/js/jquery-1.6.1.js
media/js/jquery-1.7.1.js
node/node_modules/socket.io-client/support/test-runner/public/javascript/jquery.js
* jammit:
Adding node's 8888 to app ufw. Also adding redis's 6379 to express server.
Adding socket.io-client
Adding node modules.
Retooling fabfile's deploy code to support serial asset packaging with parallel code deploys.
Upgrading nginx version.
Fixing public_root in assets.yml to be readbale by old yml.
Adding static/ to gitignore.
Moving images and theme assets around.
Relative to absolute urls for all embedded images.
Fixing up jammit branch for launch by adding socket.io, bookmarklet, and compressed static assets. Still needs icons.
Fixing css conflicts in jammit. Adding code rendering to jammit for bookmarklet.
Adding /static to nginx conf.
Adding jQuery 1.7 and new static directory.
JS is now complete. Need to fix css embeds.
Initial stub of Jammit assets.
Conflicts:
media/css/reader.css
* master:
Boosting fillout pages.
Small cleanup in ajax manager.
Abort old requests and don't cache responses. Trying to fix IE read story bug.
Force jquery to never cache.
Checking for exceptions earlier in order to show fixed site.
Changing user agent to hopefully override overly-sniffy websites.
Fixing inaccurate substitution on feed urls. Ugh, can't believe this was here this long.
Adding the setting of a feed's view settings to Site Settings dialog. This should've been in there a loooong time ago.
* master: (30 commits)
Boosting fillout pages.
Small cleanup in ajax manager.
Abort old requests and don't cache responses. Trying to fix IE read story bug.
Force jquery to never cache.
Checking for exceptions earlier in order to show fixed site.
Changing user agent to hopefully override overly-sniffy websites.
Fixing inaccurate substitution on feed urls. Ugh, can't believe this was here this long.
Adding the setting of a feed's view settings to Site Settings dialog. This should've been in there a loooong time ago.
Fixing feed loads only once for those with skipping stories.
Adding handler to to_json calls on all serialized models.
Fixing two major bugs: auto filling stories now works far better nad doesn't lock you in. Also fixing the infernal unicode json parsing bug that's been effecting a bunch of sites.
Adding WP7 as user agent.
Adding necessary import when not running from the REPL.
Too many stories? Don't animate transitions when switching intelligence levels.
Fixing typo in iphone app that preventing mark folder as read when the visible stories option was showing.
Updating the mongo db copy util to also look for updated stories.
Globals.is_staff on user, not profile. Make the stats referesh every minute instead of every 10 minutes for staff.
Fixing offsets in river of news.
Adding ciphering to usernames in log, so I can finally take screenshots of the most colorful logs of all time.
Adding my very special mongo serialization backup utility to get around the damn unrepairable mongo database. This is taking 14 hours to run.
...
Conflicts:
templates/base.html
* master:
Fixing two major bugs: auto filling stories now works far better nad doesn't lock you in. Also fixing the infernal unicode json parsing bug that's been effecting a bunch of sites.
