diff --git a/CHANGELOG.md b/CHANGELOG.md index d33db6f414..4a89393897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +# 2.0.0-96 + +Mostly bugfixes and sortable shortcut buttons in panel. + +Relevant: + +* http://community.os.js.org/t/update-version-bump-alpha96/130 + +Digest: + +* Settings: Bugfixes +* Textpad: Bugfixes +* PackageManager: Bugfixes, better error messages +* CoreWM: Sortable buttons in panel (dnd) +* dialogs: Fixed 'title' argument for File dialog +* utils: Added $path() and $fromPath() xpath helpers +* build: Updated watcher ignore files +* build: Updated base index.html template +* server-php: Fixed find() VFS method after refactor +* misc: Updated eslint rules +* misc: Updated package.json dependencies +* misc: Updated locales + # 2.0.0-95 Forgot to merge a branch in the last release, so see previous release notes for information. diff --git a/package.json b/package.json index 2c4164e613..f4c6e2cfa6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OS.js", - "version": "2.0.0-95", + "version": "2.0.0-96", "description": "JavaScript Cloud/Web Desktop Platform", "url": "https://www.os-js.org", "email": "andersevenrud@gmail.com", diff --git a/src/conf/000-base.json b/src/conf/000-base.json index 281bbcfc8b..a239239c74 100644 --- a/src/conf/000-base.json +++ b/src/conf/000-base.json @@ -4,7 +4,7 @@ "storage": "demo", "client" : { - "Version" : "2.0.0-95", + "Version" : "2.0.0-96", "SettingsManager": {}, "PackageManager": {}, "Preloads": {},