From 372d5ed6e836a2b718deeaf5f1cf3a7fad177f3b Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 5 Feb 2019 13:59:03 +1000 Subject: [PATCH] update copyright and clarify licenses --- LICENSE | 24 ++++++++++++++++-------- anki/__init__.py | 2 +- anki/cards.py | 2 +- anki/collection.py | 2 +- anki/consts.py | 2 +- anki/db.py | 2 +- anki/decks.py | 2 +- anki/errors.py | 2 +- anki/exporting.py | 2 +- anki/find.py | 2 +- anki/hooks.py | 2 +- anki/importing/__init__.py | 2 +- anki/importing/anki2.py | 2 +- anki/importing/apkg.py | 2 +- anki/importing/base.py | 2 +- anki/importing/csvfile.py | 2 +- anki/importing/mnemo.py | 2 +- anki/importing/noteimp.py | 2 +- anki/lang.py | 2 +- anki/latex.py | 2 +- anki/media.py | 2 +- anki/models.py | 2 +- anki/notes.py | 2 +- anki/sched.py | 2 +- anki/schedv2.py | 2 +- anki/sound.py | 2 +- anki/stats.py | 2 +- anki/statsbg.py | 2 +- anki/stdmodels.py | 2 +- anki/storage.py | 2 +- anki/sync.py | 2 +- anki/tags.py | 2 +- anki/template/furigana.py | 2 +- anki/template/hint.py | 2 +- anki/utils.py | 2 +- aqt/__init__.py | 2 +- aqt/about.py | 2 +- aqt/addcards.py | 2 +- aqt/addons.py | 2 +- aqt/browser.py | 2 +- aqt/clayout.py | 2 +- aqt/customstudy.py | 2 +- aqt/deckbrowser.py | 2 +- aqt/deckchooser.py | 2 +- aqt/deckconf.py | 2 +- aqt/downloader.py | 2 +- aqt/dyndeckconf.py | 2 +- aqt/editcurrent.py | 2 +- aqt/editor.py | 2 +- aqt/errors.py | 2 +- aqt/exporting.py | 2 +- aqt/fields.py | 2 +- aqt/importing.py | 2 +- aqt/main.py | 2 +- aqt/mediasrv.py | 2 +- aqt/modelchooser.py | 2 +- aqt/models.py | 2 +- aqt/overview.py | 2 +- aqt/pinnedmodules.py | 2 +- aqt/preferences.py | 2 +- aqt/profiles.py | 2 +- aqt/progress.py | 2 +- aqt/qt.py | 2 +- aqt/reviewer.py | 2 +- aqt/sound.py | 2 +- aqt/stats.py | 2 +- aqt/studydeck.py | 2 +- aqt/sync.py | 2 +- aqt/tagedit.py | 2 +- aqt/taglimit.py | 4 ++-- aqt/toolbar.py | 2 +- aqt/update.py | 2 +- aqt/utils.py | 2 +- aqt/webview.py | 2 +- web/browsersel.js | 2 +- web/deckbrowser.css | 3 +++ web/deckbrowser.js | 3 +++ web/editor.css | 3 +++ web/editor.js | 3 +++ web/overview.css | 3 +++ web/overview.js | 3 +++ web/reviewer-bottom.css | 3 +++ web/reviewer-bottom.js | 3 +++ web/reviewer.css | 3 +++ web/reviewer.js | 3 +++ web/toolbar-bottom.css | 3 +++ web/toolbar.css | 3 +++ web/webview.css | 3 +++ web/webview.js | 3 +++ 89 files changed, 133 insertions(+), 83 deletions(-) diff --git a/LICENSE b/LICENSE index 4818666fe..fc830c5cb 100644 --- a/LICENSE +++ b/LICENSE @@ -10,14 +10,22 @@ first time, please post a private ticket on our support site that states you are happy to license all contributions you submit to the Anki project under the three-clause BSD license. - * Please see LICENSE.logo for the copyright and license of Anki's logo. - * The translations are under BSD copyright, as mandated by Launchpad. - * The anki/template/ folder is based off pystache, and a separate license is - included within. - * The Javascript files in js.py are subject to their respective licenses. - * The SuperMemo importer was user-contributed and is GPL3 licensed. - * Some third-party packages are distributed in the thirdparty/ folder. Please - see the README file in that folder for more information. +Please see LICENSE.logo for the copyright and license of Anki's logo. + +The following included source code items use a license other than AGPL3: + + * Anki's translations: BSD. + * Qt's bundled translations: LGPL3. + * The anki/template/ folder is based off pystache: MIT. + * The SuperMemo importer: GPL3. + * The Pauker importer: BSD-3. + * mpv.py: MIT. + * statsbg.py: CC BY-SA 3.0. + * winpaths.py: MIT. + * MathJax: Apache 2. + * jQuery and jQuery-UI: MIT. + * browsersel.js: CC BY 2.5. + * plot.js: MIT. The AGPL3 license follows. diff --git a/anki/__init__.py b/anki/__init__.py index 3a73696d4..fefaeff7a 100644 --- a/anki/__init__.py +++ b/anki/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import sys diff --git a/anki/cards.py b/anki/cards.py index 3f3140a8a..b8c78e176 100644 --- a/anki/cards.py +++ b/anki/cards.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import pprint diff --git a/anki/collection.py b/anki/collection.py index 366aded51..cf8cb82d5 100644 --- a/anki/collection.py +++ b/anki/collection.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import pprint diff --git a/anki/consts.py b/anki/consts.py index 642686c4c..1ffb99f4c 100644 --- a/anki/consts.py +++ b/anki/consts.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import os diff --git a/anki/db.py b/anki/db.py index 367d6897b..7209a595b 100644 --- a/anki/db.py +++ b/anki/db.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import os diff --git a/anki/decks.py b/anki/decks.py index e499ebac6..7648d738e 100644 --- a/anki/decks.py +++ b/anki/decks.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import copy, operator diff --git a/anki/errors.py b/anki/errors.py index f7c09e137..434e12bda 100644 --- a/anki/errors.py +++ b/anki/errors.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html class AnkiError(Exception): diff --git a/anki/exporting.py b/anki/exporting.py index 1d5772ae9..ce8002684 100644 --- a/anki/exporting.py +++ b/anki/exporting.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import re, os, zipfile, shutil, unicodedata diff --git a/anki/find.py b/anki/find.py index 6c27c61a8..9c95e6cea 100644 --- a/anki/find.py +++ b/anki/find.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import re diff --git a/anki/hooks.py b/anki/hooks.py index 622112c0b..bbd9a25f0 100644 --- a/anki/hooks.py +++ b/anki/hooks.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html """\ diff --git a/anki/importing/__init__.py b/anki/importing/__init__.py index 65fdf15ce..ab390836c 100644 --- a/anki/importing/__init__.py +++ b/anki/importing/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from anki.importing.csvfile import TextImporter diff --git a/anki/importing/anki2.py b/anki/importing/anki2.py index 15e9aca5a..379bd0178 100644 --- a/anki/importing/anki2.py +++ b/anki/importing/anki2.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import os diff --git a/anki/importing/apkg.py b/anki/importing/apkg.py index 2e28e4400..7b9f326f0 100644 --- a/anki/importing/apkg.py +++ b/anki/importing/apkg.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import zipfile, os diff --git a/anki/importing/base.py b/anki/importing/base.py index b5fb81efc..31c2014af 100644 --- a/anki/importing/base.py +++ b/anki/importing/base.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from anki.utils import maxID diff --git a/anki/importing/csvfile.py b/anki/importing/csvfile.py index 7c7ae6fc9..e99ca5c42 100644 --- a/anki/importing/csvfile.py +++ b/anki/importing/csvfile.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import codecs diff --git a/anki/importing/mnemo.py b/anki/importing/mnemo.py index 859f30f89..7cd3251ed 100644 --- a/anki/importing/mnemo.py +++ b/anki/importing/mnemo.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import time, re diff --git a/anki/importing/noteimp.py b/anki/importing/noteimp.py index 9231eb907..79d74999a 100644 --- a/anki/importing/noteimp.py +++ b/anki/importing/noteimp.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import html diff --git a/anki/lang.py b/anki/lang.py index 08f112f68..92cd79df0 100644 --- a/anki/lang.py +++ b/anki/lang.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import os, sys, re diff --git a/anki/latex.py b/anki/latex.py index dc7408c73..bd2da3fcd 100644 --- a/anki/latex.py +++ b/anki/latex.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import re, os, shutil, html diff --git a/anki/media.py b/anki/media.py index bde1d1ff2..df1a5ee11 100644 --- a/anki/media.py +++ b/anki/media.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import io import re diff --git a/anki/models.py b/anki/models.py index b077ad7a8..b8a003a5c 100644 --- a/anki/models.py +++ b/anki/models.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import copy, re diff --git a/anki/notes.py b/anki/notes.py index 4e22b6933..63a46dc8e 100644 --- a/anki/notes.py +++ b/anki/notes.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from anki.utils import fieldChecksum, intTime, \ diff --git a/anki/sched.py b/anki/sched.py index 5e8add3a5..e0792b338 100644 --- a/anki/sched.py +++ b/anki/sched.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import time diff --git a/anki/schedv2.py b/anki/schedv2.py index 5bf4bb9b9..95194a797 100644 --- a/anki/schedv2.py +++ b/anki/schedv2.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import time diff --git a/anki/sound.py b/anki/sound.py index 6e1b587ca..8a2db4968 100644 --- a/anki/sound.py +++ b/anki/sound.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import html diff --git a/anki/stats.py b/anki/stats.py index 9fba9f774..e0dcbc947 100644 --- a/anki/stats.py +++ b/anki/stats.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import time diff --git a/anki/statsbg.py b/anki/statsbg.py index 558c0753b..7dfd9b64f 100644 --- a/anki/statsbg.py +++ b/anki/statsbg.py @@ -1,4 +1,4 @@ -# from subtlepatterns.com +# from subtlepatterns.com; CC BY-SA 3.0. bg = """\ iVBORw0KGgoAAAANSUhEUgAAABIAAAANCAMAAACTkM4rAAAAM1BMVEXy8vLz8/P5+fn19fXt7e329vb4+Pj09PTv7+/u7u739/fw8PD7+/vx8fHr6+v6+vrs7Oz2LjW2AAAAkUlEQVR42g3KyXHAQAwDQYAQj12ItvOP1qqZZwMMPVnd06XToQvz4L2HDQ2iRgkvA7yPPB+JD+OUPnfzZ0JNZh6kkQus5NUmR7g4Jpxv5XN6nYWNmtlq9o3zuK6w3XRsE1pQIEGPIsdtTP3m2cYwlPv6MbL8/QASsKppZefyDmJPbxvxa/NrX1TJ1yp20fhj9D+SiAWWLU8myQAAAABJRU5ErkJggg== """ diff --git a/anki/stdmodels.py b/anki/stdmodels.py index c9c20ab14..3da460aa9 100644 --- a/anki/stdmodels.py +++ b/anki/stdmodels.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from anki.lang import _ diff --git a/anki/storage.py b/anki/storage.py index 93a967382..ab24caa0e 100644 --- a/anki/storage.py +++ b/anki/storage.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import copy diff --git a/anki/sync.py b/anki/sync.py index 80e201421..b4027b5d2 100644 --- a/anki/sync.py +++ b/anki/sync.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import io diff --git a/anki/tags.py b/anki/tags.py index c782120ec..0fc66b9a9 100644 --- a/anki/tags.py +++ b/anki/tags.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from anki.utils import intTime, ids2str, json diff --git a/anki/template/furigana.py b/anki/template/furigana.py index 12f076b29..929b0817d 100644 --- a/anki/template/furigana.py +++ b/anki/template/furigana.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # Based off Kieran Clancy's initial implementation. diff --git a/anki/template/hint.py b/anki/template/hint.py index 96d76fba6..ad4e9e6b4 100644 --- a/anki/template/hint.py +++ b/anki/template/hint.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from anki.hooks import addHook diff --git a/anki/utils.py b/anki/utils.py index 2f6ba9e01..52ae5a636 100644 --- a/anki/utils.py +++ b/anki/utils.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import re diff --git a/aqt/__init__.py b/aqt/__init__.py index 833101286..2e4a23901 100644 --- a/aqt/__init__.py +++ b/aqt/__init__.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from anki import version as _version diff --git a/aqt/about.py b/aqt/about.py index 3469f9a81..718eaadf8 100644 --- a/aqt/about.py +++ b/aqt/about.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/addcards.py b/aqt/addcards.py index 1dc1f5ad2..65c8d6f94 100644 --- a/aqt/addcards.py +++ b/aqt/addcards.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from anki.lang import _ diff --git a/aqt/addons.py b/aqt/addons.py index 51d735a1e..e16262123 100644 --- a/aqt/addons.py +++ b/aqt/addons.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import io diff --git a/aqt/browser.py b/aqt/browser.py index 0dcbcacbf..f2620d8e8 100644 --- a/aqt/browser.py +++ b/aqt/browser.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import sre_constants diff --git a/aqt/clayout.py b/aqt/clayout.py index 223de3245..d0414c6bf 100644 --- a/aqt/clayout.py +++ b/aqt/clayout.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import collections diff --git a/aqt/customstudy.py b/aqt/customstudy.py index 384ac0364..df57dfdf7 100644 --- a/aqt/customstudy.py +++ b/aqt/customstudy.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/deckbrowser.py b/aqt/deckbrowser.py index aac62f187..c2d76ecc6 100644 --- a/aqt/deckbrowser.py +++ b/aqt/deckbrowser.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/deckchooser.py b/aqt/deckchooser.py index fca534691..a7fb09462 100644 --- a/aqt/deckchooser.py +++ b/aqt/deckchooser.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from aqt.qt import * diff --git a/aqt/deckconf.py b/aqt/deckconf.py index 721a3e301..0c834d2a8 100644 --- a/aqt/deckconf.py +++ b/aqt/deckconf.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from operator import itemgetter diff --git a/aqt/downloader.py b/aqt/downloader.py index 517c1878b..34b3c5537 100644 --- a/aqt/downloader.py +++ b/aqt/downloader.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/dyndeckconf.py b/aqt/dyndeckconf.py index 0ae68bf3e..e968e87cd 100644 --- a/aqt/dyndeckconf.py +++ b/aqt/dyndeckconf.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/editcurrent.py b/aqt/editcurrent.py index 8b465734b..12e5cecae 100644 --- a/aqt/editcurrent.py +++ b/aqt/editcurrent.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/editor.py b/aqt/editor.py index aa8c28f86..0031e1bd4 100644 --- a/aqt/editor.py +++ b/aqt/editor.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import re import os diff --git a/aqt/errors.py b/aqt/errors.py index 7eeebb104..6b38174cc 100644 --- a/aqt/errors.py +++ b/aqt/errors.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import sys, traceback diff --git a/aqt/exporting.py b/aqt/exporting.py index b4ce7b0fe..3ca650b7b 100644 --- a/aqt/exporting.py +++ b/aqt/exporting.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import os diff --git a/aqt/fields.py b/aqt/fields.py index 9616e3dd8..2d043ead7 100644 --- a/aqt/fields.py +++ b/aqt/fields.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from aqt.qt import * diff --git a/aqt/importing.py b/aqt/importing.py index a16265e08..4b429d92d 100644 --- a/aqt/importing.py +++ b/aqt/importing.py @@ -1,5 +1,5 @@ # coding=utf-8 -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import os diff --git a/aqt/main.py b/aqt/main.py index eccaa7917..8498b9710 100644 --- a/aqt/main.py +++ b/aqt/main.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/mediasrv.py b/aqt/mediasrv.py index 9a36a9827..7ae437ca7 100644 --- a/aqt/mediasrv.py +++ b/aqt/mediasrv.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/modelchooser.py b/aqt/modelchooser.py index 4eece1c7e..491b69094 100644 --- a/aqt/modelchooser.py +++ b/aqt/modelchooser.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from aqt.qt import * diff --git a/aqt/models.py b/aqt/models.py index 95da0fa4f..39a058153 100644 --- a/aqt/models.py +++ b/aqt/models.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from aqt.qt import * diff --git a/aqt/overview.py b/aqt/overview.py index 4a59f7706..11dca83f7 100644 --- a/aqt/overview.py +++ b/aqt/overview.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from aqt.utils import openLink, shortcut, tooltip, askUserDialog diff --git a/aqt/pinnedmodules.py b/aqt/pinnedmodules.py index ad26098de..7ee387e44 100644 --- a/aqt/pinnedmodules.py +++ b/aqt/pinnedmodules.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # this file is imported as part of the bundling process to ensure certain diff --git a/aqt/preferences.py b/aqt/preferences.py index ad7c2ce62..9949a771e 100644 --- a/aqt/preferences.py +++ b/aqt/preferences.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import datetime, time diff --git a/aqt/profiles.py b/aqt/profiles.py index 55e2bce38..b984c6219 100644 --- a/aqt/profiles.py +++ b/aqt/profiles.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # Profile handling diff --git a/aqt/progress.py b/aqt/progress.py index e3ad1c000..4e15f92ec 100644 --- a/aqt/progress.py +++ b/aqt/progress.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/qt.py b/aqt/qt.py index 537b9557a..fea2d26c3 100644 --- a/aqt/qt.py +++ b/aqt/qt.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # fixme: make sure not to optimize imports on this file diff --git a/aqt/reviewer.py b/aqt/reviewer.py index e0db85f67..765c3ee00 100644 --- a/aqt/reviewer.py +++ b/aqt/reviewer.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import difflib diff --git a/aqt/sound.py b/aqt/sound.py index 7b035da94..fc8f31856 100644 --- a/aqt/sound.py +++ b/aqt/sound.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from aqt.qt import * diff --git a/aqt/stats.py b/aqt/stats.py index 89c3abf43..c71a2c997 100644 --- a/aqt/stats.py +++ b/aqt/stats.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/studydeck.py b/aqt/studydeck.py index 7ac4315fe..658013fba 100644 --- a/aqt/studydeck.py +++ b/aqt/studydeck.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/sync.py b/aqt/sync.py index a5f425918..cec2452be 100644 --- a/aqt/sync.py +++ b/aqt/sync.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import time diff --git a/aqt/tagedit.py b/aqt/tagedit.py index fe58819bb..2870e39ff 100644 --- a/aqt/tagedit.py +++ b/aqt/tagedit.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from aqt.qt import * diff --git a/aqt/taglimit.py b/aqt/taglimit.py index 7f79268a9..42edb1f71 100644 --- a/aqt/taglimit.py +++ b/aqt/taglimit.py @@ -1,5 +1,5 @@ -# Copyright: Damien Elmes -# License: GNU GPL, version 3 or later; http://www.gnu.org/copyleft/gpl.html +# Copyright: Ankitects Pty Ltd and contributors +# License: GNU AGPL, version 3 or later; http://www.gnu.org/copyleft/agpl.html import aqt from aqt.qt import * diff --git a/aqt/toolbar.py b/aqt/toolbar.py index 6c7942d82..baab74614 100644 --- a/aqt/toolbar.py +++ b/aqt/toolbar.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/update.py b/aqt/update.py index 06f6fec5e..1188c4b92 100644 --- a/aqt/update.py +++ b/aqt/update.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import time diff --git a/aqt/utils.py b/aqt/utils.py index ea38cc3df..f38f5384a 100644 --- a/aqt/utils.py +++ b/aqt/utils.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html diff --git a/aqt/webview.py b/aqt/webview.py index ca4e18191..ea5bbafc1 100644 --- a/aqt/webview.py +++ b/aqt/webview.py @@ -1,4 +1,4 @@ -# Copyright: Damien Elmes +# Copyright: Ankitects Pty Ltd and contributors # -*- coding: utf-8 -*- # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import json diff --git a/web/browsersel.js b/web/browsersel.js index 39f7d780d..9c50762ca 100644 --- a/web/browsersel.js +++ b/web/browsersel.js @@ -1 +1 @@ -/* CSS Browser Selector v0.4.0 (Nov 02, 2010) Rafael Lima (http://rafael.adm.br) */function css_browser_selector(u){var ua=u.toLowerCase(),is=function(t){return ua.indexOf(t)>-1},g='gecko',w='webkit',s='safari',o='opera',m='mobile',h=document.documentElement,b=[(!(/opera|webtv/i.test(ua))&&/msie\s(\d)/.test(ua))?('ie ie'+RegExp.$1):is('firefox/2')?g+' ff2':is('firefox/3.5')?g+' ff3 ff3_5':is('firefox/3.6')?g+' ff3 ff3_6':is('firefox/3')?g+' ff3':is('gecko/')?g:is('opera')?o+(/version\/(\d+)/.test(ua)?' '+o+RegExp.$1:(/opera(\s|\/)(\d+)/.test(ua)?' '+o+RegExp.$2:'')):is('konqueror')?'konqueror':is('blackberry')?m+' blackberry':is('android')?m+' android':is('chrome')?w+' chrome':is('iron')?w+' iron':is('applewebkit/')?w+' '+s+(/version\/(\d+)/.test(ua)?' '+s+RegExp.$1:''):is('mozilla/')?g:'',is('j2me')?m+' j2me':is('iphone')?m+' iphone':is('ipod')?m+' ipod':is('ipad')?m+' ipad':is('mac')?'mac':is('darwin')?'mac':is('webtv')?'webtv':is('win')?'win'+(is('windows nt 6.0')?' vista':''):is('freebsd')?'freebsd':(is('x11')||is('linux'))?'linux':'','js']; c = b.join(' '); h.className += ' '+c; return c;}; css_browser_selector(navigator.userAgent); +/* CSS Browser Selector v0.4.0 (Nov 02, 2010) Rafael Lima (http://rafael.adm.br). CC BY 2.5. */function css_browser_selector(u){var ua=u.toLowerCase(),is=function(t){return ua.indexOf(t)>-1},g='gecko',w='webkit',s='safari',o='opera',m='mobile',h=document.documentElement,b=[(!(/opera|webtv/i.test(ua))&&/msie\s(\d)/.test(ua))?('ie ie'+RegExp.$1):is('firefox/2')?g+' ff2':is('firefox/3.5')?g+' ff3 ff3_5':is('firefox/3.6')?g+' ff3 ff3_6':is('firefox/3')?g+' ff3':is('gecko/')?g:is('opera')?o+(/version\/(\d+)/.test(ua)?' '+o+RegExp.$1:(/opera(\s|\/)(\d+)/.test(ua)?' '+o+RegExp.$2:'')):is('konqueror')?'konqueror':is('blackberry')?m+' blackberry':is('android')?m+' android':is('chrome')?w+' chrome':is('iron')?w+' iron':is('applewebkit/')?w+' '+s+(/version\/(\d+)/.test(ua)?' '+s+RegExp.$1:''):is('mozilla/')?g:'',is('j2me')?m+' j2me':is('iphone')?m+' iphone':is('ipod')?m+' ipod':is('ipad')?m+' ipad':is('mac')?'mac':is('darwin')?'mac':is('webtv')?'webtv':is('win')?'win'+(is('windows nt 6.0')?' vista':''):is('freebsd')?'freebsd':(is('x11')||is('linux'))?'linux':'','js']; c = b.join(' '); h.className += ' '+c; return c;}; css_browser_selector(navigator.userAgent); diff --git a/web/deckbrowser.css b/web/deckbrowser.css index bb3f1d3e1..57887de2b 100644 --- a/web/deckbrowser.css +++ b/web/deckbrowser.css @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + a.deck { color: #000; text-decoration: none; diff --git a/web/deckbrowser.js b/web/deckbrowser.js index 5078f37a8..3d516da65 100644 --- a/web/deckbrowser.js +++ b/web/deckbrowser.js @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + $(init); function init() { diff --git a/web/editor.css b/web/editor.css index 2562fa095..6c22475ac 100644 --- a/web/editor.css +++ b/web/editor.css @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + .field { border: 1px solid #aaa; background: #fff; diff --git a/web/editor.js b/web/editor.js index 387f10b97..d858545e4 100644 --- a/web/editor.js +++ b/web/editor.js @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + var currentField = null; var changeTimer = null; var dropTarget = null; diff --git a/web/overview.css b/web/overview.css index 1712d7738..d11b18e5f 100644 --- a/web/overview.css +++ b/web/overview.css @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + .smallLink { font-size: 10px; } diff --git a/web/overview.js b/web/overview.js index ecf4b2012..58c52a2a5 100644 --- a/web/overview.js +++ b/web/overview.js @@ -1 +1,4 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + $(function () { $("#study").focus(); }); diff --git a/web/reviewer-bottom.css b/web/reviewer-bottom.css index 728aa76d2..29c1c94fc 100644 --- a/web/reviewer-bottom.css +++ b/web/reviewer-bottom.css @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + body { margin: 0px; padding: 0; diff --git a/web/reviewer-bottom.js b/web/reviewer-bottom.js index d47197666..2960055da 100644 --- a/web/reviewer-bottom.js +++ b/web/reviewer-bottom.js @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + var time; // set in python code var maxTime = 0; diff --git a/web/reviewer.css b/web/reviewer.css index bfa55ef78..6e355c978 100644 --- a/web/reviewer.css +++ b/web/reviewer.css @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + hr { background-color: #ccc; } diff --git a/web/reviewer.js b/web/reviewer.js index 9237e2756..9fdec7ccf 100644 --- a/web/reviewer.js +++ b/web/reviewer.js @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + var ankiPlatform = "desktop"; var typeans; var _updatingQA = false; diff --git a/web/toolbar-bottom.css b/web/toolbar-bottom.css index 69437020a..5eb082dde 100644 --- a/web/toolbar-bottom.css +++ b/web/toolbar-bottom.css @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + #header { border-bottom: 0; margin-bottom: 6px; diff --git a/web/toolbar.css b/web/toolbar.css index d5e3b96ba..887818255 100644 --- a/web/toolbar.css +++ b/web/toolbar.css @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + #header { padding: 3px; font-weight: bold; diff --git a/web/webview.css b/web/webview.css index 73b40f67a..99fdab3a5 100644 --- a/web/webview.css +++ b/web/webview.css @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + body { margin: 2em; } diff --git a/web/webview.js b/web/webview.js index 05d2708b9..ed955aa2c 100644 --- a/web/webview.js +++ b/web/webview.js @@ -1,3 +1,6 @@ +/* Copyright: Ankitects Pty Ltd and contributors + * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ + // prevent backspace key from going back a page document.addEventListener("keydown", function (evt) { if (evt.keyCode !== 8) {