diff options
172 files changed, 520 insertions, 2924 deletions
@@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 f6587305d..77b3635ec 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class AlbumsController < ApplicationController before_filter :authenticate_user! diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 76fd30729..50d2fd4ed 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class ApplicationController < ActionController::Base diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index e7c07d0ef..14f4904ff 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class AspectsController < ApplicationController diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 4e446758d..1d53ed46f 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class CommentsController < ApplicationController diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb index 994a014d0..b24dac037 100644 --- a/app/controllers/dev_utilities_controller.rb +++ b/app/controllers/dev_utilities_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class DevUtilitiesController < ApplicationController diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 998839a5c..3b7e63b1f 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class PeopleController < ApplicationController diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index 7f23882f3..f334a0ff0 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class PhotosController < ApplicationController diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb index d81746790..0ca7043df 100644 --- a/app/controllers/publics_controller.rb +++ b/app/controllers/publics_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class PublicsController < ApplicationController diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 56ffae0e4..c84e80939 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class RequestsController < ApplicationController diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb index d49130ab4..b9c5eb480 100644 --- a/app/controllers/sockets_controller.rb +++ b/app/controllers/sockets_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class SocketsController < ApplicationController diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index 41f1d1e1f..adf4d8e11 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class StatusMessagesController < ApplicationController diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 55a74683e..f8b1a5021 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class UsersController < ApplicationController diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb index 712b7ac72..8a89d23ce 100644 --- a/app/helpers/albums_helper.rb +++ b/app/helpers/albums_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module AlbumsHelper diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a43854240..422d129eb 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module ApplicationHelper diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb index d67ecca0b..faf50d182 100644 --- a/app/helpers/aspects_helper.rb +++ b/app/helpers/aspects_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module AspectsHelper diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb index b1fb1bdf3..bae59e050 100644 --- a/app/helpers/dashboards_helper.rb +++ b/app/helpers/dashboards_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module DashboardsHelper diff --git a/app/helpers/error_messages_helper.rb b/app/helpers/error_messages_helper.rb index 09075b88e..ab278a8a3 100644 --- a/app/helpers/error_messages_helper.rb +++ b/app/helpers/error_messages_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module ErrorMessagesHelper diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index c7ad44b19..6b75bab46 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. # These helper methods can be called in your template to set variables to be used in the layout diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb index cb6e49225..bc3c716aa 100644 --- a/app/helpers/people_helper.rb +++ b/app/helpers/people_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module PeopleHelper diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb index 97ce8ad4b..71d58c1a5 100644 --- a/app/helpers/photos_helper.rb +++ b/app/helpers/photos_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module PhotosHelper diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb index a6f1dfc22..94cff1b41 100644 --- a/app/helpers/publics_helper.rb +++ b/app/helpers/publics_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module PublicsHelper diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb index 492fff77f..409e1e403 100644 --- a/app/helpers/requests_helper.rb +++ b/app/helpers/requests_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module RequestsHelper diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb index f88799166..775be4cb7 100644 --- a/app/helpers/sockets_helper.rb +++ b/app/helpers/sockets_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module SocketsHelper diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb index 1fa606d45..152a25950 100644 --- a/app/helpers/status_messages_helper.rb +++ b/app/helpers/status_messages_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. module StatusMessagesHelper diff --git a/app/models/album.rb b/app/models/album.rb index 48927e126..316bee164 100644 --- a/app/models/album.rb +++ b/app/models/album.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class Album < Post diff --git a/app/models/aspect.rb b/app/models/aspect.rb index 616e6a05f..779ccf1d4 100644 --- a/app/models/aspect.rb +++ b/app/models/aspect.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class Aspect diff --git a/app/models/comment.rb b/app/models/comment.rb index 3382d7388..ba335458a 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class Comment diff --git a/app/models/person.rb b/app/models/person.rb index b9fd85cc0..836a810ec 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. require 'lib/hcard' diff --git a/app/models/photo.rb b/app/models/photo.rb index bd64170b7..4f38053cc 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class Photo < Post diff --git a/app/models/post.rb b/app/models/post.rb index 10e7ac8ea..8d9ae0b66 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class Post diff --git a/app/models/profile.rb b/app/models/profile.rb index 2b175f4e3..870532e6b 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class Profile diff --git a/app/models/request.rb b/app/models/request.rb index a9cb2e6f2..6303d28c4 100644 --- a/app/models/request.rb +++ b/app/models/request.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class Request diff --git a/app/models/retraction.rb b/app/models/retraction.rb index c632d62bb..cd8bd1757 100644 --- a/app/models/retraction.rb +++ b/app/models/retraction.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class Retraction diff --git a/app/models/status_message.rb b/app/models/status_message.rb index ed2d80804..c660f4940 100644 --- a/app/models/status_message.rb +++ b/app/models/status_message.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class StatusMessage < Post diff --git a/app/models/user.rb b/app/models/user.rb index cefa4e4d4..185c5ea55 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. require 'lib/diaspora/user/friending.rb' diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index 6f05a68da..2b2b17356 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. class ImageUploader < CarrierWave::Uploader::Base diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml index b92611f6f..eb6f0dd14 100644 --- a/app/views/albums/_album.html.haml +++ b/app/views/albums/_album.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. .album{:id => post.id, :class => ("mine" if current_user.owns?(post))} %div.name diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml index 20fac83f0..05c4f4468 100644 --- a/app/views/albums/_new_album.haml +++ b/app/views/albums/_new_album.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %h1 Add a new album diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml index fbba84431..991133d30 100644 --- a/app/views/albums/edit.html.haml +++ b/app/views/albums/edit.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. .back= link_to "⇧ #{@album.name}", @album diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 3f54c05ee..2eb61a37f 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. - content_for :head do diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index e55d1962b..d60717cd5 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. :javascript diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml index bcaae22f3..cfd67b215 100644 --- a/app/views/aspects/_new_aspect.haml +++ b/app/views/aspects/_new_aspect.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %h1 Add a new aspect diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 31da62679..115cccbf1 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. - content_for :page_title do diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index 54cb3eee8..d6d868db3 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. - content_for :head do diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml index 43abfb6f2..c8cd70ed8 100644 --- a/app/views/aspects/show.html.haml +++ b/app/views/aspects/show.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. - content_for :page_title do diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml index 1dcb06334..eb0864197 100644 --- a/app/views/comments/_comment.html.haml +++ b/app/views/comments/_comment.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %li.comment{:id => post.id} diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml index 04a5ae31d..fc7cea6e8 100644 --- a/app/views/comments/_comments.html.haml +++ b/app/views/comments/_comments.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %div.comments diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml index 9b3366799..11b7438b4 100644 --- a/app/views/comments/_new_comment.html.haml +++ b/app/views/comments/_new_comment.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. = form_for Comment.new, :remote => true do |f| diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml index e2641c511..49fb9b606 100644 --- a/app/views/js/_websocket_js.haml +++ b/app/views/js/_websocket_js.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. = javascript_include_tag 'FABridge', 'swfobject', 'web_socket' diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 62a655091..e84f26cc5 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora 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 f31226102..2b2828a4a 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora 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 6fa5d24a5..0213b06ea 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %h1.big_text diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml index f7c1a029d..933c26778 100644 --- a/app/views/people/new.html.haml +++ b/app/views/people/new.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. - title "New Person" diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 64d71defc..b4b342f18 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. - content_for :page_title do diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml index dce4dc68e..64e5fed2e 100644 --- a/app/views/photos/_new_photo.haml +++ b/app/views/photos/_new_photo.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. :javascript diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml index 57b81ee41..78934fb05 100644 --- a/app/views/photos/_photo.haml +++ b/app/views/photos/_photo.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %li.message{:id => post.id} diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml index dafdb62ff..6b898e263 100644 --- a/app/views/photos/edit.html.haml +++ b/app/views/photos/edit.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %h1.big_text diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml index fcf7309f6..826d9c02c 100644 --- a/app/views/photos/new.html.haml +++ b/app/views/photos/new.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. - title "New Photo" diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index a7fc49647..cd49f9158 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. :javascript diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml index 0eaf5310d..0f86c7df7 100644 --- a/app/views/posts/_debug.haml +++ b/app/views/posts/_debug.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. #debug_info diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml index 562c7fd46..b2026d130 100644 --- a/app/views/posts/_post.html.haml +++ b/app/views/posts/_post.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %ul diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml index 27e4f05f4..3f077d26d 100644 --- a/app/views/requests/_new_request.haml +++ b/app/views/requests/_new_request.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %h1 diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml index 71c41ef6a..3df030a64 100644 --- a/app/views/shared/_aspect_friends.haml +++ b/app/views/shared/_aspect_friends.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. #friend_pictures diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml index f7f29b97f..97f19aae0 100644 --- a/app/views/shared/_aspect_nav.haml +++ b/app/views/shared/_aspect_nav.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. #aspect_nav diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml index c655ae724..48bdc4cf0 100644 --- a/app/views/shared/_post_wrapper.haml +++ b/app/views/shared/_post_wrapper.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 93d445ac6..5ed158dd1 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. #publisher diff --git a/app/views/shared/log.haml b/app/views/shared/log.haml index 636db29f6..e390bbb90 100644 --- a/app/views/shared/log.haml +++ b/app/views/shared/log.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. = @log.to_s diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml index 63220380b..55affeaae 100644 --- a/app/views/status_messages/_new_status_message.haml +++ b/app/views/status_messages/_new_status_message.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. = form_for StatusMessage.new, :remote => true do |f| diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index 9581e4c1d..4576b4fd6 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml index d35fd0d71..dbc91489e 100644 --- a/app/views/status_messages/index.html.haml +++ b/app/views/status_messages/index.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %h1.big_text status messages diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml index 7f49a3bcd..0d5b1d463 100644 --- a/app/views/status_messages/show.html.haml +++ b/app/views/status_messages/show.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. - title "Status Message" diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 08a89abbb..de0c837fb 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -1,20 +1,6 @@ --# Copyright 2010 Diaspora Inc. --# --# This file is part of Diaspora. --# --# Diaspora is free software: you can redistribute it and/or modify --# it under the terms of the GNU Affero General Public License as published by --# the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# Diaspora is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Affero General Public License for more details. --# --# You should have received a copy of the GNU Affero General Public License --# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. --# +-# Copyright (c) 2010, Disapora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. %h1.big_text diff --git a/autotest/discover.rb b/autotest/discover.rb index 6270cb423..1801452fd 100644 --- a/autotest/discover.rb +++ b/autotest/discover.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. Autotest.add_discovery { "rails" } @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 f52f1bd77..37c0ad55f 100644 --- a/config/app_config.yml +++ b/config/app_config.yml @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 553f1eee8..47d161adc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 b53143f3f..235f58699 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 0394af864..b20ef5517 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 98763d0da..46586ec12 100644 --- a/config/deploy_config.yml +++ b/config/deploy_config.yml @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 b3bbadb48..7aba1ad72 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 4da09b4f9..6e52749ee 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. require 'lib/mongo_mapper/clear_dev_memory' diff --git a/config/environments/production.rb b/config/environments/production.rb index 4f569446d..8adb7e854 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. Diaspora::Application.configure do diff --git a/config/environments/test.rb b/config/environments/test.rb index a8e685993..cc27f1bfa 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. Diaspora::Application.configure do diff --git a/config/initializers/_mongo.rb b/config/initializers/_mongo.rb index f440b857d..3d5cfebcb 100644 --- a/config/initializers/_mongo.rb +++ b/config/initializers/_mongo.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. MongoMapper.connection = Mongo::Connection.new('localhost', 27017) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index ac8741844..2988609d4 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. # Be sure to restart your server when you modify this file. diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index df68ab031..ebf20de36 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. CarrierWave.configure do |config| diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index df25a0e2a..e0d4758cb 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. # Use this hook to configure devise mailer, warden hooks and so forth. The first diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 8d7d7fcfe..9406e3f89 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. # Be sure to restart your server when you modify this file. diff --git a/config/initializers/load_app_config.rb b/config/initializers/load_app_config.rb index ff27e8a80..a61962d28 100644 --- a/config/initializers/load_app_config.rb +++ b/config/initializers/load_app_config.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. raw_config = File.read("#{Rails.root}/config/app_config.yml") diff --git a/config/initializers/logging.rb b/config/initializers/logging.rb index 9517b2644..6666a0f91 100644 --- a/config/initializers/logging.rb +++ b/config/initializers/logging.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. Rails.logger = Logger.new( diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 01b410cec..438224147 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. # Be sure to restart your server when you modify this file. diff --git a/config/initializers/rspec_generator.rb b/config/initializers/rspec_generator.rb index 2c5bd8f9d..465f440b7 100644 --- a/config/initializers/rspec_generator.rb +++ b/config/initializers/rspec_generator.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. Diaspora::Application.configure do diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index f5b3f0a7f..9542e2722 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. # Be sure to restart your server when you modify this file. diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index f11c8a336..5b18eaeb1 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. # Be sure to restart your server when you modify this file. diff --git a/config/initializers/socket.rb b/config/initializers/socket.rb index bf1415084..5657a5a76 100644 --- a/config/initializers/socket.rb +++ b/config/initializers/socket.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. require 'em-websocket' diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index e972c2dfd..ff91fca86 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. en: diff --git a/config/locales/en.yml b/config/locales/en.yml index 625338623..fd5baca73 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. # Sample localization file for English. Add more files in this directory for other locales. diff --git a/config/routes.rb b/config/routes.rb index c949d232d..213e090a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 87ad6b2d7..4579d800c 100644 --- a/config/selenium.yml +++ b/config/selenium.yml @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 495c89f79..c108d39b4 100644 --- a/config/sprinkle/conf/nginx.conf +++ b/config/sprinkle/conf/nginx.conf @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 bca0688dc..7c5222cef 100644 --- a/config/sprinkle/packages/database.rb +++ b/config/sprinkle/packages/database.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 719dcdc90..737e02665 100644 --- a/config/sprinkle/packages/essential.rb +++ b/config/sprinkle/packages/essential.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 f0cecd904..71b59a504 100644 --- a/config/sprinkle/packages/ruby.rb +++ b/config/sprinkle/packages/ruby.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 0308090d7..acf47d8ef 100644 --- a/config/sprinkle/packages/scm.rb +++ b/config/sprinkle/packages/scm.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 58074f619..8063ae9ff 100644 --- a/config/sprinkle/packages/server.rb +++ b/config/sprinkle/packages/server.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 efe84d0fc..a9c7bc353 100644 --- a/config/sprinkle/packages/unfortunately_essential.rb +++ b/config/sprinkle/packages/unfortunately_essential.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 f2306a808..614aab119 100644 --- a/config/sprinkle/provision.rb +++ b/config/sprinkle/provision.rb @@ -1,21 +1,7 @@ #!/usr/bin/env sprinkle -s -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 121ed892e..072a7c8c0 100644 --- a/config/thin.yml +++ b/config/thin.yml @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 89144f3ab..faff24cce 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 b1548b03b..5bbc6875d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 92969b057..48da28143 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 bf4b4e5a0..41543e012 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 d8cbd0718..ee781a5e1 100644 --- a/db/seeds/tom.rb +++ b/db/seeds/tom.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 5ae18e5b1..d6be7d5d5 100644 --- a/lib/chrome_frame.rb +++ b/lib/chrome_frame.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 1d7be2a84..515d1b8b1 100644 --- a/lib/diaspora.rb +++ b/lib/diaspora.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 56ee63ae2..aa6441ba5 100644 --- a/lib/diaspora/parser.rb +++ b/lib/diaspora/parser.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 1ef431c06..462990b08 100644 --- a/lib/diaspora/user/friending.rb +++ b/lib/diaspora/user/friending.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 7481cc328..5d5cf261d 100644 --- a/lib/diaspora/user/querying.rb +++ b/lib/diaspora/user/querying.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 889e7735f..d2cfa3d4a 100644 --- a/lib/diaspora/webhooks.rb +++ b/lib/diaspora/webhooks.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 a66e49159..c8cc011b4 100644 --- a/lib/diaspora/websocket.rb +++ b/lib/diaspora/websocket.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 92a50be99..431270e76 100644 --- a/lib/encryptable.rb +++ b/lib/encryptable.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 87fb5c7e5..b92e5d840 100644 --- a/lib/encryptor.rb +++ b/lib/encryptor.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 66825c0b5..a08bca572 100644 --- a/lib/hcard.rb +++ b/lib/hcard.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 96ab244dc..e6a226987 100644 --- a/lib/message_handler.rb +++ b/lib/message_handler.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 2cf4d2fe5..08dd76400 100644 --- a/lib/mongo_mapper/bson_id.rb +++ b/lib/mongo_mapper/bson_id.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 501ce55ac..d125d62c2 100644 --- a/lib/mongo_mapper/clear_dev_memory.rb +++ b/lib/mongo_mapper/clear_dev_memory.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 a8a7e0bd1..d1a4d7a1f 100644 --- a/lib/salmon/salmon.rb +++ b/lib/salmon/salmon.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 23d13d136..04f42d3a2 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 2594f9277..820051b50 100644 --- a/lib/tasks/rspec.rake +++ b/lib/tasks/rspec.rake @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 307e295e2..0516316f7 100644 --- a/lib/tasks/saucelabs_adapter.rake +++ b/lib/tasks/saucelabs_adapter.rake @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 15562780c..6cd570e29 100644 --- a/public/javascripts/aspect-edit.js +++ b/public/javascripts/aspect-edit.js @@ -1,20 +1,7 @@ -/* Copyright 2010 Diaspora Inc. - * - * This file is part of Diaspora. - * - * Diaspora is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Diaspora is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Diaspora. If not, see <http://www.gnu.org/licenses/>. - */ +/* Copyright (c) 2010, Disapora Inc. This file is +* licensed under the Affero General Public License version 3. See +* the COPYRIGHT file. +*/ $('#move_friends_link').live( 'click', function(){ diff --git a/public/javascripts/image_picker.js b/public/javascripts/image_picker.js index d4e719260..885ba0e11 100644 --- a/public/javascripts/image_picker.js +++ b/public/javascripts/image_picker.js @@ -1,20 +1,7 @@ -/* Copyright 2010 Diaspora Inc. - * - * This file is part of Diaspora. - * - * Diaspora is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Diaspora is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Diaspora. If not, see <http://www.gnu.org/licenses/>. - */ +/* Copyright (c) 2010, Disapora Inc. This file is +* licensed under the Affero General Public License version 3. See +* the COPYRIGHT file. +*/ $(document).ready( function() { diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js index f826c9d3f..03d54dbe4 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -1,20 +1,7 @@ -/* Copyright 2010 Diaspora Inc. - * - * This file is part of Diaspora. - * - * Diaspora is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Diaspora is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Diaspora. If not, see <http://www.gnu.org/licenses/>. - */ +/* Copyright (c) 2010, Disapora Inc. This file is +* licensed under the Affero General Public License version 3. See +* the COPYRIGHT file. +*/ $(document).ready(function(){ diff --git a/public/javascripts/view.js b/public/javascripts/view.js index ed2970c8d..1c7ba8789 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -1,20 +1,7 @@ -/* Copyright 2010 Diaspora Inc. - * - * This file is part of Diaspora. - * - * Diaspora is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Diaspora is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Diaspora. If not, see <http://www.gnu.org/licenses/>. - */ +/* Copyright (c) 2010, Disapora Inc. This file is +* licensed under the Affero General Public License version 3. See +* the COPYRIGHT file. +*/ $(document).ready(function(){ diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb index 57e40a217..fdba4e000 100644 --- a/spec/controllers/aspects_controller_spec.rb +++ b/spec/controllers/aspects_controller_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 26a72615d..39d9142fa 100644 --- a/spec/controllers/people_controller_spec.rb +++ b/spec/controllers/people_controller_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 4b62dddbd..a49aaf6f4 100644 --- a/spec/controllers/publics_controller_spec.rb +++ b/spec/controllers/publics_controller_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 bb676cba8..4ad40894c 100644 --- a/spec/controllers/requests_controller_spec.rb +++ b/spec/controllers/requests_controller_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 369b203a5..22e9d9360 100644 --- a/spec/controllers/sockets_controller_spec.rb +++ b/spec/controllers/sockets_controller_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 73cd6decf..2fc272c5f 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 4d23da3c1..533dc6ea3 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 1a8c46165..7a546601b 100644 --- a/spec/helpers/publics_helper_spec.rb +++ b/spec/helpers/publics_helper_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 2defd897c..e5f47b6a4 100644 --- a/spec/helpers/requests_helper_spec.rb +++ b/spec/helpers/requests_helper_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 5cc106fed..d4cf63442 100644 --- a/spec/lib/diaspora_parser_spec.rb +++ b/spec/lib/diaspora_parser_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 c90d8cf0b..ae7ada242 100644 --- a/spec/lib/hcard_spec.rb +++ b/spec/lib/hcard_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 88e256f2d..251acc551 100644 --- a/spec/lib/message_handler_spec.rb +++ b/spec/lib/message_handler_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 9a4fc475a..4beb87866 100644 --- a/spec/lib/salmon_salmon_spec.rb +++ b/spec/lib/salmon_salmon_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 c8062e4ad..056660708 100644 --- a/spec/lib/web_hooks_spec.rb +++ b/spec/lib/web_hooks_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 8979a5b8f..9995da06c 100644 --- a/spec/misc_spec.rb +++ b/spec/misc_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 c787dc4c8..ed55ce218 100644 --- a/spec/models/album_spec.rb +++ b/spec/models/album_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 d62b53787..4e6a5aea8 100644 --- a/spec/models/aspect_spec.rb +++ b/spec/models/aspect_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 e4c5b8f6b..b50ebddef 100644 --- a/spec/models/comments_spec.rb +++ b/spec/models/comments_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 a8760a8df..05bb0a716 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 85208067d..433c47d16 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 526151e25..2cb428a94 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 b2a2bc46e..1cb26be46 100644 --- a/spec/models/profile_spec.rb +++ b/spec/models/profile_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 863a6691a..dda6a0669 100644 --- a/spec/models/request_spec.rb +++ b/spec/models/request_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 75a3abb50..bab066787 100644 --- a/spec/models/retraction_spec.rb +++ b/spec/models/retraction_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 b810c3609..5718c1c69 100644 --- a/spec/models/status_message_spec.rb +++ b/spec/models/status_message_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 17f4cdbc7..7260151b4 100644 --- a/spec/models/user/posting_spec.rb +++ b/spec/models/user/posting_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 ecdb155ae..517b032a4 100644 --- a/spec/models/user/receive_spec.rb +++ b/spec/models/user/receive_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 ad31042f1..96529e025 100644 --- a/spec/models/user/user_friending_spec.rb +++ b/spec/models/user/user_friending_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 af024575f..b20e3590a 100644 --- a/spec/models/user/visible_posts_spec.rb +++ b/spec/models/user/visible_posts_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 b99cde95d..7ef142a19 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 f3a82df41..8606ab703 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 eba1de905..70cdb5683 100644 --- a/spec/user_encryption_spec.rb +++ b/spec/user_encryption_spec.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 da1a15bd4..49ca065e5 100644 --- a/test/performance/browsing_test.rb +++ b/test/performance/browsing_test.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 9959c8f6b..d70819035 100644 --- a/test/selenium/login_test.rb +++ b/test/selenium/login_test.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 940fb57c1..2cdefa138 100644 --- a/test/selenium/selenium_suite.rb +++ b/test/selenium/selenium_suite.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora 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 53d531878..d0b11c63e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,20 +1,6 @@ -# Copyright 2010 Diaspora Inc. -# -# This file is part of Diaspora. -# -# Diaspora is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Diaspora is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Diaspora. If not, see <http://www.gnu.org/licenses/>. -# +# Copyright (c) 2010, Disapora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. |