Skip to content

Commit 5d30351

Browse files
author
Raphael
committedSep 15, 2010
Adding in COPYRIGHT, AUTHORS, and blueprint attribution
1 parent 6dff249 commit 5d30351

File tree

5 files changed

+80
-0
lines changed

5 files changed

+80
-0
lines changed
 

‎AUTHORS

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Diaspora is written by:
2+
Daniel Grippi
3+
Ilya Zhitomirskiy
4+
Maxwell Salzberg
5+
Raphael Sofaer
6+
7+
With help from many libraries and frameworks including:
8+
JQuery
9+
Ruby on Rails
10+
Blueprint-CSS
11+
and others

‎COPYRIGHT

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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.

‎app/controllers/albums_controller.rb

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
# along with Diaspora. If not, see <http://www.gnu.org/licenses/>.
1717
#
1818

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

2024
class AlbumsController < ApplicationController
2125
before_filter :authenticate_user!
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
h1. Blueprint CSS Framework Authors and Contributors
2+
3+
Blueprint is based on the work of many talented people. It is
4+
through their good intentions we are allowed to use many of the
5+
techniques found in the framework.
6+
7+
h2. Current Team
8+
9+
Blueprint was realized and maintained through version 0.7.1 by
10+
"Olav Bjorkoy":http://bjorkoy.com who has sinced passed the torch
11+
to the current team. They are:
12+
13+
Admins:
14+
* "Christian Montoya":http://christianmontoya.net
15+
* "Josh Clayton":http://jdclayton.com
16+
17+
Contributors:
18+
* "Glenn Rempe":http://blog.rempe.us/
19+
* "Chris Eppstein":http://twitter.com/chriseppstein
20+
* "Sean K. Stewart":http://seankstewart.com/
21+
22+
h2. Original CSS authors
23+
24+
The first iteration of Blueprint was built upon many conventions
25+
and ideas that were developed by true CSS experts.
26+
27+
The grid and typography is based on work by:
28+
* "Jeff Croft":http://jeffcroft.com
29+
* "Nathan Borror":http://www.playgroundblues.com
30+
* "Christian Metts":http://mintchaos.com
31+
* "Wilson Miner":http://www.wilsonminer.com
32+
33+
The CSS reset is based on work by:
34+
* "Eric Meyer":http://www.meyerweb.com/eric
35+
36+
The Fancy Type plugin is based on work by:
37+
* "Mark Boulton":http://www.markboulton.co.uk
38+
* "Typogrify":http://typogrify.googlecode.com
39+
40+
(However, remember that these people are not involved with the
41+
framework, so please don't waste their or your time asking them
42+
for support.)

‎public/stylesheets/blueprint/LICENSE

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Copyright (c) 2007 - 2010 blueprintcss.org
2+
3+
Permission is hereby granted, free of charge, to any person
4+
obtaining a copy of this software and associated documentation
5+
files (the "Software"), to deal in the Software without
6+
restriction, including without limitation the rights to use,
7+
copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the
9+
Software is furnished to do so, subject to the following
10+
conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
19+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
20+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)
Please sign in to comment.