Merge branch 'bug/previous-sorting'

aichaos · Dec 8, 2016 · 8df0dda · 8df0dda
2 parents 2af3a6b + b022e32
commit 8df0dda
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,14 @@
 # Changes
 
+* 1.17.1 2016-12-08
+  - Fix sorting algorithm for triggers with `%Previous`, making their sort order
+    deterministic and correct regardless of the order they appeared in the
+    source file (PR #194)
+  - Fix the function prototype for `getVariable` to only accept the `name`
+    parameter for a bot variable. Previously it was accepting `(username, name)`
+    which was incorrect because bot variables are global and have no relation
+    to a particular username.
+
 * 1.17.0 2016-10-11
   - Fix accidental double-piped wildcards caused by missing arrays (PR #176).
   - Fix tags like `{uppercase}` in the BEGIN block from affecting object macros

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rivescript",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "RiveScript is a scripting language for chatterbots, making it easy to write trigger/response pairs for building up a bot's intelligence.",
   "keywords": [
     "bot",

diff --git a/src/rivescript.coffee b/src/rivescript.coffee
@@ -7,7 +7,7 @@
 "use strict"
 
 # Constants
-VERSION  = "1.17.0"
+VERSION  = "1.17.1"
 
 # Helper modules
 Parser  = require "./parser"