From 2a881289b66a43b7f7f7796bd9e3e7f4b5adb0dc Mon Sep 17 00:00:00 2001 From: Neil Rotstan Date: Wed, 25 Apr 2018 09:43:31 -0700 Subject: [PATCH] Bump to v3.0.0-beta.7 --- .env | 2 +- CHANGELOG.md | 21 +++++++++++++++++++++ README.md | 45 +++++++++++++++++++++++++++++---------------- package.json | 2 +- src/lang/en-US.json | 2 ++ yarn.lock | 4 ++-- 6 files changed, 56 insertions(+), 20 deletions(-) diff --git a/.env b/.env index 70792ab12..6027c1df4 100644 --- a/.env +++ b/.env @@ -9,7 +9,7 @@ REACT_APP_TITLE='MR3 beta' # Features flags. Set each to 'enabled' or 'disabled'. REACT_APP_FEATURE_SOCIAL_SHARING='enabled' REACT_APP_FEATURE_BOUNDED_TASK_BROWSING='disabled' -REACT_APP_FEATURE_LEADERBOARD='disabled' +REACT_APP_FEATURE_LEADERBOARD='enabled' # Default locale to use if user has not set their locale. Note that this locale # must be supported by the app or the default en-US will be used. diff --git a/CHANGELOG.md b/CHANGELOG.md index 3eaee3014..282e34e7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,27 @@ The format is based on This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [v3.00-beta.7] - 2018-04-25 +### Added +- Ability to also search by challenge name in admin search (#205). +- Public leaderboard of top scoring users across various timeframes (#254). +- Leaderboard opt-out setting in User Profile. +- Challenge-specific leaderboards for challenge owners in admin area (#316). +- Display of user's own top challenges (by activity) on user profile page. +- Notice to challenge owners after creating or updating challenge that + it can take up to 2 hours to complete geographic indexing (#234). +- MIT license for project (#295). + +### Fixed +- Already-complete challenges included in search results (#283). +- Misaligned task-control buttons for some users (#323). +- Typo in link to Overpass guide fixed by @naoliv +- Busy indicator spins forever when attempting to browse a + challenge pending deletion (#332). +- No error shown when admin attempts to navigate to non-existent + challenge (#333). + + ## [v3.00-beta.6] - 2018-04-17 ### Added - Ability to delete projects (#243). diff --git a/README.md b/README.md index 09e55e8f2..f5f5dd631 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,14 @@ project is still required. 1. Create a `.env.development.local` file and: * set `REACT_APP_BASE_PATH='/mr3'` - * set `REACT_APP_URL='https://maproulette.mydevserver.com/mr3'` (substituting your dev domain, of course) + * set `REACT_APP_URL='https://maproulette.mydevserver.com/mr3'` + (substituting your dev domain, of course) * set `REACT_APP_MAP_ROULETTE_SERVER_URL='https://maproulette.mydevserver.com'` * if you wish to use Mapbox maps, set the `REACT_APP_MAPBOX_ACCESS_TOKEN` to your API token. * if you wish to use [Matomo/PIWIK](https://github.com/matomo-org/matomo) for analytics, set `REACT_APP_MATOMO_URL` and `REACT_APP_MATOMO_SITE_ID` to your - tracking url and site id, respectively. + tracking url and site id, respectively (see `.env` file for example). * if you want some debug output, set `REACT_APP_DEBUG='enabled'`. * override any other settings from the `.env` file as needed or desired. @@ -33,22 +34,28 @@ project is still required. `https://maproulette.mydevserver.com`). Take note of your new app's consumer key and secret key, as you'll need them in the next step. -5. Fire up your backend scala server (installed separately from the maproulette2 project), - setting the `MR_OAUTH_CONSUMER_KEY` and `MR_OAUTH_CONSUMER_SECRET` environment variables - to your OSM app's consumer key and secret key, respectively. The back-end - server assumes your front-end dev server is running on port 3000, which is - the default; if you've changed the port, you'll also need to set - `MR3_JS_ASSET_URI=https://localhost:/static/js/bundle.js` (replacing - with the proper port) and - `MR3_CSS_ASSET_URI=https://localhost:/static/css/bundle.css`. - -6. Point your browser at /mr3 on your server (e.g. +5. In your backend server project, setup a .conf file that overrides properties + as needed from `conf/application.conf` (unless you'd prefer to set explicit + system properties on the command line when starting up the server). Refer + to the `conf/application.conf` file and maproulette2 docs for explanations + of the various server configuration settings -- at the very least, you'll + want to make sure your JDBC url is correct and your OAuth consumer key and + secret are set properly. You'll also need to set the `mr3.host` to the URL + of your front-end dev server (e.g. `http://localhost:3000`) and set + `mr3.devMode=true` if you're doing development. + +6. Fire up your backend server, specifying the path to your .conf file with + `-Dconfig.resource` or explicitly specifying the various system properties + on the command line (e.g. `-Dmr3.host="http://localhost:3000`). See the + maproulette2 project for details on starting up the server. + +7. Point your browser at /mr3 on your server (e.g. `https://maproulette.mydevserver.com/mr3`) to bring up the front-end. ### Updating to the Latest Code > Note that the [maproulette2](https://github.com/maproulette/maproulette2) -> backend (scala) server must be updated separately, if desired. +> backend (scala) server must be updated separately. 1. Stop your front-end server (ctrl-c) if it's running. 2. Pull the latest code @@ -79,9 +86,15 @@ The project was bootstrapped with Branch management follows [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) with -active development of the next release occurring on the `develop` branch. Pull -requests should target the `develop` branch. The master branch always contains -the latest release. +active development occurring on the `develop` branch. Pull requests should +target the `develop` branch. The master branch always contains the latest +release, and the `prerelease` branch contains features and fixes promoted from +`develop` that are candidates for the next release to `master`. + +It is okay for pull requests to the `develop` branch to rely on server features +or fixes that have only been merged into the server's `dev` branch, but they +will not be promoted to the `prelease` branch until the server-side code makes +it into the server's `master` branch. Release versions follow [Semantic Versioning](https://semver.org/). diff --git a/package.json b/package.json index 253225dea..9283a9d28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "maproulette3", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.7", "private": true, "dependencies": { "@mapbox/geojsonhint": "^2.0.1", diff --git a/src/lang/en-US.json b/src/lang/en-US.json index 5a48f1d77..67eeb8aeb 100644 --- a/src/lang/en-US.json +++ b/src/lang/en-US.json @@ -282,6 +282,8 @@ "UserSettings.form.customBasemap.description": "Insert a custom base map here. Eg. http://\\{s\\}.tile.openstreetmap.org/\\{z\\}/\\{x\\}/\\{y\\}.png", "UserSettings.form.locale.label": "Locale", "UserSettings.form.locale.description": "User locale to use for MapRoulette UI.", + "UserSettings.form.leaderboardOptOut.label": "Opt out of Leaderboard", + "UserSettings.form.leaderboardOptOut.description": "If yes, you will **not** appear on the public leaderboard.", "Admin.EditChallenge.overpass.errors.noTurboShortcuts": "Overpass Turbo shortcuts are not supported. If you wish to use them, please visit Overpass Turbo and test your query, then choose Export -> Query -> Standalone -> Copy and then paste that here.", "Activity.action.updated": "Updated", "Activity.action.created": "Created", diff --git a/yarn.lock b/yarn.lock index bb43df334..13cfd4f79 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2584,7 +2584,7 @@ ctype@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f" -"cucumber@github:xolvio/cucumber-js#v1.3.0-chimp.6": +cucumber@xolvio/cucumber-js#v1.3.0-chimp.6: version "1.3.0" resolved "https://codeload.github.com/xolvio/cucumber-js/tar.gz/cf953cb5b5de30dbcc279f59e4ebff3aa040071c" dependencies: @@ -4072,7 +4072,7 @@ glob@^6.0.4: once "^1.3.0" path-is-absolute "^1.0.0" -"glob@github:lucetius/node-glob#chimp": +glob@lucetius/node-glob#chimp: version "7.1.1" resolved "https://codeload.github.com/lucetius/node-glob/tar.gz/51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce" dependencies: