Fixes the following:
[...]
<link rel="shortcut icon" href="None">
<link rel="icon" href="None">
[...]
-> Failed to load resource: the server responded with a status of 404 (NOT FOUND) http://menakite.newsblur.com/None
Note: not tested - I actually can't test it.
* master:
Using user's username on signup if no password.
Using user's username on signup if no password.
Fixing passwords if left blank.
Patching Django 1.5 to handle underscores in subdomains.
Allowed hosts
Allowed hosts
If not active subs, turn off real-time.
If not active subs, turn off real-time.
Skipping real-time fetch for non-premium active feeds.
Upgrading django 1.5 manage.py.
Upgrade to django 1.5 script. Also handling story lookups with objectids.
Updated Django to always use the latest 1.5 version. Updated django-redis-session to latest version.
Moving HAProxy's config to secrets so I can set a password.
Allowing_hosts for django 1.5.
Upgrading django from 1.3 to 1.5.
Keep Raven from making settings puke.
Added django-redis-sessions to requirements.
Added a check for testing the email address provided during registration and throwing an error if the email address is already associated with an existing account.
Adding revsys fab command.
Froze requirements to make installation a bit easier.
Conflicts:
templates/reader/dashboard.xhtml
templates/social/social_page.xhtml
* 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
* 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.
...
