Commit graph

4 commits

Author SHA1 Message Date
Samuel Clay
1338c69edb Merge branch 'master' into circular
* 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
2013-03-20 18:57:06 -07:00
Samuel Clay
491c012bac Adding settings menu to dashboard. 2013-03-19 10:19:19 -07:00
Samuel Clay
cd9de15b5a Rearranging site counter and unread counter. 2013-02-22 12:13:01 -08:00
Samuel Clay
9d054e8932 Styling new getting started module. Needs a bit of sync during operations. 2013-02-04 14:51:15 -08:00