Merge pull request #432 from scouttyg/new-domain

Added new domain for better maintainability and fixed references to old domain

.travis.yml

@@ -6,7 +6,7 @@ rvm:
 env:
 notifications:
   email:
-    team@kandanapp.com
+    team@getkandan.com
 # whitelist
 branches:
   only:

README.md

@@ -1,4 +1,4 @@
-Kandan - [Modern Open Source Chat](http://www.kandanapp.com)
+Kandan - [Modern Open Source Chat](http://www.getkandan.com)
 ================================
 [![Build Status](https://travis-ci.org/kandanapp/kandan.png?branch=master)](https://travis-ci.org/kandanapp/kandan)
 [![Coverage Status](https://coveralls.io/repos/kandanapp/kandan/badge.png?branch=master)](https://coveralls.io/r/kandanapp/kandan)
@@ -41,9 +41,9 @@ That's not a question, it's an order! Or more of a friendly offer, really. Kanda
 
 * GitHub [issues tracker](https://github.com/kandanapp/kandan/issues)
 * Twitter [@kandanapp](https://twitter.com/kandanapp)
-* [Kandan Demo](http://kandan-demo.kandanapp.com) (Yes we eat our own DogFood)
+* [Kandan Demo](http://demo.getkandan.com) (Yes we eat our own DogFood)
 
-You can also email us at [admin@kandanapp.com](mailto:admin@kandanap.com)
+You can also email us at [admin@getkandan.com](mailto:admin@getkandan.com)
 
 
 Credits
@@ -56,4 +56,4 @@ Credits
 
 LICENSE
 =======
-Kandan's code and assets are dual-licensed. Kandan is available generally under the AGPL, and also under a custom license via special agreement. See LICENSE for the AGPL terms, and contact us at [admin@kandanapp.com](mailto:admin@kandanapp.com) if you're interested in development of Kandan under a custom license.
+Kandan's code and assets are dual-licensed. Kandan is available generally under the AGPL, and also under a custom license via special agreement. See LICENSE for the AGPL terms, and contact us at [admin@getkandan.com](mailto:admin@getkandan.com) if you're interested in development of Kandan under a custom license.

app/assets/javascripts/lib/jquery.inputHistory.js

@@ -5,7 +5,7 @@
  * Kandan's code and assets are dual-licensed. Kandan is available
  * generally under the AGPL, and also under a custom license via
  * special agreement. See LICENSE for the AGPL terms, and contact us
- * at <admin@kandanapp.com> if you're interested in development of
+ * at <admin@getkandan.com> if you're interested in development of
  * Kandan under a custom license.
  */
 

app/models/ability.rb

@@ -5,7 +5,7 @@
 # Kandan's code and assets are dual-licensed. Kandan is available
 # generally under the AGPL, and also under a custom license via
 # special agreement. See LICENSE for the AGPL terms, and contact us
-# at <admin@kandanapp.com> if you're interested in development of
+# at <admin@getkandan.com> if you're interested in development of
 # Kandan under a custom license.
 #==============================================================================
 class Ability

app/views/pages/about.html.erb

@@ -57,7 +57,7 @@
   <ul>
   <li>GitHub <a href="https://github.com/kandanapp/kandan/issues">Issues Tracker</a></li>
   <li>Twitter <a href="https://twitter.com/kandanapp">@kandanapp</a></li>
-  <li><a href="http://kandan-demo.kandanapp.com/">Kandan Demo</a> (Yes we eat our own DogFood)</li>
+  <li><a href="http://demo.getkandan.com/">Kandan Demo</a> (Yes we eat our own DogFood)</li>
   </ul>
 
   <h3>Contributors</h3>
@@ -75,6 +75,6 @@
     <% end %>
 
   <h3>Contact Us</h3>
-  <p>If you find any security issues please submit an <a href="https://github.com/kandanapp/kandan/issues">Issue</a> or <a href="mailto:admin@kandanapp.com">email us</a>.</p>
+  <p>If you find any security issues please submit an <a href="https://github.com/kandanapp/kandan/issues">Issue</a> or <a href="mailto:admin@getkandan.com">email us</a>.</p>
   <br><br>
 </div>

lib/tasks/kandan.rake

@@ -10,7 +10,7 @@ namespace :kandan do
     if user.nil?
       puts "Creating default user..."
       user = User.new
-      user.email      = "admin@kandanapp.com"
+      user.email      = "admin@getkandan.com"
       user.username  = "admin"
       user.first_name = "Admin"
       user.last_name  = "OfKandan"
@@ -47,17 +47,17 @@ namespace :kandan do
       puts "Creating default channel..."
       channel = Channel.create! name: 'Lobby', user: user
 
-      ["Welcome to Kandan, the slickest chat app out there. Brought to you by the good people of KandanApp (http://kandanapp.com) and friends",
+      ["Welcome to Kandan, the slickest chat app out there. Brought to you by the good people of KandanApp (http://getkandan.com) and friends",
        "We think you'll really like Kandan, but if there's anything you would like to see, Kandan is fully open source, so you can dive into it or make suggestions.",
        "To get started, you can embed images or youtube clips, use the /me command (/me is in proper love with Kandan, innit!), upload files, or of course, just chat with your teammates.",
-       "Just paste in an image url and type a subtitle http://kandanapp.com/images/kandanlogo.png",
+       "Just paste in an image url and type a subtitle http://getkandan.com/images/kandanlogo.png",
        "http://www.youtube.com/watch?v=MvzyWk4lMc8 Same with youtube videos",
        "To mention other folks just use @ and their username or use @all",
        "Checkout all emoticons available at http://www.emoji-cheat-sheet.com/",
        ":+1:",
        "/me is in proper love with Kandan, innit!",
        "If you're the type of person who enjoys hacking on projects, the source to Kandan is at https://github.com/kandanapp/kandan",
-       "Well, that's about it. If you have any questions, concerns, or ideas, just shoot us an email admin@kandanapp.com! Have fun!",
+       "Well, that's about it. If you have any questions, concerns, or ideas, just shoot us an email admin@getkandan.com! Have fun!",
       ].each do |message|
         a = Activity.new
         a.content    = message
@@ -71,7 +71,7 @@ namespace :kandan do
 
   desc "Creates the default hubot account."
   task :boot_hubot => :environment do
-    user = User.find_by_email("hubot@kandanapp.com")
+    user = User.find_by_email("hubot@getkandan.com")
 
     if user.nil?
       puts "Creating hubot user..."
@@ -80,7 +80,7 @@ namespace :kandan do
       128.times { password << (('a'..'z').to_a + ('A'..'Z').to_a + ['!','@','#','$','%','^','&','*','(',')'].to_a).sample }
 
       hubot = User.new
-      hubot.email      = "hubot@kandanapp.com"
+      hubot.email      = "hubot@getkandan.com"
       hubot.username   = "hubot"
       hubot.first_name = "Hubot"
       hubot.last_name  = "vonGithubben"
@@ -92,7 +92,7 @@ namespace :kandan do
 
   desc "Output the hubot access key"
   task :hubot_access_key => :environment do
-    if authentication_token = User.find_by_email("hubot@kandanapp.com").try(:authentication_token)
+    if authentication_token = User.find_by_email("hubot@getkandan.com").try(:authentication_token)
       puts "Your hubot access key is #{ authentication_token }"
     else
       puts "There's not hubot account. Run rake kandan:boot_hubot to create a bot account."