From 708e9f88a55cc37130f93cc47b820f62fbf48d2d Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 15 Sep 2010 17:56:18 -0700 Subject: [PATCH] Spell our own name right --- Capfile | 2 +- Gemfile | 4 ---- Rakefile | 2 +- app/controllers/albums_controller.rb | 2 +- app/controllers/application_controller.rb | 2 +- app/controllers/aspects_controller.rb | 2 +- app/controllers/comments_controller.rb | 2 +- app/controllers/dev_utilities_controller.rb | 2 +- app/controllers/people_controller.rb | 2 +- app/controllers/photos_controller.rb | 2 +- app/controllers/publics_controller.rb | 2 +- app/controllers/registrations_controller.rb | 2 +- app/controllers/requests_controller.rb | 2 +- app/controllers/sockets_controller.rb | 2 +- app/controllers/status_messages_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/helpers/albums_helper.rb | 2 +- app/helpers/application_helper.rb | 2 +- app/helpers/aspects_helper.rb | 2 +- app/helpers/dashboards_helper.rb | 2 +- app/helpers/error_messages_helper.rb | 2 +- app/helpers/layout_helper.rb | 2 +- app/helpers/people_helper.rb | 2 +- app/helpers/photos_helper.rb | 2 +- app/helpers/publics_helper.rb | 2 +- app/helpers/requests_helper.rb | 2 +- app/helpers/sockets_helper.rb | 2 +- app/helpers/status_messages_helper.rb | 2 +- app/models/album.rb | 2 +- app/models/aspect.rb | 2 +- app/models/comment.rb | 2 +- app/models/person.rb | 2 +- app/models/photo.rb | 2 +- app/models/post.rb | 2 +- app/models/profile.rb | 2 +- app/models/request.rb | 2 +- app/models/retraction.rb | 2 +- app/models/status_message.rb | 2 +- app/models/user.rb | 2 +- app/uploaders/image_uploader.rb | 2 +- app/views/albums/_album.html.haml | 2 +- app/views/albums/_new_album.haml | 2 +- app/views/albums/edit.html.haml | 2 +- app/views/albums/index.html.haml | 2 +- app/views/albums/show.html.haml | 2 +- app/views/aspects/_new_aspect.haml | 2 +- app/views/aspects/index.html.haml | 2 +- app/views/aspects/manage.html.haml | 2 +- app/views/aspects/show.html.haml | 2 +- app/views/comments/_comment.html.haml | 2 +- app/views/comments/_comments.html.haml | 2 +- app/views/comments/_new_comment.html.haml | 2 +- app/views/js/_websocket_js.haml | 2 +- app/views/layouts/application.html.haml | 2 +- app/views/layouts/session_wall.html.haml | 2 +- app/views/people/index.html.haml | 2 +- app/views/people/new.html.haml | 2 +- app/views/people/show.html.haml | 2 +- app/views/photos/_new_photo.haml | 2 +- app/views/photos/_photo.haml | 2 +- app/views/photos/edit.html.haml | 2 +- app/views/photos/new.html.haml | 2 +- app/views/photos/show.html.haml | 2 +- app/views/posts/_debug.haml | 2 +- app/views/posts/_post.html.haml | 2 +- app/views/requests/_new_request.haml | 2 +- app/views/shared/_aspect_friends.haml | 2 +- app/views/shared/_aspect_nav.haml | 2 +- app/views/shared/_post_wrapper.haml | 2 +- app/views/shared/_publisher.haml | 2 +- app/views/shared/log.haml | 2 +- app/views/status_messages/_new_status_message.haml | 2 +- app/views/status_messages/_status_message.html.haml | 2 +- app/views/status_messages/index.html.haml | 2 +- app/views/status_messages/show.html.haml | 2 +- app/views/users/edit.html.haml | 2 +- autotest/discover.rb | 2 +- config.ru | 2 +- config/app_config.yml | 2 +- config/application.rb | 2 +- config/boot.rb | 2 +- config/deploy.rb | 2 +- config/deploy_config.yml | 2 +- config/environment.rb | 2 +- config/environments/development.rb | 2 +- config/environments/production.rb | 2 +- config/environments/test.rb | 2 +- config/initializers/_mongo.rb | 2 +- config/initializers/backtrace_silencers.rb | 2 +- config/initializers/carrierwave.rb | 2 +- config/initializers/devise.rb | 2 +- config/initializers/inflections.rb | 2 +- config/initializers/load_app_config.rb | 2 +- config/initializers/logging.rb | 2 +- config/initializers/mime_types.rb | 2 +- config/initializers/rspec_generator.rb | 2 +- config/initializers/secret_token.rb | 2 +- config/initializers/session_store.rb | 2 +- config/initializers/socket.rb | 2 +- config/locales/devise.en.yml | 2 +- config/locales/en.yml | 2 +- config/routes.rb | 2 +- config/selenium.yml | 2 +- config/sprinkle/conf/nginx.conf | 2 +- config/sprinkle/packages/database.rb | 2 +- config/sprinkle/packages/essential.rb | 2 +- config/sprinkle/packages/ruby.rb | 2 +- config/sprinkle/packages/scm.rb | 2 +- config/sprinkle/packages/server.rb | 2 +- config/sprinkle/packages/unfortunately_essential.rb | 2 +- config/sprinkle/provision.rb | 2 +- config/thin.yml | 2 +- db/schema.rb | 2 +- db/seeds.rb | 2 +- db/seeds/backer.rb | 2 +- db/seeds/dev.rb | 2 +- db/seeds/tom.rb | 2 +- lib/chrome_frame.rb | 2 +- lib/diaspora.rb | 2 +- lib/diaspora/parser.rb | 2 +- lib/diaspora/user/friending.rb | 2 +- lib/diaspora/user/querying.rb | 2 +- lib/diaspora/webhooks.rb | 2 +- lib/diaspora/websocket.rb | 2 +- lib/encryptable.rb | 2 +- lib/encryptor.rb | 2 +- lib/hcard.rb | 2 +- lib/message_handler.rb | 2 +- lib/mongo_mapper/bson_id.rb | 2 +- lib/mongo_mapper/clear_dev_memory.rb | 2 +- lib/salmon/salmon.rb | 2 +- lib/tasks/db.rake | 2 +- lib/tasks/rspec.rake | 2 +- lib/tasks/saucelabs_adapter.rake | 2 +- public/javascripts/aspect-edit.js | 2 +- public/javascripts/image_picker.js | 2 +- public/javascripts/stream.js | 2 +- public/javascripts/view.js | 2 +- public/stylesheets/sass/application.sass | 2 +- public/stylesheets/sass/sessions.sass | 2 +- public/stylesheets/sass/ui.sass | 2 +- spec/controllers/aspects_controller_spec.rb | 2 +- spec/controllers/people_controller_spec.rb | 2 +- spec/controllers/publics_controller_spec.rb | 2 +- spec/controllers/requests_controller_spec.rb | 2 +- spec/controllers/sockets_controller_spec.rb | 2 +- spec/factories.rb | 2 +- spec/helpers/application_helper_spec.rb | 2 +- spec/helpers/publics_helper_spec.rb | 2 +- spec/helpers/requests_helper_spec.rb | 2 +- spec/lib/diaspora_parser_spec.rb | 2 +- spec/lib/hcard_spec.rb | 2 +- spec/lib/message_handler_spec.rb | 2 +- spec/lib/salmon_salmon_spec.rb | 2 +- spec/lib/web_hooks_spec.rb | 2 +- spec/misc_spec.rb | 2 +- spec/models/album_spec.rb | 2 +- spec/models/aspect_spec.rb | 2 +- spec/models/comments_spec.rb | 2 +- spec/models/person_spec.rb | 2 +- spec/models/photo_spec.rb | 2 +- spec/models/post_spec.rb | 2 +- spec/models/profile_spec.rb | 2 +- spec/models/request_spec.rb | 2 +- spec/models/retraction_spec.rb | 2 +- spec/models/status_message_spec.rb | 2 +- spec/models/user/posting_spec.rb | 2 +- spec/models/user/receive_spec.rb | 2 +- spec/models/user/user_friending_spec.rb | 2 +- spec/models/user/visible_posts_spec.rb | 2 +- spec/models/user_spec.rb | 2 +- spec/spec_helper.rb | 2 +- spec/user_encryption_spec.rb | 2 +- test/performance/browsing_test.rb | 2 +- test/selenium/login_test.rb | 2 +- test/selenium/selenium_suite.rb | 2 +- test/test_helper.rb | 2 +- 177 files changed, 176 insertions(+), 180 deletions(-) diff --git a/Capfile b/Capfile index 03e5a2de0..af77f235a 100644 --- 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 index 91d26abd6..8dafe9864 100644 --- 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 index d3b0435e8..c9b50786e 100644 --- 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 index 77b3635ec..f2047e0c2 100644 --- 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 index 50d2fd4ed..80ab618f8 100644 --- 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 index 14f4904ff..ac9f1f837 100644 --- 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 index 1d53ed46f..cf70d884a 100644 --- 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 index b24dac037..8533696b7 100644 --- 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 index 3b7e63b1f..648af9f2d 100644 --- 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 index f334a0ff0..f233a3a91 100644 --- 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 index 0ca7043df..9b0e6e37e 100644 --- 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 index c8122e8d6..d9b68be2a 100644 --- 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 index c84e80939..42bbe856a 100644 --- 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 index b9c5eb480..b997fe629 100644 --- 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 index adf4d8e11..d126d2da8 100644 --- 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 index f8b1a5021..87b6f1e70 100644 --- 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 index 8a89d23ce..5f4194558 100644 --- 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 index 422d129eb..169b86485 100644 --- 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 index faf50d182..adceab8fd 100644 --- 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 index bae59e050..542d938ee 100644 --- 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 index ab278a8a3..8f057ee1c 100644 --- 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 index 6b75bab46..b6931d8b5 100644 --- 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 index bc3c716aa..3631ce041 100644 --- 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 index 71d58c1a5..e18a99391 100644 --- 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 index 94cff1b41..af84ee3a2 100644 --- 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 index 409e1e403..60489c36e 100644 --- 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 index 775be4cb7..7202fd3ed 100644 --- 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 index 152a25950..ff6c2674a 100644 --- 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 index 316bee164..b0998521f 100644 --- 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 index 779ccf1d4..591b8427d 100644 --- 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 index ba335458a..5c14f6608 100644 --- 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 index 8bd8aaa73..095c88293 100644 --- 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 index 4f38053cc..b89cd251b 100644 --- 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 index 8d9ae0b66..da54a9326 100644 --- 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 index 870532e6b..365ecf4fd 100644 --- 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 index 6303d28c4..0043a61c9 100644 --- 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 index cd8bd1757..23c0e6fea 100644 --- 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 index c660f4940..b56d5f1ff 100644 --- 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 index 8dcca73ae..ec6acbe3a 100644 --- 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 index 2b2b17356..6e5312341 100644 --- 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 index eb6f0dd14..f4893ed8f 100644 --- 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 index 05c4f4468..8a37cb2c0 100644 --- 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 index 991133d30..a4bf3aef6 100644 --- 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 index 2eb61a37f..fa4098c18 100644 --- 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 index d60717cd5..843523223 100644 --- 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 index cfd67b215..b5bc7ace3 100644 --- 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 index 115cccbf1..5ea9cadb3 100644 --- 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 index d6d868db3..8a6ed97ac 100644 --- 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 index c8cd70ed8..f10ccee74 100644 --- 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 index eb0864197..6b6c1dab5 100644 --- 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 index fc7cea6e8..fc5c64da7 100644 --- 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 index 11b7438b4..e998d98b7 100644 --- 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 index 49fb9b606..483621625 100644 --- 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 index e84f26cc5..4a3ec2dbb 100644 --- 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 index 39e11b160..351daee0e 100644 --- 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 index b495aef30..57bd5b560 100644 --- 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 index 66d70882a..b2203eb3f 100644 --- 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 index b4b342f18..4f76f18cf 100644 --- 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 index 64e5fed2e..f6777fa4a 100644 --- 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 index 78934fb05..f0a3f2c83 100644 --- 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 index 6b898e263..f695f850d 100644 --- 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 index 826d9c02c..a8814d770 100644 --- 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 index cd49f9158..654bea892 100644 --- 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 index 0f86c7df7..27d508cf2 100644 --- 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 index b2026d130..217441465 100644 --- 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. diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml index 3f077d26d..b7e5819f6 100644 --- a/app/views/requests/_new_request.haml +++ b/app/views/requests/_new_request.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/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml index c649415d6..6ab286a81 100644 --- a/app/views/shared/_aspect_friends.haml +++ b/app/views/shared/_aspect_friends.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/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml index 67f0bc6a0..b61def9f5 100644 --- a/app/views/shared/_aspect_nav.haml +++ b/app/views/shared/_aspect_nav.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/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml index 48bdc4cf0..b901fc608 100644 --- a/app/views/shared/_post_wrapper.haml +++ b/app/views/shared/_post_wrapper.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/shared/_publisher.haml b/app/views/shared/_publisher.haml index 5ed158dd1..4645ec65c 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.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/shared/log.haml b/app/views/shared/log.haml index e390bbb90..7472689e3 100644 --- a/app/views/shared/log.haml +++ b/app/views/shared/log.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/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml index 55affeaae..329e72d66 100644 --- a/app/views/status_messages/_new_status_message.haml +++ b/app/views/status_messages/_new_status_message.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/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index 47b77f86e..a22098afa 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.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/status_messages/index.html.haml b/app/views/status_messages/index.html.haml index dbc91489e..c2a579d87 100644 --- a/app/views/status_messages/index.html.haml +++ b/app/views/status_messages/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/status_messages/show.html.haml b/app/views/status_messages/show.html.haml index 0d5b1d463..358c2244b 100644 --- a/app/views/status_messages/show.html.haml +++ b/app/views/status_messages/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/users/edit.html.haml b/app/views/users/edit.html.haml index ce0b822a7..cddec8d77 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/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/autotest/discover.rb b/autotest/discover.rb index 1801452fd..99ab1f6e4 100644 --- a/autotest/discover.rb +++ b/autotest/discover.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/config.ru b/config.ru index 3192790d0..cb12bcfa2 100644 --- a/config.ru +++ b/config.ru @@ -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/config/app_config.yml b/config/app_config.yml index 37c0ad55f..0a206c366 100644 --- a/config/app_config.yml +++ b/config/app_config.yml @@ -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/config/application.rb b/config/application.rb index 47d161adc..3beb23b5f 100644 --- a/config/application.rb +++ b/config/application.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/config/boot.rb b/config/boot.rb index 235f58699..faeac6742 100644 --- a/config/boot.rb +++ b/config/boot.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/config/deploy.rb b/config/deploy.rb index b20ef5517..446f8f7a6 100644 --- a/config/deploy.rb +++ b/config/deploy.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/config/deploy_config.yml b/config/deploy_config.yml index 46586ec12..c653b6565 100644 --- a/config/deploy_config.yml +++ b/config/deploy_config.yml @@ -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/config/environment.rb b/config/environment.rb index 7aba1ad72..dc11087dd 100644 --- a/config/environment.rb +++ b/config/environment.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/config/environments/development.rb b/config/environments/development.rb index 6e52749ee..66a0ef31a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.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/config/environments/production.rb b/config/environments/production.rb index 8adb7e854..11d42d349 100644 --- a/config/environments/production.rb +++ b/config/environments/production.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/config/environments/test.rb b/config/environments/test.rb index cc27f1bfa..41aefad35 100644 --- a/config/environments/test.rb +++ b/config/environments/test.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/config/initializers/_mongo.rb b/config/initializers/_mongo.rb index 3d5cfebcb..2764f9743 100644 --- a/config/initializers/_mongo.rb +++ b/config/initializers/_mongo.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/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index 2988609d4..d456f8c8b 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.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/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index ebf20de36..6dea937e9 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.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/config/initializers/devise.rb b/config/initializers/devise.rb index e0d4758cb..d882f6038 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.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/config/initializers/inflections.rb b/config/initializers/inflections.rb index 9406e3f89..ba731fa19 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.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/config/initializers/load_app_config.rb b/config/initializers/load_app_config.rb index a61962d28..1a5094d9b 100644 --- a/config/initializers/load_app_config.rb +++ b/config/initializers/load_app_config.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/config/initializers/logging.rb b/config/initializers/logging.rb index 6666a0f91..86abdbea3 100644 --- a/config/initializers/logging.rb +++ b/config/initializers/logging.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/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 438224147..a5a89433a 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.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/config/initializers/rspec_generator.rb b/config/initializers/rspec_generator.rb index 465f440b7..caf2be23a 100644 --- a/config/initializers/rspec_generator.rb +++ b/config/initializers/rspec_generator.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/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 9542e2722..de86a04fa 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.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/config/initializers/session_store.rb b/config/initializers/session_store.rb index 5b18eaeb1..de79a36eb 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.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/config/initializers/socket.rb b/config/initializers/socket.rb index 5657a5a76..198036c2f 100644 --- a/config/initializers/socket.rb +++ b/config/initializers/socket.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/config/locales/devise.en.yml b/config/locales/devise.en.yml index ff91fca86..09d3ac62c 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -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/config/locales/en.yml b/config/locales/en.yml index fd5baca73..1de275cf9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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/config/routes.rb b/config/routes.rb index c3205ed25..f8de6f95c 100644 --- a/config/routes.rb +++ b/config/routes.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/config/selenium.yml b/config/selenium.yml index 4579d800c..74ce21d73 100644 --- a/config/selenium.yml +++ b/config/selenium.yml @@ -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/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf index c108d39b4..2b3aa8a40 100644 --- a/config/sprinkle/conf/nginx.conf +++ b/config/sprinkle/conf/nginx.conf @@ -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/config/sprinkle/packages/database.rb b/config/sprinkle/packages/database.rb index 7c5222cef..cabfeba3e 100644 --- a/config/sprinkle/packages/database.rb +++ b/config/sprinkle/packages/database.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/config/sprinkle/packages/essential.rb b/config/sprinkle/packages/essential.rb index 737e02665..7c00d9d0d 100644 --- a/config/sprinkle/packages/essential.rb +++ b/config/sprinkle/packages/essential.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/config/sprinkle/packages/ruby.rb b/config/sprinkle/packages/ruby.rb index 71b59a504..fa02c6adb 100644 --- a/config/sprinkle/packages/ruby.rb +++ b/config/sprinkle/packages/ruby.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/config/sprinkle/packages/scm.rb b/config/sprinkle/packages/scm.rb index acf47d8ef..410f91a87 100644 --- a/config/sprinkle/packages/scm.rb +++ b/config/sprinkle/packages/scm.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/config/sprinkle/packages/server.rb b/config/sprinkle/packages/server.rb index 8063ae9ff..68e1a12aa 100644 --- a/config/sprinkle/packages/server.rb +++ b/config/sprinkle/packages/server.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/config/sprinkle/packages/unfortunately_essential.rb b/config/sprinkle/packages/unfortunately_essential.rb index a9c7bc353..d1504bc43 100644 --- a/config/sprinkle/packages/unfortunately_essential.rb +++ b/config/sprinkle/packages/unfortunately_essential.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/config/sprinkle/provision.rb b/config/sprinkle/provision.rb index 614aab119..f980f8b3f 100644 --- a/config/sprinkle/provision.rb +++ b/config/sprinkle/provision.rb @@ -1,5 +1,5 @@ #!/usr/bin/env sprinkle -s -# 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/config/thin.yml b/config/thin.yml index 072a7c8c0..cc071975d 100644 --- a/config/thin.yml +++ b/config/thin.yml @@ -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/db/schema.rb b/db/schema.rb index faff24cce..df5a09c9b 100644 --- a/db/schema.rb +++ b/db/schema.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/db/seeds.rb b/db/seeds.rb index 5bbc6875d..29a5191f4 100644 --- a/db/seeds.rb +++ b/db/seeds.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/db/seeds/backer.rb b/db/seeds/backer.rb index f3be616c7..975409be3 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.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/db/seeds/dev.rb b/db/seeds/dev.rb index 116a55929..f95c1aa50 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.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/db/seeds/tom.rb b/db/seeds/tom.rb index 685cc35a6..c67c2732c 100644 --- a/db/seeds/tom.rb +++ b/db/seeds/tom.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/lib/chrome_frame.rb b/lib/chrome_frame.rb index d6be7d5d5..4fc42b7de 100644 --- a/lib/chrome_frame.rb +++ b/lib/chrome_frame.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/lib/diaspora.rb b/lib/diaspora.rb index 515d1b8b1..959d0bb92 100644 --- a/lib/diaspora.rb +++ b/lib/diaspora.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/lib/diaspora/parser.rb b/lib/diaspora/parser.rb index aa6441ba5..6bc5d4eab 100644 --- a/lib/diaspora/parser.rb +++ b/lib/diaspora/parser.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/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb index 462990b08..50aae336a 100644 --- a/lib/diaspora/user/friending.rb +++ b/lib/diaspora/user/friending.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/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb index 5d5cf261d..ad023f2fb 100644 --- a/lib/diaspora/user/querying.rb +++ b/lib/diaspora/user/querying.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/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb index d2cfa3d4a..81f7bcfaf 100644 --- a/lib/diaspora/webhooks.rb +++ b/lib/diaspora/webhooks.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/lib/diaspora/websocket.rb b/lib/diaspora/websocket.rb index c8cc011b4..796484dd7 100644 --- a/lib/diaspora/websocket.rb +++ b/lib/diaspora/websocket.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/lib/encryptable.rb b/lib/encryptable.rb index 431270e76..fa9c96045 100644 --- a/lib/encryptable.rb +++ b/lib/encryptable.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/lib/encryptor.rb b/lib/encryptor.rb index b92e5d840..63f9ee890 100644 --- a/lib/encryptor.rb +++ b/lib/encryptor.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/lib/hcard.rb b/lib/hcard.rb index a08bca572..7658c5a1d 100644 --- a/lib/hcard.rb +++ b/lib/hcard.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/lib/message_handler.rb b/lib/message_handler.rb index e6a226987..b2b399298 100644 --- a/lib/message_handler.rb +++ b/lib/message_handler.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/lib/mongo_mapper/bson_id.rb b/lib/mongo_mapper/bson_id.rb index 08dd76400..4de833a66 100644 --- a/lib/mongo_mapper/bson_id.rb +++ b/lib/mongo_mapper/bson_id.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/lib/mongo_mapper/clear_dev_memory.rb b/lib/mongo_mapper/clear_dev_memory.rb index d125d62c2..88c7facce 100644 --- a/lib/mongo_mapper/clear_dev_memory.rb +++ b/lib/mongo_mapper/clear_dev_memory.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/lib/salmon/salmon.rb b/lib/salmon/salmon.rb index ea25b9f9d..61b58a334 100644 --- a/lib/salmon/salmon.rb +++ b/lib/salmon/salmon.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/lib/tasks/db.rake b/lib/tasks/db.rake index 04f42d3a2..e1c0aac31 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -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/lib/tasks/rspec.rake b/lib/tasks/rspec.rake index 820051b50..85ae513f6 100644 --- a/lib/tasks/rspec.rake +++ b/lib/tasks/rspec.rake @@ -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/lib/tasks/saucelabs_adapter.rake b/lib/tasks/saucelabs_adapter.rake index 0516316f7..76f6cbbc4 100644 --- a/lib/tasks/saucelabs_adapter.rake +++ b/lib/tasks/saucelabs_adapter.rake @@ -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/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js index 6cd570e29..e1d9b6c6c 100644 --- a/public/javascripts/aspect-edit.js +++ b/public/javascripts/aspect-edit.js @@ -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/public/javascripts/image_picker.js b/public/javascripts/image_picker.js index 885ba0e11..1342102ee 100644 --- a/public/javascripts/image_picker.js +++ b/public/javascripts/image_picker.js @@ -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/public/javascripts/stream.js b/public/javascripts/stream.js index 03d54dbe4..cf0856754 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -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/public/javascripts/view.js b/public/javascripts/view.js index 1c7ba8789..4713c7164 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -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/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 02943e0cf..3912e1648 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -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/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass index 2602c3183..326d46b0f 100644 --- a/public/stylesheets/sass/sessions.sass +++ b/public/stylesheets/sass/sessions.sass @@ -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/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass index 107de1118..d3ea77e0e 100644 --- a/public/stylesheets/sass/ui.sass +++ b/public/stylesheets/sass/ui.sass @@ -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/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb index fdba4e000..c6f85838d 100644 --- a/spec/controllers/aspects_controller_spec.rb +++ b/spec/controllers/aspects_controller_spec.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/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb index 39d9142fa..f0f3c0462 100644 --- a/spec/controllers/people_controller_spec.rb +++ b/spec/controllers/people_controller_spec.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/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb index ab7d5a602..86f013ae2 100644 --- a/spec/controllers/publics_controller_spec.rb +++ b/spec/controllers/publics_controller_spec.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/spec/controllers/requests_controller_spec.rb b/spec/controllers/requests_controller_spec.rb index 4ad40894c..7da3d062e 100644 --- a/spec/controllers/requests_controller_spec.rb +++ b/spec/controllers/requests_controller_spec.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/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb index 22e9d9360..c8316b82c 100644 --- a/spec/controllers/sockets_controller_spec.rb +++ b/spec/controllers/sockets_controller_spec.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/spec/factories.rb b/spec/factories.rb index 374c6c76b..1a6177363 100644 --- a/spec/factories.rb +++ b/spec/factories.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/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 533dc6ea3..4e3b70c96 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.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/spec/helpers/publics_helper_spec.rb b/spec/helpers/publics_helper_spec.rb index 7a546601b..44a0c869f 100644 --- a/spec/helpers/publics_helper_spec.rb +++ b/spec/helpers/publics_helper_spec.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/spec/helpers/requests_helper_spec.rb b/spec/helpers/requests_helper_spec.rb index e5f47b6a4..3e90a509d 100644 --- a/spec/helpers/requests_helper_spec.rb +++ b/spec/helpers/requests_helper_spec.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/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb index 5fa064958..dbc11237c 100644 --- a/spec/lib/diaspora_parser_spec.rb +++ b/spec/lib/diaspora_parser_spec.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/spec/lib/hcard_spec.rb b/spec/lib/hcard_spec.rb index ae7ada242..89ad49924 100644 --- a/spec/lib/hcard_spec.rb +++ b/spec/lib/hcard_spec.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/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb index 251acc551..db97872d0 100644 --- a/spec/lib/message_handler_spec.rb +++ b/spec/lib/message_handler_spec.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/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb index 2ff5abd9f..74be347d4 100644 --- a/spec/lib/salmon_salmon_spec.rb +++ b/spec/lib/salmon_salmon_spec.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/spec/lib/web_hooks_spec.rb b/spec/lib/web_hooks_spec.rb index 056660708..d3486f1b5 100644 --- a/spec/lib/web_hooks_spec.rb +++ b/spec/lib/web_hooks_spec.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/spec/misc_spec.rb b/spec/misc_spec.rb index 9995da06c..34850913b 100644 --- a/spec/misc_spec.rb +++ b/spec/misc_spec.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/spec/models/album_spec.rb b/spec/models/album_spec.rb index ed55ce218..2edebecf6 100644 --- a/spec/models/album_spec.rb +++ b/spec/models/album_spec.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/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb index d07d917f5..bb14e2055 100644 --- a/spec/models/aspect_spec.rb +++ b/spec/models/aspect_spec.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/spec/models/comments_spec.rb b/spec/models/comments_spec.rb index b50ebddef..5a0199b61 100644 --- a/spec/models/comments_spec.rb +++ b/spec/models/comments_spec.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/spec/models/person_spec.rb b/spec/models/person_spec.rb index 98f1c3b73..f41c14b3e 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.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/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index 433c47d16..da65f43fc 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.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/spec/models/post_spec.rb b/spec/models/post_spec.rb index 9fe37b98e..c3d3777b1 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.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/spec/models/profile_spec.rb b/spec/models/profile_spec.rb index 1cb26be46..ad2a7a6be 100644 --- a/spec/models/profile_spec.rb +++ b/spec/models/profile_spec.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/spec/models/request_spec.rb b/spec/models/request_spec.rb index 715a310b9..24968ce76 100644 --- a/spec/models/request_spec.rb +++ b/spec/models/request_spec.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/spec/models/retraction_spec.rb b/spec/models/retraction_spec.rb index bab066787..9aa2b8a76 100644 --- a/spec/models/retraction_spec.rb +++ b/spec/models/retraction_spec.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/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb index 5718c1c69..8a4ebdd12 100644 --- a/spec/models/status_message_spec.rb +++ b/spec/models/status_message_spec.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/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb index 7260151b4..5c1c6eb70 100644 --- a/spec/models/user/posting_spec.rb +++ b/spec/models/user/posting_spec.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/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb index 517b032a4..89d60dfff 100644 --- a/spec/models/user/receive_spec.rb +++ b/spec/models/user/receive_spec.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/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb index 96529e025..62e536966 100644 --- a/spec/models/user/user_friending_spec.rb +++ b/spec/models/user/user_friending_spec.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/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb index b20e3590a..9f6a140b8 100644 --- a/spec/models/user/visible_posts_spec.rb +++ b/spec/models/user/visible_posts_spec.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/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7ef142a19..887f599e5 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.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/spec/spec_helper.rb b/spec/spec_helper.rb index 8606ab703..52a03e47e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_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/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb index 08e69e561..76e9d900e 100644 --- a/spec/user_encryption_spec.rb +++ b/spec/user_encryption_spec.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/test/performance/browsing_test.rb b/test/performance/browsing_test.rb index 49ca065e5..74e8c9421 100644 --- a/test/performance/browsing_test.rb +++ b/test/performance/browsing_test.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/test/selenium/login_test.rb b/test/selenium/login_test.rb index d70819035..321d46e1d 100644 --- a/test/selenium/login_test.rb +++ b/test/selenium/login_test.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/test/selenium/selenium_suite.rb b/test/selenium/selenium_suite.rb index 2cdefa138..d5362b1d7 100644 --- a/test/selenium/selenium_suite.rb +++ b/test/selenium/selenium_suite.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/test/test_helper.rb b/test/test_helper.rb index d0b11c63e..d9742c116 100644 --- a/test/test_helper.rb +++ b/test/test_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.