Merge branch 'hotfix/2.2.0'

Yadoms · Feb 15, 2019 · 3c6a4fa · 3c6a4fa
2 parents f6ed041 + 5cbd7e5
commit 3c6a4fa
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 36 deletions.
diff --git a/sources/scriptInterpreters/yPython27/changelog.md b/sources/scriptInterpreters/yPython27/changelog.md
@@ -1,6 +1,6 @@
 ### 1.0.2
-* Raise error to Yadoms when unable to load rule content
-
+* Raise error to Yadoms when unable to load rule content
+
 ### 1.0.1
 * Add purge log function
 

diff --git a/sources/scriptInterpreters/yPython27/yScriptApiWrapper/yScriptApiDoc.md b/sources/scriptInterpreters/yPython27/yScriptApiWrapper/yScriptApiDoc.md
@@ -125,12 +125,12 @@ The keyword ID to change state
 ##### newState (in)
 The keyword new state. Must be a string (ex, for boolean, must be \"1\" or \"0\")
 For enum based keywords, use original values, not translated value as displayed in GUI :
-* curtain keywords : Open, Stop, Close
-* armingAlarm keywords : Disarmed, ArmedAtHome, ArmedAway
-* cameraMove keywords : Left, Right, Up, Down, Position1, ProgramPosition1, Position2, ProgramPosition2, Position3, ProgramPosition3, Position4, ProgramPosition4, CenterPosition, ProgramCenterPosition, Sweep, ProgramSweep
-* deviceState keywords : Unknown, Active, Busy, Asleep, Dead, Custom
-* pluginState keywords : Unknown, Error, Stopped, Running, Custom, WaitDebugger
-* upDownStop keywords : Stop, Up, Down
+* curtain keywords : Open, Stop, Close
+* armingAlarm keywords : Disarmed, ArmedAtHome, ArmedAway
+* cameraMove keywords : Left, Right, Up, Down, Position1, ProgramPosition1, Position2, ProgramPosition2, Position3, ProgramPosition3, Position4, ProgramPosition4, CenterPosition, ProgramCenterPosition, Sweep, ProgramSweep
+* deviceState keywords : Unknown, Active, Busy, Asleep, Dead, Custom
+* pluginState keywords : Unknown, Error, Stopped, Running, Custom, WaitDebugger
+* upDownStop keywords : Stop, Up, Down
 * weatherCondition keywords : Cloudy, Snow, ChanceSnow, PartlySunny, Sunny, ChanceRain, Rain, Sleet, ChanceStorm, Storm, Fog, Night_Clear, Night_Cloudy, Night_Rain, Night_Snow
 #### Throw
 Error if keyword not found

diff --git a/sources/server/changelog.md b/sources/server/changelog.md
@@ -1,31 +1,4 @@
-### 2.2.0-beta.5
-* Fix wrong display for new devices
-* Fix #540 : Fix getKeywordData request when used without specifying limit
-
-### 2.2.0-beta.4
-
-* New feature #513 : Add device fusion 
-* Fix script interpreter package generation (post build copy)
-* Fix #529 : Fix saving system configuration
-* Fix #527 - Equipment renamed is not displayed immediately
-* Fix #526 - Equipment type change not fully functional
-* Fix #511 - Configuration blocks - duplicate buttons doesn't work properly
-
-
-### 2.2.0-beta.3
-
-#### Web Client
-* Fix device details access on devices page
-* Fix #512 - Fix confirmation modals displayed multiple times and at background (need update of switch widget to version 1.1.1)
-
-
-### 2.2.0-beta.2
-
-#### Web Client
-* Fix #510 - Title not display
-
-
-### 2.2.0-beta.1
+### 2.2.0
 
 #### Yadoms Core
 * Fix #319 - No widget displayed with SAFARI
@@ -38,6 +11,11 @@
 * Fix incremental historization from automation rules or web client
 * Automatic set version number into package.json (from changelog.md) for modules (plugins and script interpreters)
 * Log Yadoms version at startup (information level)
+* New feature #513 : Add device fusion 
+* Fix #540 : Fix getKeywordData request when used without specifying limit
+* Fix script interpreter package generation (post build copy)
+* Fix #529 : Fix saving system configuration
+* Fix #526 - Equipment type change not fully functional
 
 #### Web Client
 * Fix #389 - Bad display after computer wake up
@@ -50,6 +28,15 @@
 * Fix #502 - [Dashboard - automation rules] Move help button to edit rule modal footer
 * In configuration sections, don't display sub-section of a combo section if no content
 * Optimize Devices Page in dashboard (less requests to the server)
+* Fix device details access on devices page
+* Fix #512 - Fix confirmation modals displayed multiple times and at background (need update of switch widget to version 1.1.1)
+* Fix #510 - Title not display
+* Fix #527 - Equipment renamed is not displayed immediately
+* Fix wrong display for new devices
+* Fix #511 - Configuration blocks - duplicate buttons doesn't work properly
+
+#### Issues fixed
+* [Click here to see issues fixed in this version](https://github.com/Yadoms/yadoms/milestone/11?closed=1)
 
 
 ### 2.1.0