Skip to content

Commit

Permalink
Merge branch 'release-1.14.2'
Browse files Browse the repository at this point in the history
* release-1.14.2:
  Update version info.
  core: add support to Pale Moon
  doc: revise release notes
  • Loading branch information
danny0838 committed Oct 15, 2017
2 parents 0dbb1c4 + 0765b5e commit d977632
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
10 changes: 5 additions & 5 deletions doc/releases/1.14.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Scrapbook X 1.14.1
Changes since v1.14.0
---------------------

* Added support to "poster" attribute of <video> elements.
* Added support to "poster" attribute of <video> elements.

* Remove "crossorigin" attribute to avoid loading failure of
the downloaded resource on some browsers (e.g. Chrome).
* Remove "crossorigin" attribute to avoid loading failure of
the downloaded resource on some browsers (e.g. Chrome).

* Fixed an issue that <script> elements are escaped from some
processes.
* Fixed an issue that <script> elements are escaped from some
processes.
9 changes: 9 additions & 0 deletions doc/releases/1.14.2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Scrapbook X 1.14.2
==================

Changes since v1.14.1
---------------------

* Added Pale Moon support to the installer.

Also includes minor documentation revises.
13 changes: 11 additions & 2 deletions install.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,32 @@
<Description about="urn:mozilla:install-manifest">
<em:id>[email protected]</em:id>
<em:type>2</em:type>
<em:version>1.14.1</em:version>
<em:version>1.14.2</em:version>
<em:unpack>false</em:unpack>
<em:bootstrap>false</em:bootstrap>
<em:multiprocessCompatible>false</em:multiprocessCompatible>
<em:iconURL>chrome://scrapbook/skin/main_32.png</em:iconURL>
<em:optionsURL>chrome://scrapbook/content/prefs.xul</em:optionsURL>
<em:homepageURL>https://addons.mozilla.org/firefox/addon/scrapbook-x/</em:homepageURL>

<!-- Firefox -->
<em:targetApplication>
<Description>
<!-- Firefox -->
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>4.0</em:minVersion>
<em:maxVersion>56.*</em:maxVersion>
</Description>
</em:targetApplication>

<!-- Pale Moon -->
<em:targetApplication>
<Description>
<em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id>
<em:minVersion>25.0</em:minVersion>
<em:maxVersion>27.*</em:maxVersion>
</Description>
</em:targetApplication>

<em:name>ScrapBook X</em:name>
<em:description>Helps you save web pages and organize the collection.</em:description>
<em:creator>Danny Lin</em:creator>
Expand Down

0 comments on commit d977632

Please sign in to comment.