Skip to content

Commit

Permalink
Adding in COPYRIGHT, AUTHORS, and blueprint attribution
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphael committed Sep 15, 2010
1 parent 6dff249 commit 5d30351
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 0 deletions.
11 changes: 11 additions & 0 deletions AUTHORS
@@ -0,0 +1,11 @@
Diaspora is written by:
Daniel Grippi
Ilya Zhitomirskiy
Maxwell Salzberg
Raphael Sofaer

With help from many libraries and frameworks including:
JQuery
Ruby on Rails
Blueprint-CSS
and others
1 change: 1 addition & 0 deletions COPYRIGHT
@@ -0,0 +1 @@
Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed under the Affero General Public License version 3, the text of which can be found in GNU-AGPL-3.0, unless otherwise noted. Components of Diaspora, including Rails, JQuery, and Devise, are licensed under the MIT/X11 license. Blueprint-CSS is licensed under a modified version of the MIT/X11 license. All unmodified files from these and other sources retain their original copyright and license notices: see the relevand individual files. Attribution information for Diaspora is contained in the AUTHORS file.
4 changes: 4 additions & 0 deletions app/controllers/albums_controller.rb
Expand Up @@ -16,6 +16,10 @@
# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
#

# Copyright (c) 2010, [Diaspora copyright holder(s)]. This file is
# licensed under the Affero General Public License version 3. See
# the COPYRIGHT file.


class AlbumsController < ApplicationController
before_filter :authenticate_user!
Expand Down
42 changes: 42 additions & 0 deletions public/stylesheets/blueprint/AUTHORS.textile
@@ -0,0 +1,42 @@
h1. Blueprint CSS Framework Authors and Contributors

Blueprint is based on the work of many talented people. It is
through their good intentions we are allowed to use many of the
techniques found in the framework.

h2. Current Team

Blueprint was realized and maintained through version 0.7.1 by
"Olav Bjorkoy":http://bjorkoy.com who has sinced passed the torch
to the current team. They are:

Admins:
* "Christian Montoya":http://christianmontoya.net
* "Josh Clayton":http://jdclayton.com

Contributors:
* "Glenn Rempe":http://blog.rempe.us/
* "Chris Eppstein":http://twitter.com/chriseppstein
* "Sean K. Stewart":http://seankstewart.com/

h2. Original CSS authors

The first iteration of Blueprint was built upon many conventions
and ideas that were developed by true CSS experts.

The grid and typography is based on work by:
* "Jeff Croft":http://jeffcroft.com
* "Nathan Borror":http://www.playgroundblues.com
* "Christian Metts":http://mintchaos.com
* "Wilson Miner":http://www.wilsonminer.com

The CSS reset is based on work by:
* "Eric Meyer":http://www.meyerweb.com/eric

The Fancy Type plugin is based on work by:
* "Mark Boulton":http://www.markboulton.co.uk
* "Typogrify":http://typogrify.googlecode.com

(However, remember that these people are not involved with the
framework, so please don't waste their or your time asking them
for support.)
22 changes: 22 additions & 0 deletions public/stylesheets/blueprint/LICENSE
@@ -0,0 +1,22 @@
Copyright (c) 2007 - 2010 blueprintcss.org

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

0 comments on commit 5d30351

Please sign in to comment.