Spell our own name right

diaspora · Sep 16, 2010 · 708e9f8 · 708e9f8 · jrom · Sep 16, 2010
1 parent 1df94e7
commit 708e9f8
Show file tree

Hide file tree

Showing 177 changed files with 176 additions and 180 deletions.
diff --git a/Capfile b/Capfile
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/Gemfile b/Gemfile
@@ -8,12 +8,8 @@ gem 'bundler', '1.0.0'
 gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
 
 #Mongo
-#gem 'mongo_mapper', :git => 'http://github.com/BadMinus/mongomapper.git'
 gem 'mongo_mapper', '0.8.4', :git => 'http://github.com/jnunemaker/mongomapper.git'
-#gem 'mongo_mapper', :git => 'http://github.com/collectiveidea/mongomapper.git', :branch => 'rails3'
-#gem 'jnunemaker-validatable', :git => 'http://github.com/BadMinus/validatable.git'
 gem 'jnunemaker-validatable', '1.8.4', :git => 'http://github.com/jnunemaker/validatable.git'
-gem 'mongo_ext'
 gem 'bson_ext', '1.0.7'
 gem 'bson', '1.0.7'
 

diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/error_messages_helper.rb b/app/helpers/error_messages_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/album.rb b/app/models/album.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/aspect.rb b/app/models/aspect.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/person.rb b/app/models/person.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/photo.rb b/app/models/photo.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/post.rb b/app/models/post.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/profile.rb b/app/models/profile.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/request.rb b/app/models/request.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/retraction.rb b/app/models/retraction.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/status_message.rb b/app/models/status_message.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
@@ -1,4 +1,4 @@
-#   Copyright (c) 2010, Disapora Inc.  This file is
+#   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 

diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 

diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml
@@ -1,4 +1,4 @@
--#   Copyright (c) 2010, Disapora Inc.  This file is
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.