diff --git a/CHANGELOG.md b/CHANGELOG.md index de31d6943..6740aeb25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ :warning: = Breaking change, may affect downstream projects or sites that embed iD. +## 1.9.4 +##### May 3, 2016 +* Fix bug causing save button to remain disabled even when changeset comment is entered (#3096) +* Support setting imagery offset via url hash parameter (#3093) +* Don't allow user to straighten a line if start/end nodes are at the same location (#2792) +* Add `fee` and `bin` fields to some presets (#2872) +* Add multiCombo field type selecting multiple items from a list (#3034, #3080, thanks @kepta) + * Support `payment:` tagging, add to vending machine presets (#2872) + * Support `currency:` tagging, add to vending machine, money exchange, ATM presets (#2872) + * Support `fuel:` tagging, add to fuel station presets (#1987) + * Support `recycling:` tagging, add to recycling presets (#2873) +* Improve tabbing and keyboard navigation in the entity editor +* Exclude `name` tag when validating whether a feature has tags (#3091) +* Add taginfo typeahead behavior to combo fields (#3089) +* Lower popularity thresholds for taginfo lookups +* Support looking up languages by English or local names (#3023, thanks @mapmeld) + ## 1.9.3 ##### Apr 25, 2016 * Display "Choose language" placeholder value for Wikipedia language field (#3071) diff --git a/RELEASING.md b/RELEASING.md index 90c728b84..fd9080323 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -12,41 +12,42 @@ like `{"user": "yourusername", "password": "*******"}` ### Update master branch -- [ ] `git checkout master` -- [ ] `make translations` -- [ ] `make imagery` -- [ ] `make suggestions` +- [ ] git checkout master +- [ ] make translations +- [ ] git add . && git commit -m 'make translations' +- [ ] make imagery +- [ ] git add . && git commit -m 'make imagery' +- [ ] make suggestions +- [ ] git add . && git commit -m 'make suggestions' - [ ] Update `CHANGELOG.md` - [ ] Update version number in `id.js`, `package.json` -- [ ] `git add .` -- [ ] `git commit -m 'A.B.C'` -- [ ] `git push origin master` +- [ ] git add . && git commit -m 'A.B.C' +- [ ] git push origin master ### Update and tag release branch -- [ ] `git checkout release` -- [ ] `git reset --hard master` -- [ ] `make` -- [ ] `git add -f dist/*.css dist/*.js dist/img/*.svg dist/locales/*.json` -- [ ] `git commit -m 'Check in build'` -- [ ] `git tag vA.B.C` -- [ ] `git push origin -f release vA.B.C` +- [ ] git checkout release +- [ ] git reset --hard master +- [ ] make +- [ ] git add -f dist/*.css dist/*.js dist/img/*.svg dist/locales/*.json +- [ ] git commit -m 'Check in build' +- [ ] git tag vA.B.C +- [ ] git push origin -f release vA.B.C ### Update openstreetmap-website #### Setup remotes (one time only) -- [ ] `git remote add osmlab git@github.com:osmlab/openstreetmap-website.git` -- [ ] `git remote add upstream git@github.com:openstreetmap/openstreetmap-website.git` +- [ ] git remote add osmlab git@github.com:osmlab/openstreetmap-website.git +- [ ] git remote add upstream git@github.com:openstreetmap/openstreetmap-website.git #### Sync master and update iD (every time) -- [ ] `bundle install` -- [ ] `git fetch --all` -- [ ] `git checkout master` -- [ ] `git reset --hard upstream/master` -- [ ] `git checkout -b iD-A.B.C` -- [ ] `rm -rf vendor/assets/iD/* && vendorer` -- [ ] `git add .` -- [ ] `git commit -m 'Update to iD vA.B.C'` -- [ ] `git push osmlab` +- [ ] git fetch --all +- [ ] git checkout master +- [ ] git reset --hard upstream/master +- [ ] git checkout -b iD-A.B.C +- [ ] bundle install +- [ ] rm -rf vendor/assets/iD/* && vendorer +- [ ] git add . && git commit -m 'Update to iD vA.B.C' +- [ ] git push osmlab - [ ] Open pull request diff --git a/js/id/id.js b/js/id/id.js index 0e8c416c6..38614d748 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -377,7 +377,7 @@ window.iD = function () { }; -iD.version = '1.9.3'; +iD.version = '1.9.4'; (function() { var detected = {}; diff --git a/package.json b/package.json index 14139a187..c96481d51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iD", - "version": "1.9.3", + "version": "1.9.4", "description": "A friendly editor for OpenStreetMap", "main": "iD.js", "directories": {