Skip to content
This repository was archived by the owner on Jan 4, 2021. It is now read-only.

Commit a273d53

Browse files
author
DEWITTE Pierre-Alban
committed
[Docs] Update docs with myscript-common-element 1.2.1
1 parent 90dbcc9 commit a273d53

File tree

16 files changed

+61
-230
lines changed

16 files changed

+61
-230
lines changed

docs/components/myscript-common-element/.bower.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,31 @@
1616
"node_modules",
1717
"bower_components",
1818
"tests",
19-
"test"
19+
"test",
20+
"docs"
2021
],
2122
"dependencies": {
2223
"polymer": "Polymer/polymer#1.4.x",
2324
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#1.0.x",
2425
"iron-icons": "PolymerElements/iron-icons#1.1.x",
2526
"paper-fab": "PolymerElements/paper-fab#1.2.x",
2627
"paper-toast": "PolymerElements/paper-toast#1.2.x",
27-
"myscript": "myscript#master"
28+
"myscript": "myscript#1.2.1"
2829
},
2930
"devDependencies": {
3031
"iron-component-page": "PolymerElements/iron-component-page#1.1.x"
3132
},
3233
"resolutions": {
3334
"polymer": "1.4.x"
3435
},
35-
"_release": "fc60bdf498",
36+
"version": "1.2.1",
37+
"_release": "1.2.1",
3638
"_resolution": {
37-
"type": "branch",
38-
"branch": "master",
39-
"commit": "fc60bdf498d1101d5a247c202f897416bc44651b"
39+
"type": "version",
40+
"tag": "v1.2.1",
41+
"commit": "0ba212631d29d127ceb59e8283cb9d65577a1920"
4042
},
4143
"_source": "https://github.com/MyScript/myscript-common-element.git",
42-
"_target": "master",
44+
"_target": "1.2.1",
4345
"_originalSource": "myscript-common-element"
4446
}

docs/components/myscript-common-element/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## [v1.2.1](https://github.com/MyScript/myscript-common-element/tree/v1.2.1)
4+
5+
### Bugs
6+
- See [MyScriptJS v1.2.1](https://github.com/MyScript/MyScriptJS/tree/v1.2.1) for fixes
7+
8+
39
## [v1.2.0](https://github.com/MyScript/myscript-common-element/tree/v1.2.0)
410

511
### Features

docs/components/myscript-common-element/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ALL: clean prepare docker test
44

55
.PHONY: ALL \
66
purge clean prepare \
7-
watch dev
7+
watch dev docs
88

99
purge:
1010
@rm -rf bower_components/
@@ -27,6 +27,7 @@ watch:
2727
dev:
2828
@polyserve
2929

30-
doc:
31-
@rm -rf docs && mkdir -p docs
32-
@sh gp-custom.sh
30+
docs:
31+
@rm -rf docs/components/* && mkdir -p docs/components
32+
@cd docs && bower install -q ../../myscript-common-element
33+
@cp -r bower_components/* docs/components/

docs/components/myscript-common-element/bower.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
"node_modules",
1717
"bower_components",
1818
"tests",
19-
"test"
19+
"test",
20+
"docs"
2021
],
2122
"dependencies": {
2223
"polymer": "Polymer/polymer#1.4.x",
2324
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#1.0.x",
2425
"iron-icons": "PolymerElements/iron-icons#1.1.x",
2526
"paper-fab": "PolymerElements/paper-fab#1.2.x",
2627
"paper-toast": "PolymerElements/paper-toast#1.2.x",
27-
"myscript": "myscript#master"
28+
"myscript": "myscript#1.2.1"
2829
},
2930
"devDependencies": {
3031
"iron-component-page": "PolymerElements/iron-component-page#1.1.x"

docs/components/myscript-common-element/gp-custom.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

docs/components/myscript-text-web/.bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
],
3030
"dependencies": {
3131
"polymer": "Polymer/polymer#1.4.x",
32-
"myscript-common-element": "myscript-common-element#master"
32+
"myscript-common-element": "myscript-common-element#1.2.1"
3333
},
3434
"devDependencies": {
3535
"iron-component-page": "PolymerElements/iron-component-page#1.1.x",

docs/components/myscript-text-web/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## [v1.2.1](https://github.com/MyScript/myscript-text-web/tree/v1.2.1)
4+
5+
### Bugs
6+
- Improve documentation of superimposed options
7+
- See [MyScriptJS v1.2.1](https://github.com/MyScript/MyScriptJS/tree/v1.2.1) for fixes
8+
39
## [v1.2.0](https://github.com/MyScript/myscript-text-web/tree/v1.2.0)
410

511
### Features
Lines changed: 10 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -1,176 +1,10 @@
1-
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
4-
5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6-
7-
1. Definitions.
8-
9-
"License" shall mean the terms and conditions for use, reproduction,
10-
and distribution as defined by Sections 1 through 9 of this document.
11-
12-
"Licensor" shall mean the copyright owner or entity authorized by
13-
the copyright owner that is granting the License.
14-
15-
"Legal Entity" shall mean the union of the acting entity and all
16-
other entities that control, are controlled by, or are under common
17-
control with that entity. For the purposes of this definition,
18-
"control" means (i) the power, direct or indirect, to cause the
19-
direction or management of such entity, whether by contract or
20-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21-
outstanding shares, or (iii) beneficial ownership of such entity.
22-
23-
"You" (or "Your") shall mean an individual or Legal Entity
24-
exercising permissions granted by this License.
25-
26-
"Source" form shall mean the preferred form for making modifications,
27-
including but not limited to software source code, documentation
28-
source, and configuration files.
29-
30-
"Object" form shall mean any form resulting from mechanical
31-
transformation or translation of a Source form, including but
32-
not limited to compiled object code, generated documentation,
33-
and conversions to other media types.
34-
35-
"Work" shall mean the work of authorship, whether in Source or
36-
Object form, made available under the License, as indicated by a
37-
copyright notice that is included in or attached to the work
38-
(an example is provided in the Appendix below).
39-
40-
"Derivative Works" shall mean any work, whether in Source or Object
41-
form, that is based on (or derived from) the Work and for which the
42-
editorial revisions, annotations, elaborations, or other modifications
43-
represent, as a whole, an original work of authorship. For the purposes
44-
of this License, Derivative Works shall not include works that remain
45-
separable from, or merely link (or bind by name) to the interfaces of,
46-
the Work and Derivative Works thereof.
47-
48-
"Contribution" shall mean any work of authorship, including
49-
the original version of the Work and any modifications or additions
50-
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
52-
or by an individual or Legal Entity authorized to submit on behalf of
53-
the copyright owner. For the purposes of this definition, "submitted"
54-
means any form of electronic, verbal, or written communication sent
55-
to the Licensor or its representatives, including but not limited to
56-
communication on electronic mailing lists, source code control systems,
57-
and issue tracking systems that are managed by, or on behalf of, the
58-
Licensor for the purpose of discussing and improving the Work, but
59-
excluding communication that is conspicuously marked or otherwise
60-
designated in writing by the copyright owner as "Not a Contribution."
61-
62-
"Contributor" shall mean Licensor and any individual or Legal Entity
63-
on behalf of whom a Contribution has been received by Licensor and
64-
subsequently incorporated within the Work.
65-
66-
2. Grant of Copyright License. Subject to the terms and conditions of
67-
this License, each Contributor hereby grants to You a perpetual,
68-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69-
copyright license to reproduce, prepare Derivative Works of,
70-
publicly display, publicly perform, sublicense, and distribute the
71-
Work and such Derivative Works in Source or Object form.
72-
73-
3. Grant of Patent License. Subject to the terms and conditions of
74-
this License, each Contributor hereby grants to You a perpetual,
75-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76-
(except as stated in this section) patent license to make, have made,
77-
use, offer to sell, sell, import, and otherwise transfer the Work,
78-
where such license applies only to those patent claims licensable
79-
by such Contributor that are necessarily infringed by their
80-
Contribution(s) alone or by combination of their Contribution(s)
81-
with the Work to which such Contribution(s) was submitted. If You
82-
institute patent litigation against any entity (including a
83-
cross-claim or counterclaim in a lawsuit) alleging that the Work
84-
or a Contribution incorporated within the Work constitutes direct
85-
or contributory patent infringement, then any patent licenses
86-
granted to You under this License for that Work shall terminate
87-
as of the date such litigation is filed.
88-
89-
4. Redistribution. You may reproduce and distribute copies of the
90-
Work or Derivative Works thereof in any medium, with or without
91-
modifications, and in Source or Object form, provided that You
92-
meet the following conditions:
93-
94-
(a) You must give any other recipients of the Work or
95-
Derivative Works a copy of this License; and
96-
97-
(b) You must cause any modified files to carry prominent notices
98-
stating that You changed the files; and
99-
100-
(c) You must retain, in the Source form of any Derivative Works
101-
that You distribute, all copyright, patent, trademark, and
102-
attribution notices from the Source form of the Work,
103-
excluding those notices that do not pertain to any part of
104-
the Derivative Works; and
105-
106-
(d) If the Work includes a "NOTICE" text file as part of its
107-
distribution, then any Derivative Works that You distribute must
108-
include a readable copy of the attribution notices contained
109-
within such NOTICE file, excluding those notices that do not
110-
pertain to any part of the Derivative Works, in at least one
111-
of the following places: within a NOTICE text file distributed
112-
as part of the Derivative Works; within the Source form or
113-
documentation, if provided along with the Derivative Works; or,
114-
within a display generated by the Derivative Works, if and
115-
wherever such third-party notices normally appear. The contents
116-
of the NOTICE file are for informational purposes only and
117-
do not modify the License. You may add Your own attribution
118-
notices within Derivative Works that You distribute, alongside
119-
or as an addendum to the NOTICE text from the Work, provided
120-
that such additional attribution notices cannot be construed
121-
as modifying the License.
122-
123-
You may add Your own copyright statement to Your modifications and
124-
may provide additional or different license terms and conditions
125-
for use, reproduction, or distribution of Your modifications, or
126-
for any such Derivative Works as a whole, provided Your use,
127-
reproduction, and distribution of the Work otherwise complies with
128-
the conditions stated in this License.
129-
130-
5. Submission of Contributions. Unless You explicitly state otherwise,
131-
any Contribution intentionally submitted for inclusion in the Work
132-
by You to the Licensor shall be under the terms and conditions of
133-
this License, without any additional terms or conditions.
134-
Notwithstanding the above, nothing herein shall supersede or modify
135-
the terms of any separate license agreement you may have executed
136-
with Licensor regarding such Contributions.
137-
138-
6. Trademarks. This License does not grant permission to use the trade
139-
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for reasonable and customary use in describing the
141-
origin of the Work and reproducing the content of the NOTICE file.
142-
143-
7. Disclaimer of Warranty. Unless required by applicable law or
144-
agreed to in writing, Licensor provides the Work (and each
145-
Contributor provides its Contributions) on an "AS IS" BASIS,
146-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147-
implied, including, without limitation, any warranties or conditions
148-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149-
PARTICULAR PURPOSE. You are solely responsible for determining the
150-
appropriateness of using or redistributing the Work and assume any
151-
risks associated with Your exercise of permissions under this License.
152-
153-
8. Limitation of Liability. In no event and under no legal theory,
154-
whether in tort (including negligence), contract, or otherwise,
155-
unless required by applicable law (such as deliberate and grossly
156-
negligent acts) or agreed to in writing, shall any Contributor be
157-
liable to You for damages, including any direct, indirect, special,
158-
incidental, or consequential damages of any character arising as a
159-
result of this License or out of the use or inability to use the
160-
Work (including but not limited to damages for loss of goodwill,
161-
work stoppage, computer failure or malfunction, or any and all
162-
other commercial damages or losses), even if such Contributor
163-
has been advised of the possibility of such damages.
164-
165-
9. Accepting Warranty or Additional Liability. While redistributing
166-
the Work or Derivative Works thereof, You may choose to offer,
167-
and charge a fee for, acceptance of support, warranty, indemnity,
168-
or other liability obligations and/or rights consistent with this
169-
License. However, in accepting such obligations, You may act only
170-
on Your own behalf and on Your sole responsibility, not on behalf
171-
of any other Contributor, and only if You agree to indemnify,
172-
defend, and hold each Contributor harmless for any liability
173-
incurred by, or claims asserted against, such Contributor by reason
174-
of your accepting any such warranty or additional liability.
175-
176-
END OF TERMS AND CONDITIONS
1+
Copyright MyScript.
2+
Licensed under the Apache License, Version 2.0 (the "License");
3+
you may not use this file except in compliance with the License.
4+
You may obtain a copy of the License at
5+
http://www.apache.org/licenses/LICENSE-2.0
6+
Unless required by applicable law or agreed to in writing, software
7+
distributed under the License is distributed on an "AS IS" BASIS,
8+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9+
See the License for the specific language governing permissions and
10+
limitations under the License.

docs/components/myscript-text-web/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
],
3030
"dependencies": {
3131
"polymer": "Polymer/polymer#1.4.x",
32-
"myscript-common-element": "myscript-common-element#master"
32+
"myscript-common-element": "myscript-common-element#1.2.1"
3333
},
3434
"devDependencies": {
3535
"iron-component-page": "PolymerElements/iron-component-page#1.1.x",

docs/components/myscript/.bower.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,22 @@
3131
"Gruntfile.js",
3232
"build.json",
3333
"dist/docs",
34-
"dist/samples"
34+
"dist/samples",
35+
"docs"
3536
],
3637
"dependencies": {
3738
"cryptojslib": "3.1.x",
3839
"q": "1.4.x",
3940
"pepjs": "0.4.x"
4041
},
41-
"_release": "c7491f5852",
42+
"version": "1.2.1",
43+
"_release": "1.2.1",
4244
"_resolution": {
43-
"type": "branch",
44-
"branch": "master",
45-
"commit": "c7491f58523563641b8cbeac636209921b0dc115"
45+
"type": "version",
46+
"tag": "v1.2.1",
47+
"commit": "caace552033e7e3f7558f65f6792f67936420a77"
4648
},
4749
"_source": "https://github.com/MyScript/MyScriptJS.git",
48-
"_target": "master",
50+
"_target": "1.2.1",
4951
"_originalSource": "myscript"
5052
}

0 commit comments

Comments
 (0)