Skip to content

Commit

Permalink
Prepare the 1.0 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentj committed Mar 22, 2018
1 parent 09f9523 commit 049d21c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
# The short X.Y version.
version = '1.0'
# The full version, including alpha/beta/rc tags.
release = '1.0.0-rc.1'
release = '1.0.0-rc.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
9 changes: 5 additions & 4 deletions docs/release-notes-1.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Release Notes of SlimerJS 1.0
==============================

version 1.0
==============
===========

Not released yet.

Expand All @@ -17,17 +17,17 @@ New features and API
- ``onResourceError`` parameter contains now always ``status`` and ``statusText`` properties
- ``proxy()`` and ``setProxy()`` methods
- ``slimer.version`` and ``slimer.geckoVersion`` have a new ``prerelease`` property.
- With Firefox 56 and more, SlimerJS can be trully headless by adding the --headless option on the command line
- With Firefox 56 and more, SlimerJS can be trully headless by adding the ``--headless`` option on the command line
- Proxy config: support https URI for pac
- new ``fs.isSpecial()``
- onResourceRequested: support of requestData.postData when http method is "patch"
- ``onResourceRequested``: support of requestData.postData when http method is "patch"

Improvements
------------

* implements ``system.pid`` (#473)
* implements ``phantom.proxy()`` and ``phantom.setProxy()`` methods (#436, #444, #445)
* Compatibility with Firefox 53 to 58
* Compatibility with Firefox 53 to 59

Fixed bugs
----------
Expand Down Expand Up @@ -76,6 +76,7 @@ Known issues
Contributors for this release
-----------------------------

- Avadh Patel
- Brian Birtles
- Brendan Dahl
- Nagy Attila Gabor
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "slimerjs",
"version": "1.0.0-rc.1",
"version": "1.0.0-rc.2",
"description": "A scriptable browser like PhantomJS, based on Firefox",
"bin": {
"slimerjs": "./src/slimerjs-node"
Expand Down
4 changes: 2 additions & 2 deletions src/application.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[App]
Vendor=Innophi
Name=SlimerJS
Version=1.0.0-rc.1
BuildID=20180314
Version=1.0.0-rc.2
BuildID=20180323
ID[email protected]
Copyright=Copyright 2012-2018 Laurent Jouanneau & Innophi

Expand Down

0 comments on commit 049d21c

Please sign in to comment.