From c66fd457e51d0e6a5eca303b8ae5ffe7b49a607d Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Wed, 20 Jun 2012 18:37:46 -0700 Subject: [PATCH] Moving from samuel@ofbrooklyn.com to samuel@newsblur.com. --- LICENSE.md | 2 +- README.md | 4 +-- api/newsblur.py | 2 +- apps/analyzer/fixtures/classifiers.json | 2 +- apps/feed_import/fixtures/opml_import.json | 2 +- apps/reader/fixtures/subscriptions.json | 2 +- apps/rss_feeds/fixtures/bootstrap.json | 2 +- apps/rss_feeds/fixtures/rss_feeds.json | 2 +- config/fixtures/bootstrap.json | 2 +- local_settings.py.template | 35 +++++++++------------- media/css/reader.css | 3 -- media/js/newsblur/reader/reader_intro.js | 2 +- media/js/newsblur/static/about.js | 2 +- media/js/newsblur/static/faq.js | 2 +- settings.py | 2 +- templates/reader/feeds.xhtml | 2 +- templates/static/about.xhtml | 2 +- templates/static/faq.xhtml | 4 +-- templates/static/press.xhtml | 2 +- 19 files changed, 33 insertions(+), 43 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index edde7434d..71fe03a93 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ The MIT License =============== -Copyright (c) 2009-2010 Samuel Clay . +Copyright (c) 2009-2012 Samuel Clay, NewsBlur . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 022700239..149881c54 100755 --- a/README.md +++ b/README.md @@ -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: + * Email address: * [@samuelclay](http://twitter.com/samuelclay) on Twitter. diff --git a/api/newsblur.py b/api/newsblur.py index f4252a251..6f90a69b0 100644 --- a/api/newsblur.py +++ b/api/newsblur.py @@ -6,7 +6,7 @@ import urllib, urllib2 import cookielib import json -__author__ = "Dananjaya Ramanayake , Samuel Clay " +__author__ = "Dananjaya Ramanayake , Samuel Clay " __version__ = "1.0" API_URL = "http://www.newsblur.com/" diff --git a/apps/analyzer/fixtures/classifiers.json b/apps/analyzer/fixtures/classifiers.json index d75bbc579..cbe777b3b 100644 --- a/apps/analyzer/fixtures/classifiers.json +++ b/apps/analyzer/fixtures/classifiers.json @@ -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" } } diff --git a/apps/feed_import/fixtures/opml_import.json b/apps/feed_import/fixtures/opml_import.json index 89830f627..5f4f3c541 100644 --- a/apps/feed_import/fixtures/opml_import.json +++ b/apps/feed_import/fixtures/opml_import.json @@ -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" } } diff --git a/apps/reader/fixtures/subscriptions.json b/apps/reader/fixtures/subscriptions.json index 6aa8c17f6..05f53a7a7 100644 --- a/apps/reader/fixtures/subscriptions.json +++ b/apps/reader/fixtures/subscriptions.json @@ -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" } }, diff --git a/apps/rss_feeds/fixtures/bootstrap.json b/apps/rss_feeds/fixtures/bootstrap.json index 241048dde..c5e3b2c8c 100644 --- a/apps/rss_feeds/fixtures/bootstrap.json +++ b/apps/rss_feeds/fixtures/bootstrap.json @@ -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" } } diff --git a/apps/rss_feeds/fixtures/rss_feeds.json b/apps/rss_feeds/fixtures/rss_feeds.json index d2f79c1b0..1afc26dee 100644 --- a/apps/rss_feeds/fixtures/rss_feeds.json +++ b/apps/rss_feeds/fixtures/rss_feeds.json @@ -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" } } diff --git a/config/fixtures/bootstrap.json b/config/fixtures/bootstrap.json index 10eb8ba04..d3fcafd9a 100644 --- a/config/fixtures/bootstrap.json +++ b/config/fixtures/bootstrap.json @@ -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" } }, diff --git a/local_settings.py.template b/local_settings.py.template index d0d469a06..fd0ea9dea 100644 --- a/local_settings.py.template +++ b/local_settings.py.template @@ -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 diff --git a/media/css/reader.css b/media/css/reader.css index 84ad7dbc4..28640c649 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -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 = */ diff --git a/media/js/newsblur/reader/reader_intro.js b/media/js/newsblur/reader/reader_intro.js index 4eb0ff35b..a007473d7 100644 --- a/media/js/newsblur/reader/reader_intro.js +++ b/media/js/newsblur/reader/reader_intro.js @@ -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, diff --git a/media/js/newsblur/static/about.js b/media/js/newsblur/static/about.js index f5d7c37f7..41d170460 100644 --- a/media/js/newsblur/static/about.js +++ b/media/js/newsblur/static/about.js @@ -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: ', diff --git a/media/js/newsblur/static/faq.js b/media/js/newsblur/static/faq.js index 9776f99da..d58719ad2 100644 --- a/media/js/newsblur/static/faq.js +++ b/media/js/newsblur/static/faq.js @@ -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.' ]) ]) diff --git a/settings.py b/settings.py index b58df9404..329066911 100644 --- a/settings.py +++ b/settings.py @@ -10,7 +10,7 @@ from utils import jammit # =================== ADMINS = ( - ('Samuel Clay', 'samuel@ofbrooklyn.com'), + ('Samuel Clay', 'samuel@newsblur.com'), ) SERVER_EMAIL = 'server@newsblur.com' diff --git a/templates/reader/feeds.xhtml b/templates/reader/feeds.xhtml index 2b83c570b..8400186ea 100644 --- a/templates/reader/feeds.xhtml +++ b/templates/reader/feeds.xhtml @@ -80,7 +80,7 @@ diff --git a/templates/static/faq.xhtml b/templates/static/faq.xhtml index 58be65c74..36e1f4366 100644 --- a/templates/static/faq.xhtml +++ b/templates/static/faq.xhtml @@ -120,7 +120,7 @@ How I can prevent NewsBlur from loading the Original view (without using an iFrame buster)?
-

If you would like to opt-out of the Original view, simply email Samuel Clay and let him know. He will place your site on an opt-out list.

+

If you would like to opt-out of the Original view, simply email Samuel Clay and let him know. He will place your site on an opt-out list.

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.

@@ -174,7 +174,7 @@ Help! I have an issue and it's not mentioned here.
- Please, please, please e-mail samuel@ofbrooklyn.com. If you have an issue it is entirely possible that other people do, too. + Please, please, please e-mail samuel@newsblur.com. If you have an issue it is entirely possible that other people do, too.
diff --git a/templates/static/press.xhtml b/templates/static/press.xhtml index abe9f8d1d..52dbb0be5 100644 --- a/templates/static/press.xhtml +++ b/templates/static/press.xhtml @@ -19,7 +19,7 @@ Thank you for your interest in NewsBlur. NewsBlur is built by a solo developer: Contact Samuel for interviews, comments, and questions about NewsBlur. As another ambitious New Yorker, he is happy to talk about NewsBlur.