Skip to content

Commit

Permalink
Update MIT licence text and JS libraries copyright info.
Browse files Browse the repository at this point in the history
  • Loading branch information
eldering committed Jul 4, 2014
1 parent c328279 commit a3cb3b6
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 9 deletions.
3 changes: 3 additions & 0 deletions COPYING.MIT
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ 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.
Expand Down
3 changes: 2 additions & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ Various JavaScript libraries/snippets are included under www/js/:
licence, see COPYING.MIT.
- jscolor.js: copyright Jan Odvarko, licenced under the GNU LGPL.
- tabber.js: copyright Patrick Fitzgerald, licenced under the MIT licence.
- ace editor: licenced under BSD licence, see COPYING.BSD.
- Ace editor: licenced under BSD licence, see COPYING.BSD.
- Flot/jQuery: licenced under MIT licence, see COPYING.MIT.

The M4 autoconf macros are licenced under all-permissive and GPL3+
licences; see the respective files under m4/ for details.
Expand Down
25 changes: 17 additions & 8 deletions doc/domjudge-overview-inc.sgml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ to name them here too:
<item> jscolor.js by Jan Odvarko.
<item> tabber.js by Patrick Fitzgerald.
<item> Ace code editor.
<item> Flot/jQuery JavaScript libraries.
<item> The DOMjudge logo is based on the NKP 2004 logo made by
Erik van Sebille.
<item> Several icons have been taken from the phpMyAdmin project.
Expand All @@ -121,15 +122,23 @@ see <tt>COPYING.BSD</tt> and <tt>doc/dash.copyright</tt> for more details.
Sources can be downloaded from:
<url url="http://www.domjudge.org/sources/">.

The <tt>sorttable.js</tt> script is copyright by Stuart Langridge and
licenced under the MIT licence, see <tt>COPYING.MIT</tt>. This
software was downloaded from
<url url="http://www.kryogenix.org/code/browser/sorttable/">.
The <tt>jscolor.js</tt> script is copyright by Jan Odvarko and licenced
under the GNU LGPL. It was obtained at <url url="http://jscolor.com">.
The <tt>tabber.js</tt> script is copyright by Patrick Fitzgerald and
The following JavaScript snippets/libraries are included:
<itemize>
<item> The <tt>sorttable.js</tt> script is copyright by Stuart
Langridge and licenced under the MIT licence, see <tt>COPYING.MIT</tt>.
It was downloaded from <url url="http://www.kryogenix.org/code/browser/sorttable/">.
<item> The <tt>jscolor.js</tt> script is copyright by Jan Odvarko and
licenced under the GNU LGPL. It was obtained at <url url="http://jscolor.com">.
<item> The <tt>tabber.js</tt> script is copyright by Patrick
Fitzgerald and licenced under the MIT licence, see <tt>COPYING.MIT</tt>.
It was downloaded from <url url="http://www.barelyfitz.com/projects/tabber/">.
<item>The Ace code editor is copyright by Ajax.org B.V. and licenced
under the BSD licence, see <tt>COPYING.BSD</tt>. It was downloaded
from <url url="https://github.com/ajaxorg/ace-builds">.
<item>The Flot/jQuery libraries are copyright by various people and
licenced under the MIT licence, see <tt>COPYING.MIT</tt>. It was
downloaded from <url url="http://www.barelyfitz.com/projects/tabber/">.
downloaded from <url url="http://www.flotcharts.org/">.
</itemize>

The M4 autoconf macros are licenced under all-permissive and GPL3+
licences; see the respective files for details.
Expand Down

0 comments on commit a3cb3b6

Please sign in to comment.