mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
Moving from samuel@ofbrooklyn.com to samuel@newsblur.com.
This commit is contained in:
Samuel Clay
parent
8fea92b675
commit
c66fd457e5
19 changed files with 33 additions and 43 deletions
|
|
@ -1,7 +1,7 @@
|
|||
The MIT License
|
||||
===============
|
||||
|
||||
Copyright (c) 2009-2010 Samuel Clay <samuel@ofbrooklyn.com>.
|
||||
Copyright (c) 2009-2012 Samuel Clay, NewsBlur <samuel@newsblur.com>.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ these after the installation below.
|
|||
4. Run the development server. At this point, all dependencies should be installed and no
|
||||
additional configuration is needed. If you find that something is not working at this
|
||||
point, please email the resulting output to Samuel Clay at
|
||||
[samuel@ofbrooklyn.com](samuel@ofbrooklyn.com).
|
||||
[samuel@newsblur.com](samuel@newsblur.com).
|
||||
|
||||
./manage.py runserver
|
||||
|
||||
|
|
@ -230,7 +230,7 @@ reader, and feed importer. To run the test suite:
|
|||
## Author
|
||||
|
||||
* Created by [Samuel Clay](http://www.samuelclay.com).
|
||||
* Email address: <samuel@ofbrooklyn.com>
|
||||
* Email address: <samuel@newsblur.com>
|
||||
* [@samuelclay](http://twitter.com/samuelclay) on Twitter.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import urllib, urllib2
|
|||
import cookielib
|
||||
import json
|
||||
|
||||
__author__ = "Dananjaya Ramanayake <dananjaya86@gmail.com>, Samuel Clay <samuel@ofbrooklyn.com>"
|
||||
__author__ = "Dananjaya Ramanayake <dananjaya86@gmail.com>, Samuel Clay <samuel@newsblur.com>"
|
||||
__version__ = "1.0"
|
||||
|
||||
API_URL = "http://www.newsblur.com/"
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
"groups": [],
|
||||
"user_permissions": [],
|
||||
"password": "sha1$7b94b$ac9e6cf08d0fa16a67e56e319c0935aeb26db2a2",
|
||||
"email": "samuel@ofbrooklyn.com",
|
||||
"email": "samuel@newsblur.com",
|
||||
"date_joined": "2009-01-04 17:32:58"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
"groups": [],
|
||||
"user_permissions": [],
|
||||
"password": "sha1$7b94b$ac9e6cf08d0fa16a67e56e319c0935aeb26db2a2",
|
||||
"email": "samuel@ofbrooklyn.com",
|
||||
"email": "samuel@newsblur.com",
|
||||
"date_joined": "2009-01-04 17:32:58"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
"groups": [],
|
||||
"user_permissions": [],
|
||||
"password": "sha1$7b94b$ac9e6cf08d0fa16a67e56e319c0935aeb26db2a2",
|
||||
"email": "samuel@ofbrooklyn.com",
|
||||
"email": "samuel@newsblur.com",
|
||||
"date_joined": "2009-01-04 17:32:58"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
"groups": [],
|
||||
"user_permissions": [],
|
||||
"password": "sha1$d5473$d07ce4495b088ff0f41a62d5113d0189ce8f0096",
|
||||
"email": "samuel@ofbrooklyn.com",
|
||||
"email": "samuel@newsblur.com",
|
||||
"date_joined": "2011-07-18 00:23:49"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
"groups": [],
|
||||
"user_permissions": [],
|
||||
"password": "sha1$7b94b$ac9e6cf08d0fa16a67e56e319c0935aeb26db2a2",
|
||||
"email": "samuel@ofbrooklyn.com",
|
||||
"email": "samuel@newsblur.com",
|
||||
"date_joined": "2009-01-04 17:32:58"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
"groups": [],
|
||||
"user_permissions": [],
|
||||
"password": "sha1$d5473$d07ce4495b088ff0f41a62d5113d0189ce8f0096",
|
||||
"email": "samuel@ofbrooklyn.com",
|
||||
"email": "samuel@newsblur.com",
|
||||
"date_joined": "2011-07-18 00:23:49"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@ import pymongo
|
|||
# ===================
|
||||
|
||||
ADMINS = (
|
||||
('Samuel Clay', 'samuel@ofbrooklyn.com'),
|
||||
('Samuel Clay', 'samuel@newsblur.com'),
|
||||
)
|
||||
|
||||
SERVER_EMAIL = 'server@newsblur.com'
|
||||
HELLO_EMAIL = 'hello@newsblur.com'
|
||||
NEWSBLUR_URL = 'http://www.newsblur.com'
|
||||
|
||||
# ==================
|
||||
# = Global Settngs =
|
||||
# ==================
|
||||
# ===================
|
||||
# = Global Settings =
|
||||
# ===================
|
||||
|
||||
DEBUG = True
|
||||
DEBUG_ASSETS = DEBUG
|
||||
|
|
@ -29,7 +29,7 @@ CACHE_BACKEND = 'dummy:///'
|
|||
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
|
||||
|
||||
# Set this to the username that is shown on the homepage to unauthenticated users.
|
||||
HOMEPAGE_USERNAME = 'conesus'
|
||||
HOMEPAGE_USERNAME = 'popular'
|
||||
|
||||
# Google Reader OAuth API Keys
|
||||
OAUTH_KEY = 'www.example.com'
|
||||
|
|
@ -42,6 +42,15 @@ S3_BACKUP_BUCKET = 'newsblur_backups'
|
|||
STRIPE_SECRET = "YOUR-SECRET-API-KEY"
|
||||
STRIPE_PUBLISHABLE = "YOUR-PUBLISHABLE-API-KEY"
|
||||
|
||||
# ===============
|
||||
# = Social APIs =
|
||||
# ===============
|
||||
|
||||
FACEBOOK_APP_ID = '111111111111111'
|
||||
FACEBOOK_SECRET = '99999999999999999999999999999999'
|
||||
TWITTER_CONSUMER_KEY = 'ooooooooooooooooooooo'
|
||||
TWITTER_CONSUMER_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
|
||||
|
||||
# =============
|
||||
# = Databases =
|
||||
# =============
|
||||
|
|
@ -80,7 +89,6 @@ BROKER_USER = "newsblur"
|
|||
BROKER_PASSWORD = "newsblur"
|
||||
BROKER_VHOST = "newsblurvhost"
|
||||
|
||||
|
||||
# ===========
|
||||
# = Logging =
|
||||
# ===========
|
||||
|
|
@ -94,19 +102,4 @@ if len(logging._handlerList) < 1:
|
|||
format='%(asctime)-12s: %(message)s',
|
||||
datefmt='%b %d %H:%M:%S',
|
||||
handler=logging.StreamHandler)
|
||||
<<<<<<< HEAD
|
||||
|
||||
S3_ACCESS_KEY = 'XXX'
|
||||
S3_SECRET = 'SECRET'
|
||||
S3_BACKUP_BUCKET = 'newsblur_backups'
|
||||
|
||||
# ===============
|
||||
# = Social APIs =
|
||||
# ===============
|
||||
|
||||
FACEBOOK_APP_ID = '111111111111111'
|
||||
FACEBOOK_SECRET = '99999999999999999999999999999999'
|
||||
TWITTER_CONSUMER_KEY = 'ooooooooooooooooooooo'
|
||||
TWITTER_CONSUMER_SECRET = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
|
||||
=======
|
||||
>>>>>>> jammit
|
||||
|
|
|
|||
|
|
@ -7173,7 +7173,6 @@ form.opml_import_form input {
|
|||
margin: 12px 0;
|
||||
}
|
||||
.NB-static-api table {
|
||||
width: 600px;
|
||||
border-spacing: 0 0;
|
||||
margin: 24px 0 12px 20px;
|
||||
background: transparent url('/media/embed/reader/static_bullet_white.png') no-repeat 0 0;
|
||||
|
|
@ -7192,7 +7191,6 @@ form.opml_import_form input {
|
|||
white-space: nowrap;
|
||||
/* border-bottom: 1px solid #F6F6f6;*/
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
.NB-static-api table td:last-child {
|
||||
border-right: none;
|
||||
}
|
||||
|
|
@ -7443,7 +7441,6 @@ form.opml_import_form input {
|
|||
margin-bottom: 54px;
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
/* ================= */
|
||||
/* = Friends Modal = */
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ _.extend(NEWSBLUR.ReaderIntro.prototype, {
|
|||
self.advance_import_carousel(0);
|
||||
$loading.removeClass('NB-active');
|
||||
NEWSBLUR.log(['Error', data, status, e]);
|
||||
$error.text("There was a problem uploading your OPML file. Try e-mailing it to samuel@ofbrooklyn.com.");
|
||||
$error.text("There was a problem uploading your OPML file. Try e-mailing it to samuel@newsblur.com.");
|
||||
$error.slideDown(300);
|
||||
},
|
||||
data: formData,
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ NEWSBLUR.About.prototype = {
|
|||
]),
|
||||
$.make('li', [
|
||||
'E-mail: ',
|
||||
$.make('a', { href: 'mailto:samuel@ofbrooklyn.com' }, 'samuel@ofbrooklyn.com')
|
||||
$.make('a', { href: 'mailto:samuel@newsblur.com' }, 'samuel@newsblur.com')
|
||||
]),
|
||||
$.make('li', { className: 'last' }, [
|
||||
'Made in: ',
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ NEWSBLUR.Faq.prototype = {
|
|||
$.make('div', { className: 'NB-faq-question' }, 'Help! I have an issue and it\'s not mentioned here.'),
|
||||
$.make('div', { className: 'NB-faq-answer last' }, [
|
||||
'Please, please, please e-mail ',
|
||||
$.make('a', { href: 'mailto:samuel@ofbrooklyn.com' }, 'samuel@ofbrooklyn.com'),
|
||||
$.make('a', { href: 'mailto:samuel@newsblur.com' }, 'samuel@newsblur.com'),
|
||||
'. If you have an issue it is entirely possible that other people do, too.'
|
||||
])
|
||||
])
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ from utils import jammit
|
|||
# ===================
|
||||
|
||||
ADMINS = (
|
||||
('Samuel Clay', 'samuel@ofbrooklyn.com'),
|
||||
('Samuel Clay', 'samuel@newsblur.com'),
|
||||
)
|
||||
|
||||
SERVER_EMAIL = 'server@newsblur.com'
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
<div class="NB-signup-optional">
|
||||
{% if login_form.errors %}
|
||||
{% for field, error in login_form.errors.items %}
|
||||
<a href="mailto:samuel@ofbrooklyn.com?subject=Forgot%20Password%20on%20NewsBlur&body=Hello!%20My%20username%20is:%20" class="NB-splash-link">Forgot password?</a>
|
||||
<a href="mailto:password@newsblur.com?subject=Forgot%20Password%20on%20NewsBlur&body=Hello!%20My%20username%20is:%20" class="NB-splash-link">Forgot password?</a>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
Optional
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<ul class="NB-about-who">
|
||||
<li>Hand-crafted by: <a href="http://www.samuelclay.com">Samuel Clay</a></li>
|
||||
<li>Talk to him on Twitter: <a href="http://twitter.com/samuelclay">@samuelclay</a></li>
|
||||
<li>E-mail: <a href="mailto:samuel@ofbrooklyn.com">samuel@ofbrooklyn.com</a></li>
|
||||
<li>E-mail: <a href="mailto:samuel@newsblur.com">samuel@newsblur.com</a></li>
|
||||
<li class="last">Created in: <a href="http://www.newyorkfieldguide.com">New York City</a> (mostly on the A train)</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@
|
|||
How I can prevent NewsBlur from loading the Original view (without using an iFrame buster)?
|
||||
</div>
|
||||
<div class="NB-faq-answer last">
|
||||
<p>If you would like to opt-out of the Original view, simply email <a href="mailto:samuel@ofbrooklyn.com">Samuel Clay</a> and let him know. He will place your site on an opt-out list.</p>
|
||||
<p>If you would like to opt-out of the Original view, simply email <a href="mailto:samuel@newsblur.com">Samuel Clay</a> and let him know. He will place your site on an opt-out list.</p>
|
||||
<p>Note that users will still be able to read the Feed view. However, consider that when in the Original view, your ads and original content are unaffected. Consider instead placing an exception rule in your iFrame buster code that looks for 'www.newsblur.com' in the URL and prevents your iFrame buster from running.</p>
|
||||
</div>
|
||||
</li>
|
||||
|
|
@ -174,7 +174,7 @@
|
|||
Help! I have an issue and it's not mentioned here.
|
||||
</div>
|
||||
<div class="NB-faq-answer last">
|
||||
Please, please, please e-mail <a href="mailto:samuel@ofbrooklyn.com">samuel@ofbrooklyn.com</a>. If you have an issue it is entirely possible that other people do, too.
|
||||
Please, please, please e-mail <a href="mailto:samuel@newsblur.com">samuel@newsblur.com</a>. If you have an issue it is entirely possible that other people do, too.
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
Thank you for your interest in NewsBlur. NewsBlur is built by a solo developer:
|
||||
<ul>
|
||||
<li><a href="http://www.samuelclay.com">Samuel Clay</a>, founder, <a href="mailto:samuel@ofbrooklyn.com">samuel@ofbrooklyn.com</a>, <a href="http://twitter.com/samuelclay">@samuelclay</a></li>
|
||||
<li><a href="http://www.samuelclay.com">Samuel Clay</a>, founder, <a href="mailto:samuel@newsblur.com">samuel@newsblur.com</a>, <a href="http://twitter.com/samuelclay">@samuelclay</a></li>
|
||||
</ul>
|
||||
Contact Samuel for interviews, comments, and questions about NewsBlur. As another
|
||||
ambitious New Yorker, he is happy to talk about NewsBlur.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue