Permalink
Browse files

Switch to feedbin.com.

  • Loading branch information...
1 parent 47b724a commit 31e1ea3ebe3406776172fc647223c929016b86df @benubois benubois committed Mar 14, 2014
View
@@ -16,7 +16,7 @@ November 2013
-------------
- 2013-11-28 Print stylesheet
-- 2013-11-28 Links to new help.feedbin.me
+- 2013-11-28 Links to new help.feedbin.com
- 2013-11-26 Entry column redesign (star indicator, date format, etc...)
- 2013-11-09 Action design update
- 2013-11-09 Rewrote actions to use elasticsearch percolate
View
@@ -1,7 +1,7 @@
The MIT License
===============
-Copyright 2013 [Ben Ubois](mailto:ben@feedbin.me)
+Copyright 2013 [Ben Ubois](mailto:ben@feedbin.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 in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
View
@@ -12,7 +12,7 @@ Introduction
Feedbin is a web based RSS reader. It provides a user interface for reading and managing feeds as well as a [REST-like API](https://github.com/feedbin/feedbin-api) for clients to connect to.
-If you would like to try Feedbin out you can [sign up](https://feedbin.me/) for an account.
+If you would like to try Feedbin out you can [sign up](https://feedbin.com/) for an account.
The main Feedbin project is a [Rails 4.0](http://rubyonrails.org/) application. In addition to the main project there are several other services that provide additional functionality. None of these services are required to get Feedbin running locally, but they all provide important functionality that you would want for a production install.
@@ -44,7 +44,7 @@ Feedbin uses environment variables for configuration. Feedbin will run without a
| CAMO_HOST | CDN to point to the camo host |
| CAMO_KEY | Used to rewrite assets to use https - https://github.com/atmos/camo |
| DATABASE_URL | Database connection string - postgres://USER:PASS@IP:PORT/DATABASE |
-| DEFAULT_URL_OPTIONS_HOST | Mailer host - feedbin.me |
+| DEFAULT_URL_OPTIONS_HOST | Mailer host - feedbin.com |
| ELASTICSEARCH_URL | search endpoint - http://localhost:9200 |
| FEEDBIN_HOMEPAGE_REPO | Git URL to a Rails engine that provides a custom homepage |
| FROM_ADDRESS | Used as a reply-to email address |
@@ -56,7 +56,7 @@ Feedbin uses environment variables for configuration. Feedbin will run without a
| MEMCACHED_HOSTS | Comma separated memcached hosts/ports - 192.168.1.2:11121 |
| POSTGRES_USERNAME | Used for connecting to database |
| POSTMARK_API_KEY | Used for sending email - http://postmarkapp.com |
-| PUSH_URL | URL for the Feedbin instance - https://feedbin.me |
+| PUSH_URL | URL for the Feedbin instance - https://feedbin.com |
| RACK_ENV | Environment - production |
| RAILS_ENV | Environment - production |
| READABILITY_API_TOKEN | Used for Readability - http://www.readability.com |
@@ -94,4 +94,4 @@ export AWS_ACCESS_KEY_ID=aoisjf3j23oij23f
Have a feature you would like to add but don't know where to start?
-Email [support@feedbin.me](support@feedbin.me) and we'll set something up to work on it together.
+Email [support@feedbin.com](support@feedbin.com) and we'll set something up to work on it together.
@@ -1,7 +1,7 @@
<div class="settings-content-inner">
<h2>Actions</h2>
- <p class="muted">Actions can be performed on articles when they are published. Start by writing the keywords to match, just like you would when <a href="http://help.feedbin.me/search-syntax/">searching</a> for something. Then select the feeds to include. Finally check the actions you would like to perform on the matched incoming articles.</p>
+ <p class="muted">Actions can be performed on articles when they are published. Start by writing the keywords to match, just like you would when <a href="http://help.feedbin.com/search-syntax/">searching</a> for something. Then select the feeds to include. Finally check the actions you would like to perform on the matched incoming articles.</p>
<div class="push-options hide" id="push-data" data-website-id="<%= ENV['APPLE_PUSH_WEBSITE_ID'] %>" data-authentication-token="<%= @authentication_token %>" data-web-service-url="<%= @web_service_url %>">
<div class="push-enable hide">
@@ -12,12 +12,12 @@
</ul>
<ul class="nav nav-small">
<li class="mobile-hide"><a href="/home">Home</a></li>
- <li class="mobile-hide"><a href="http://blog.feedbin.me" target="_blank">Blog</a></li>
+ <li class="mobile-hide"><a href="http://blog.feedbin.com" target="_blank">Blog</a></li>
<li><a href="<%= apps_path %>">Apps</a></li>
- <li><a href="http://help.feedbin.me">Help</a></li>
+ <li><a href="http://help.feedbin.com">Help</a></li>
<li class="mobile-hide"><a href="https://github.com/feedbin/feedbin-api#readme" target="_blank">API</a></li>
<li><a href="<%= privacy_policy_path %>">Privacy Policy</a></li>
- <li><a href="mailto:support@feedbin.me">Email</a></li>
+ <li><a href="mailto:support@feedbin.com">Email</a></li>
<li class="mobile-hide"><a href="https://twitter.com/feedbin" target="_blank">Twitter</a></li>
</ul>
</div>
@@ -12,7 +12,7 @@
<a href="<%= ENV['SUPPORT_URL'] %>">Open a new support request</a>
<% end %>
</p>
-<p><strong>Public homepage:</strong> <a href="/home">feedbin.me/home</a></p>
+<p><strong>Public homepage:</strong> <a href="/home">feedbin.com/home</a></p>
<hr />
@@ -66,5 +66,5 @@
<h3>Subscribe via Email</h3>
<p class="muted">You can subscribe to any website that publishes a feed by sending an email to this secret address. The body of the email should only contain the URL to the website or feed.</p>
- <p class="subscribe-email"><a href="mailto:subscribe+<%= @user.inbound_email_token %>@subscribe.feedbin.me">subscribe+<%= @user.inbound_email_token %>@subscribe.feedbin.me</a></p>
+ <p class="subscribe-email"><a href="mailto:subscribe+<%= @user.inbound_email_token %>@subscribe.feedbin.com">subscribe+<%= @user.inbound_email_token %>@subscribe.feedbin.com</a></p>
</div>
@@ -2,10 +2,10 @@
<div class="container">
<div class="row">
<div class="col-sm-6">
- <p><a href="http://blog.feedbin.me">Blog</a> | <a href="<%= apps_path %>">Apps</a> | <a href="http://help.feedbin.me">Help</a> | <a href="https://github.com/feedbin/feedbin-api#readme">API</a> | <a href="<%= privacy_policy_path %>">Privacy Policy</a></p>
+ <p><a href="http://blog.feedbin.com">Blog</a> | <a href="<%= apps_path %>">Apps</a> | <a href="http://help.feedbin.com">Help</a> | <a href="https://github.com/feedbin/feedbin-api#readme">API</a> | <a href="<%= privacy_policy_path %>">Privacy Policy</a></p>
</div>
<div class="col-sm-6 text-right">
- <p><a href="mailto:support@feedbin.me">Email</a> | <a href="https://twitter.com/feedbin">Twitter</a> | <a href="https://github.com/feedbin">GitHub</a></p>
+ <p><a href="mailto:support@feedbin.com">Email</a> | <a href="https://twitter.com/feedbin">Twitter</a> | <a href="https://github.com/feedbin">GitHub</a></p>
</div>
</div>
<hr class="space-small" />
@@ -3,7 +3,7 @@
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
- ga('create', '<%= ENV['ANALYTICS_ID'] %>', 'feedbin.me');
+ ga('create', '<%= ENV['ANALYTICS_ID'] %>', 'feedbin.com');
<% if @page_view %>
ga('send', 'pageview', '<%= @page_view %>');
<% else %>
@@ -48,5 +48,5 @@
<hr>
- <p class="muted">A collection of sharing service URLs is <a href="http://help.feedbin.me/sharing-read-it-later-services/#list_of_urls">available</a>. Please feel free to <a href="https://github.com/feedbin/feedbin-help/blob/master/_posts/2013-11-28-sharing-read-it-later-services.md">add yours</a>.</p>
+ <p class="muted">A collection of sharing service URLs is <a href="http://help.feedbin.com/sharing-read-it-later-services/#list_of_urls">available</a>. Please feel free to <a href="https://github.com/feedbin/feedbin-help/blob/master/_posts/2013-11-28-sharing-read-it-later-services.md">add yours</a>.</p>
</div>
@@ -61,9 +61,9 @@
<div class="welcome">
<div class="welcome-inner">
<h2>Welcome to Feedbin</h2>
- <p class="sub-head">Get started by uploading an OPML file or <a href="http://help.feedbin.me/how-to-subscribe/">subscribing to feeds</a>. </p>
+ <p class="sub-head">Get started by uploading an OPML file or <a href="http://help.feedbin.com/how-to-subscribe/">subscribing to feeds</a>. </p>
<%= link_to 'Upload OPML', settings_import_export_path, class: 'button' %>
- <p class="description"><a href="http://help.feedbin.me/how-to-subscribe/#opml_import">What is OPML?</a></p>
+ <p class="description"><a href="http://help.feedbin.com/how-to-subscribe/#opml_import">What is OPML?</a></p>
</div>
</div>
<% else %>
@@ -9,7 +9,7 @@
},
"developer": {
"name": "Feedbin, Inc.",
- "url": "https://feedbin.me/"
+ "url": "https://feedbin.com/"
},
"default_locale": "en"
}
@@ -78,7 +78,7 @@
<div class="col-sm-4 col-sm-push-2 feature">
<%= image_tag 'icon-home-search.svg', width: '34', class: 'feature-icon-search' %>
<h3>Search</h3>
- <p>Use Feedbin’s <a href="http://blog.feedbin.me/2013/10/10/search-beta/">advanced search</a> to find just what you’re looking for. <a href="http://blog.feedbin.me/2013/10/14/saved-searches/">Save your searches</a> to save time.</p>
+ <p>Use Feedbin’s <a href="http://blog.feedbin.com/2013/10/10/search-beta/">advanced search</a> to find just what you’re looking for. <a href="http://blog.feedbin.com/2013/10/14/saved-searches/">Save your searches</a> to save time.</p>
</div>
<div class="col-sm-4 col-sm-push-2 feature">
@@ -5,6 +5,6 @@
<p class="large">Privacy is very important to Feedbin.</p>
<p class="large">SSL is used site-wide. Cookies are used for authentication and session data only. Site cookies are first-party, HTTP only and secure.</p>
<p class="large">Payment is handled through <a href="https://stripe.com">Stripe</a> so your email address and payment information is shared with them. <a href="https://stripe.com/us/privacy">View their privacy policy</a> for more information. <a href="http://google.com/analytics">Google Analytics</a> is used to collect anonymous analytics data. Your information is never shared with advertisers.</p>
- <p class="large">If you have any questions or concerns about our privacy policies, please contact us: <a href="mailto:support@feedbin.me">support@feedbin.me</a>.</p>
+ <p class="large">If you have any questions or concerns about our privacy policies, please contact us: <a href="mailto:support@feedbin.com">support@feedbin.com</a>.</p>
</div>
</div>
@@ -11,7 +11,7 @@ xml.rss version: "2.0", 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/', 'xmlns
xml.pubDate entry.published.to_s(:rfc822)
xml.link entry.fully_qualified_url
xml.dc :creator, entry.feed.title
- xml.guid entry_url(entry), isPermaLink: false
+ xml.guid "https://feedbin.me#{entry_path(entry)}", isPermaLink: false
end
end
end
@@ -1,6 +1,6 @@
Hi <%= @user.email %>,
-This is a receipt for your Feedbin account. Please send any questions to support@feedbin.me.
+This is a receipt for your Feedbin account. Please send any questions to support@feedbin.com.
You can view a detailed printable receipt here: <%= billing_event_url(@billing_event) %>
View
@@ -25,8 +25,8 @@
set :assets_role, [:app]
-role :app, "www1.feedbin.me", "www2.feedbin.me", "www3.feedbin.me"
-role :worker, "worker1.feedbin.me", "worker2.feedbin.me"
+role :app, "www1.feedbin.com", "www2.feedbin.com", "www3.feedbin.com"
+role :worker, "worker1.feedbin.com", "worker2.feedbin.com"
default_run_options[:pty] = true
default_run_options[:shell] = '/bin/bash --login'
Oops, something went wrong. Retry.

0 comments on commit 31e1ea3

Please sign in to comment.