Skip to content

Commit

Permalink
Merge pull request AdguardTeam#22 in EXTENSIONS/popup-blocker from ne…
Browse files Browse the repository at this point in the history 
…w-ui to master

Squashed commit of the following:

commit 0a4e3d1d8b0cd900923edd8c3cd49b7327f1eb40
Author: seanl-adg <seanl@adguard.com>
Date:   Sun Apr 22 00:44:41 2018 +0900

    Update minimum_chrome_version

commit da723523276c95636fe044c72bc310856c67ddf9
Author: seanl-adg <seanl@adguard.com>
Date:   Sun Apr 22 00:42:43 2018 +0900

    Fix for firefox

commit 4946029fa203cca6f6028ab6ff74582f1da59d69
Author: seanl-adg <seanl@adguard.com>
Date:   Sat Apr 21 03:27:16 2018 +0900

    Resolve comments

commit c907ff51e59cd36c80d5f1ead124f1e1328733d4
Author: seanl-adg <seanl@adguard.com>
Date:   Sat Apr 21 03:21:21 2018 +0900

    Resolve comments

commit af50848609a5d15f4bf8054244b8f53e4ab521ca
Author: seanl-adg <seanl@adguard.com>
Date:   Sat Apr 21 03:12:11 2018 +0900

    Remove useless import auto-imported by vscode

commit 4f967dfb84c9091f21de75325af416452f1954f8
Author: seanl-adg <seanl@adguard.com>
Date:   Sat Apr 21 03:11:00 2018 +0900

    Implement Transaction class for systematic error logging

commit c9b7990f4a54270c7ad0fbd13fa635487530becc
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Apr 18 23:02:03 2018 +0900

    Add comment about PARENT_FRAME_KEY and CONTENT_SCRIPT_KEY

commit 29955cc9c3dffafe4a7fa48e1e652346800cc25b
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Apr 18 17:58:51 2018 +0900

    Add test for UserscriptSettingsDao

commit bffdcff0685d05ea0f7823031bcb9ff66b0a39ce
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Apr 18 02:05:46 2018 +0900

    Make sure that a text size change detector element is not visible in
    viewport

commit e65cd714d921f70021d56275d5e7877125f6663f
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 17 22:42:19 2018 +0900

    Fix font preload

commit 04e3a7161bfd6ca9bb5c5761871730cfb28218e6
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 17 22:38:39 2018 +0900

    Fix font preload
    Not specifying crossorigin="anonymous" causes double fetch

commit 9f191f6cbe80c69851cad32b1d719024677645c8
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 17 22:08:28 2018 +0900

    Add a special class to `<body>` for userscript options page

commit 0b1f54063f7e8516adf3f3efae08cae1d8109f62
Author: anton <a.kaprielov@adguard.com>
Date:   Tue Apr 17 15:54:12 2018 +0300

    new-ui name fix

commit 700909736538e760b928bc37e1e7b38142f07365
Author: anton <a.kaprielov@adguard.com>
Date:   Tue Apr 17 15:46:15 2018 +0300

    new-ui options-page

commit 11ec7bd6f89ca1a93ca48d835a10ac321794d187
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 17 21:07:38 2018 +0900

    Resolve comments

commit 3d2f05e73e5104ca6fe364d27bbdabc472aa51f2
Merge: dc0aa07 0080138
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 17 00:57:22 2018 +0900

    Actualize

commit dc0aa0734c91176f5baf3d1005af4b23f91f9cba
Author: seanl-adg <seanl@adguard.com>
Date:   Mon Apr 16 21:21:00 2018 +0900

    Bump version to 2.5.0

commit a606f11e91c3bb468ad2066eb710a2bc42e6dd3d
Author: anton <a.kaprielov@adguard.com>
Date:   Mon Apr 16 14:53:37 2018 +0300

    new-ui

commit 230ff4c14efcf0a58207545b221c18dba2199561
Author: anton <a.kaprielov@adguard.com>
Date:   Mon Apr 16 14:39:45 2018 +0300

    new-ui fix title

commit 44427299cdd9ca1450c39caaeaf0112a76527c72
Author: seanl-adg <seanl@adguard.com>
Date:   Sun Apr 15 21:40:08 2018 +0900

    Fix noinstalled page

commit 1e063b6ae63136fa3457c55ff3425ef4b19311ec
Author: seanl-adg <seanl@adguard.com>
Date:   Sun Apr 15 21:09:47 2018 +0900

    Add title and footer to userscript settings page

commit 30d36211170955fc5f75ccdafb861c122b8c5721
Author: seanl-adg <seanl@adguard.com>
Date:   Sun Apr 15 21:09:47 2018 +0900

    Add title and footer to userscript settings page

commit 33eb4caa8272e2e89244a3b6b9b11811b4abe6eb
Author: anton <a.kaprielov@adguard.com>
Date:   Thu Apr 12 12:54:02 2018 +0300

    subtitle fix

commit 96a5f706c774a7f4b21f98f43992fa8fcf0fdf72
Author: anton <a.kaprielov@adguard.com>
Date:   Thu Apr 12 12:48:45 2018 +0300

    new-ui

commit 86875df38a423073fdf1601dc0ad6ccd52f899cd
Author: anton <a.kaprielov@adguard.com>
Date:   Thu Apr 12 11:21:58 2018 +0300

    rm old titles

commit 4eff6d2787a9f9a2adbbc8e45bb2e199f689ffb6
Merge: c940a0a dddcb5d
Author: anton <a.kaprielov@adguard.com>
Date:   Thu Apr 12 11:18:06 2018 +0300

    Merge branch 'new-ui' of ssh://bit.adguard.com:7999/extensions/popup-blocker into new-ui

commit c940a0a904163d589d33316b2987e7db484c0733
Author: anton <a.kaprielov@adguard.com>
Date:   Thu Apr 12 11:17:58 2018 +0300

    separate title

commit dddcb5d631259ab8cf4d22eb49030fc712cb7882
Author: seanl-adg <seanl@adguard.com>
Date:   Thu Apr 12 01:48:18 2018 +0900

    Incorporate provided html source for alternative ui

commit 36af0682b6bb997244f8efc26371adc201e55712
Author: anton <a.kaprielov@adguard.com>
Date:   Wed Apr 11 17:09:12 2018 +0300

    new-ui footer and not installed block

commit 8eece9dfceb8ebc46a5b20d80620309126e22a14
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 10 22:01:46 2018 +0900

    Fix a comment

commit b55e62d56b4bb74226cd3c7c6391537691720fdd
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 10 21:24:59 2018 +0900

    Fix font inclusion in userscripts, implement browser action tooltip text

commit 7aa8d4c45815411b10610da1029f4d07d3dab667
Author: anton <a.kaprielov@adguard.com>
Date:   Tue Apr 10 11:49:26 2018 +0300

    new-ui

commit 60a37246c7d80fe8192edf7b75a3124ba2e2fc26
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 10 17:03:12 2018 +0900

    Changes for applying fonts
    1. Apply Open Sans to toasts;
    2. Implement TextSizeWatcher;
    3. Use `<link rel="preload">` to make loading fonts faster

commit 0ff9bf5b01046c0e304dff87014598bb314f239f
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 10 03:03:37 2018 +0900

    Make toast to be shown at the bottom of a page

commit 0cae3dcaad2671d051686aecf077c9714c2225f2
Author: anton <a.kaprielov@adguard.com>
Date:   Thu Apr 5 16:51:48 2018 +0300

    new-ui font

commit 472e56b7182fdd2dafeb46bd0f7939bdcd61eac9
Author: seanl-adg <seanl@adguard.com>
Date:   Thu Apr 5 17:37:21 2018 +0900

    Remove stray className

commit 97bb740e38df53e949249e37f53c3b9976399f3f
Author: seanl-adg <seanl@adguard.com>
Date:   Thu Apr 5 17:35:55 2018 +0900

    Add CSS transition to toasts

commit d2f199707d6d687b67e4e13f93c640ed42bdc35f
Author: anton <a.kaprielov@adguard.com>
Date:   Wed Apr 4 17:14:59 2018 +0300

    new-ui toast

commit 0cf218a0c024f9370a7fc59d588f76760974db64
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Apr 4 15:48:09 2018 +0900

    Fix userscript settings page, make travis build create it

commit f22769df71b595752a1cbf43103b57c9274c7e73
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Apr 4 14:11:08 2018 +0900

    Move static properties to global variable to help CC inlining them

commit d91cca87f2337f6097567947395adef26f428db2
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Apr 4 13:53:50 2018 +0900

    Make alert container frame as smaller as possible

commit 1a3bbc6ded97103a00f238ea26300f44bb66d988
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Apr 4 12:08:48 2018 +0900

    Fix regression from master caused by merging

commit 879f2571489bde002761607747243b237c568178
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 3 13:12:30 2018 +0900

    Fix settings storage

commit 9bd57a9a500eb93694657bf42013a2d9178bb39b
Merge: f13449b 008c855
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 3 10:37:07 2018 +0900

    Actualize

commit f13449bda6498e3f9438313e246a41f72acc1f2d
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 3 10:34:18 2018 +0900

    Fix dev build

commit ddc062e0150f01d3e9f6a6d19cfdecf839e3bc2d
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Apr 3 10:00:47 2018 +0900

    Add ToastController

commit 84fdbafa847c0ef6d6238c948dc857a7cfc0ff1e
Author: Anton Kaprielov <a.kaprielov@adguard.com>
Date:   Mon Apr 2 15:53:54 2018 +0300

    new-ui issues 95 and 103

commit 6a649c248cba2898255dccc743424d695ee799ae
Author: seanl-adg <seanl@adguard.com>
Date:   Mon Apr 2 18:56:07 2018 +0900

    Fix

commit 4d5800229dbe33abfd3b85354089af5bac2329c0
Author: seanl-adg <seanl@adguard.com>
Date:   Mon Apr 2 15:52:37 2018 +0900

    Refactor compiler & add userscript options build

commit ef4ad9a5a8297a18d699de2d8242b83ddcb3e2e9
Author: seanl-adg <seanl@adguard.com>
Date:   Fri Mar 30 22:17:59 2018 +0900

    Make alert auto-collapse

commit 9e4dd4d33c8d4ee7f895a3f0a3546c40e9a680cf
Author: seanl-adg <seanl@adguard.com>
Date:   Fri Mar 30 13:50:26 2018 +0900

    Fix

commit 361e1fe002ace565f62cc61c90fe6cee0090f8b9
Author: seanl-adg <seanl@adguard.com>
Date:   Fri Mar 30 08:09:23 2018 +0900

    Fix markup

commit 94021fee689d243cde979acad63cdf56e7c50ab3
Merge: bc1e15a dcb9729
Author: seanl-adg <seanl@adguard.com>
Date:   Fri Mar 30 08:07:33 2018 +0900

    Actualize

commit bc1e15aab5431d07da4efbaaa70c0273e4c96c8c
Author: seanl-adg <seanl@adguard.com>
Date:   Fri Mar 30 07:49:41 2018 +0900

    Fix

commit c52d85136f176eb2f5b81592b4b41934258d2521
Author: seanl-adg <seanl@adguard.com>
Date:   Fri Mar 30 06:17:49 2018 +0900

    Use a single whitelist instead of whitelist and whitelistDest

commit 7381546b3b604aee55050da7237b5abc100074c3
Merge: 83c0c58 9026511
Author: seanl-adg <seanl@adguard.com>
Date:   Thu Mar 29 03:39:10 2018 +0900

    Merge branch 'new-ui' of ssh://bit.adguard.com:7999/extensions/popup-blocker into new-ui

commit 9026511f312ee38597471606a4486e0a79ed42cb
Merge: b07bf13 8428095
Author: Anton Kaprielov <a.kaprielov@adguard.com>
Date:   Wed Mar 28 17:13:54 2018 +0300

    Merge branch 'new-ui' of ssh://bit.adguard.com:7999/extensions/popup-blocker into new-ui

commit b07bf138d1428c265d73b87c0bb8e11aec5efd59
Author: Anton Kaprielov <a.kaprielov@adguard.com>
Date:   Wed Mar 28 17:13:21 2018 +0300

    new-ui

commit 83c0c589463a547ae28cac3845a51acf0c13e686
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Mar 27 00:13:05 2018 +0900

    Upd

commit 84280955e9bdf0d70a30d90fc503467a555da7c4
Merge: ebea3a3 a857c1c
Author: seanl-adg <seanl@adguard.com>
Date:   Sat Mar 24 10:41:42 2018 +0900

    Merge branch 'new-ui' of ssh://bit.adguard.com:7999/extensions/popup-blocker into new-ui

commit ebea3a3f9150ac0eca413d95238e281f2c924a24
Author: seanl-adg <seanl@adguard.com>
Date:   Sat Mar 24 10:40:08 2018 +0900

    Use updated API from closure-tools-helper 1.0.4

commit a857c1cbffe90f38b0df77df8d1fe98dd6c144bf
Author: Anton Kaprielov <a.kaprielov@adguard.com>
Date:   Fri Mar 23 18:31:02 2018 +0300

    issues 96

commit ebaae1e2426d1c402e92c77bd669fcddf3a0d1af
Author: seanl-adg <seanl@adguard.com>
Date:   Fri Mar 16 03:29:06 2018 +0900

    Make rollup build saner: Use rollup's plugin api to link goog.modules to their corresponding shims

commit 4144e5ee387008fcdc1f8d1c6cce2ce77bf420d6
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Mar 14 02:48:33 2018 +0900

    Fix - forgot to append common.js to page_script.js

commit c1efa9b052cd8da1df4a43a45406181d77ec7889
Merge: 4287d82 efa9126
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Mar 14 00:18:31 2018 +0900

    Merge branch 'master' into new-ui

commit 4287d827391c08b3098f8d62941245991385018b
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Mar 14 00:12:25 2018 +0900

    Make rollup build work

commit 38faff82858e6ae50e19ceffddf47acdddf67973
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Mar 13 19:43:31 2018 +0900

    Make minified userscript build work

commit 2fd5d790ec5855066a19549416ca766f4415bd11
Author: seanl-adg <seanl@adguard.com>
Date:   Sat Mar 10 10:46:53 2018 +0900

    upd

commit 6bddc8d8c202527e173b7993682c595d44a510d8
Author: seanl-adg <seanl@adguard.com>
Date:   Mon Mar 5 13:30:17 2018 +0900

    Fix

commit 8abc9a15de6b4969a9dc4f1f1754023716a104bf
Author: seanl-adg <seanl@adguard.com>
Date:   Mon Mar 5 10:05:19 2018 +0900

    Use webRequest api to prevent extension UUID leak; make browserAction work

commit df5ea8dbb3f40d5e2e4fc089235a5ec63b6d7d05
Author: seanl-adg <seanl@adguard.com>
Date:   Thu Mar 1 16:46:52 2018 +0900

    Make minified extension build partially work

commit 4e970e150862f135ac3fbf577ab47a27dc34df1b
Author: seanl-adg <seanl@adguard.com>
Date:   Tue Feb 27 02:59:04 2018 +0900

    Update

commit 4eba1e75d5d3d587d6c70ea1fbfd99b3bc86624a
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Feb 21 09:19:41 2018 +0900

    Partial build script implementation

commit 8f06d666da93bc9ac615ebf2b058688eb9007f7a
Author: seanl-adg <seanl@adguard.com>
Date:   Wed Feb 14 20:58:47 2018 +0900

    Implement new ui in sources (build script is not ready)
  • Loading branch information
Sean Lee committed Apr 23, 2018
1 parent 0080138 commit c77637a
Show file tree
Hide file tree
Showing 228 changed files with 13,657 additions and 8,907 deletions.
13 changes: 7 additions & 6 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
node_modules
build
.rpt2_cache
config
yarn-error
.DS_Store
node_modules
build
build_tsickle
.rpt2_cache
config
yarn-error
.DS_Store
28 changes: 14 additions & 14 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: node_js
node_js:
- "8"
install:
- yarn install
script:
- gulp travis
deploy:
- provider: pages
skip_cleanup: true
local_dir: 'build'
github_token: $GITHUB_TOKEN
on:
branch: master
language: node_js
node_js:
- "8"
install:
- yarn install
script:
- gulp travis
deploy:
- provider: pages
skip_cleanup: true
local_dir: 'build'
github_token: $GITHUB_TOKEN
on:
branch: master
330 changes: 165 additions & 165 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,165 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.


This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.

"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".

The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:

a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license
document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:

a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.

c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.

1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
Loading

0 comments on commit c77637a

Please sign in to comment.