Skip to content

Commit

Permalink
Added new domain for better maintainability and fixed references to o…
Browse files Browse the repository at this point in the history
…ld domain
  • Loading branch information
scouttyg committed Mar 16, 2015
1 parent 547764f commit 5e10d00
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ rvm:
env:
notifications:
email:
team@kandanapp.com
team@getkandan.com
# whitelist
branches:
only:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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.
2 changes: 1 addition & 1 deletion app/assets/javascripts/lib/jquery.inputHistory.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

Expand Down
2 changes: 1 addition & 1 deletion app/models/ability.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/views/pages/about.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
14 changes: 7 additions & 7 deletions lib/tasks/kandan.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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..."
Expand All @@ -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"
Expand All @@ -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."
Expand Down

0 comments on commit 5e10d00

Please sign in to comment.