diff --git a/apps/profile/middleware.py b/apps/profile/middleware.py index 9314f7079..c7d4edf0b 100644 --- a/apps/profile/middleware.py +++ b/apps/profile/middleware.py @@ -8,7 +8,7 @@ from django.template import Template, Context class LastSeenMiddleware(object): def process_response(self, request, response): - if ((request.path in ('/', '/reader/refresh_feeds')) + if ((request.path in ('/', '/reader/refresh_feeds', '/reader/load_feeds')) and hasattr(request, 'user') and request.user.is_authenticated()): hour_ago = datetime.datetime.utcnow() - datetime.timedelta(minutes=60) diff --git a/fabfile.py b/fabfile.py index abe74e3a0..8dbbdc2d7 100644 --- a/fabfile.py +++ b/fabfile.py @@ -116,11 +116,17 @@ def staging_full(): @roles('task') def celery(): - with cd(env.NEWSBLUR_PATH): - run('git pull') + run('git pull') celery_stop() celery_start() +@roles('task') +def celery_stop(): + with cd(env.NEWSBLUR_PATH): + run('git pull') + celery_stop() + celery_start() + @roles('task') def celery_stop(): with cd(env.NEWSBLUR_PATH): @@ -135,11 +141,9 @@ def celery_start(): run('tail logs/newsblur.log') @roles('task') -def force_celery(): +def kill_celery(): with cd(env.NEWSBLUR_PATH): - run('git pull') run('ps aux | grep celeryd | egrep -v grep | awk \'{print $2}\' | sudo xargs kill -9') - # run('sudo supervisorctl start celery && tail logs/newsblur.log') def compress_media(): with cd('media/js'): diff --git a/media/img/mobile/iphone_logo_512.png b/media/img/mobile/iphone_logo_512.png new file mode 100644 index 000000000..f4452764e Binary files /dev/null and b/media/img/mobile/iphone_logo_512.png differ diff --git a/templates/import/signup.xhtml b/templates/import/signup.xhtml index 11dea0b80..d0e5b0d51 100644 --- a/templates/import/signup.xhtml +++ b/templates/import/signup.xhtml @@ -1,7 +1,5 @@ {% extends 'base.html' %} -{% block head_js %}{% endblock head_js %} - {% block content %} @@ -19,13 +17,13 @@
- {{ signup_form.signup_username.label_tag }} - {{ signup_form.signup_username }} + {{ signup_form.username.label_tag }} + {{ signup_form.username }}
- {{ signup_form.signup_password.label_tag }} - {{ signup_form.signup_password }} + {{ signup_form.password.label_tag }} + {{ signup_form.password }}