Release 1.2.15

strophe · May 21, 2018 · c3b7e86 · c3b7e86
1 parent e81ce28
commit c3b7e86
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 79 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,12 @@
 # Strophe.js Change Log
 
-## Version 1.2.15 - (Unreleased)
+## Version 1.2.15 - (2018-05-21)
 * #259 XML element should be sent to xmlOutput
 * #266 Support Browserify/CommonJS. `require('strophe.js/src/wrapper')`
-* #288 Strophe logs fatal errors by default.
+* #296 Remove error handler from old websocket before closing
+* #271 SASL X-OAUTH2 authentication mechanism implemented 
+* #288 Strophe now logs fatal errors by default.
+* Run tests with headless Chromium instead of Phantomjs
 
 ## Version 1.2.14 - 2017-06-15
 * #231 SASL OAuth Bearer authentication should not require a JID node, when a user identifer

diff --git a/Makefile b/Makefile
@@ -52,6 +52,7 @@ doc:
 .PHONY: release
 release:
 	$(SED) -i 's/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/' package.json
+	$(SED) -i 's/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/' package-lock.json
 	$(SED)  -i "s/Unreleased/`date +%Y-%m-%d`/" CHANGELOG.md
 	make dist
 	make doc

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ covers Strophe in detail in the context of web applications.
 ## Quick Links
 
 * [Homepage](http://strophe.im/strophejs)
-* [Documentation](http://strophe.im/strophejs/doc/1.2.14/files/strophe-js.html)
+* [Documentation](http://strophe.im/strophejs/doc/1.2.15/files/strophe-js.html)
 * [Mailing list](http://groups.google.com/group/strophe)
 * [Community Plugins](http://github.com/strophe/strophejs-plugins)
 

diff --git a/RELEASE_CHECKLIST.md b/RELEASE_CHECKLIST.md
@@ -2,9 +2,9 @@
 
 1. Make sure all tests pass (run 'make check')
 2. Update CHANGELOG.md
-3. Run "make release VERSION=1.2.14" (on Mac, prefix with "SED=gsed" so that GNU-sed is used).
+3. Run "make release VERSION=1.2.16" (on Mac, prefix with "SED=gsed" so that GNU-sed is used).
 4. Add documentation to strophe.im repo
-5. Update links in index.markdown in Strophe.im
+5. Update links in `strophejs/index.markdown` in Strophe.im
 6. Commit and push new documentation
 7. Update link to documentation in README (of strophe.js)
 8. Commit the newly generated files (mention it's a new release)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "strophe.js",
   "description": "Strophe.js is an XMPP library for JavaScript",
-  "version": "1.2.14",
+  "version": "1.2.15",
   "homepage": "http://strophe.im/strophejs",
   "repository": {
     "type": "git",