public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing notifications dialog bug.

Browse source
This commit is contained in:
Samuel Clay 2016-11-17 11:37:10 -08:00
parent 591993897b
commit 055fcbc0ea
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/requirements.txt
View file

@ -1,6 +1,6 @@
# pysqlite==2.6.0
BeautifulSoup==3.2.1
boto==2.8.0
boto==2.43.0
celery==3.1.23
chardet==2.1.1
cssutils==0.9.10b1

2
fabfile.py vendored
View file

@ -1528,7 +1528,7 @@ def kill_celery():
run('./utils/kill_celery.sh')
def compress_assets(bundle=False):
local('jammit -c assets.yml --base-url http://www.newsblur.com --output static')
local('jammit -c assets.yml --base-url https://www.newsblur.com --output static')
local('tar -czf static.tgz static/*')
tries_left = 5

2
media/js/newsblur/reader/reader_notifications.js
View file

@ -114,7 +114,7 @@ _.extend(NEWSBLUR.ReaderNotifications.prototype, {
},
make_feed_notifications: function() {
var site_feed_id = this.feed.id;
var site_feed_id = this.feed && this.feed.id;
var notifications = this.model.get_feeds().select(function(feed) {
return feed.get('notification_types') && feed.id != site_feed_id;
});

9
utils/backups/s3.py
View file

@ -1,4 +1,5 @@
from boto.s3.connection import S3Connection
from boto.s3.connection import OrdinaryCallingFormat
from boto.s3.key import Key
import os
import sys
@ -14,7 +15,7 @@ SECRET = settings.S3_SECRET
BUCKET_NAME = settings.S3_BACKUP_BUCKET # Note that you need to create this bucket first
def save_file_in_s3(filename, name=None):
conn = S3Connection(ACCESS_KEY, SECRET)
conn = S3Connection(ACCESS_KEY, SECRET, calling_format=OrdinaryCallingFormat())
bucket = conn.get_bucket(BUCKET_NAME)
k = Key(bucket)
k.key = name or filename
@ -22,7 +23,7 @@ def save_file_in_s3(filename, name=None):
k.set_contents_from_filename(filename)
def get_file_from_s3(filename):
conn = S3Connection(ACCESS_KEY, SECRET)
conn = S3Connection(ACCESS_KEY, SECRET, calling_format=OrdinaryCallingFormat())
bucket = conn.get_bucket(BUCKET_NAME)
k = Key(bucket)
k.key = filename
@ -30,7 +31,7 @@ def get_file_from_s3(filename):
k.get_contents_to_filename(filename)
def list_backup_in_s3():
conn = S3Connection(ACCESS_KEY, SECRET)
conn = S3Connection(ACCESS_KEY, SECRET, calling_format=OrdinaryCallingFormat())
bucket = conn.get_bucket(BUCKET_NAME)
for i, key in enumerate(bucket.get_all_keys()):
@ -38,7 +39,7 @@ def list_backup_in_s3():
def delete_all_backups():
#FIXME: validate filename exists
conn = S3Connection(ACCESS_KEY, SECRET)
conn = S3Connection(ACCESS_KEY, SECRET, calling_format=OrdinaryCallingFormat())
bucket = conn.get_bucket(BUCKET_NAME)
for i, key in enumerate(bucket.get_all_keys()):