diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c2bc9b6ee..3b9c587986 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# 6.17.0 (April 1, 2020) +### New Features + +### Bugfixes + +### Enhancements & Refactors + + # 6.16.0 (March 1, 2020) ### New Features - #1526 - Introduce Montevideo Carrasco Airport (SUMU) @@ -12,7 +20,7 @@ - #1486 - Update AFL airline - #1507 - Fix broken link in aircraft commands documentation - #1022 - Reintroduce Munich Airport (EDDM) -- [#1387](https://github.com/openscope/openscope/issues/1387) - Update LOWW to AIRAC 1908 +- #1387 - Update LOWW to AIRAC 1908 - #1499 - Reintroduce Ministro Pistarini Airport (SAEZ) - #1503 - Reintroduce Dublin Airport (EIDW) - #1471 - Change all airport guide links to open in new tab diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ce9f19b91f..061fefed38 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,12 +2,12 @@ Hello, and thank you for your interest in contributing to openScope! Please take a minute to review our Contribution Guidelines, as this will result in getting your issue resolved or pull request merged faster. ## Getting set up -Here at openScope, we use multiple tools for development, the basics being Git and Node (see the quick start guide in our [README](README.md) file for help). Please use eslint to ensure your code conforms to our conventions. Hit us up on [slack](http://slack.openscope.co) if you need help getting this set up. +Here at openScope, we use multiple tools for development, the basics being Git and Node (see the quick start guide in our [README](README.md) file for help). Please use eslint to ensure your code conforms to our conventions. Hit us up on [slack](http://slack.openscope.io) if you need help getting this set up. ## Getting Push Access To make work sharing and collaboration easier, we _heavily_ prefer to add you to the organization, so you can __keep your branch directly on the [openscope/openscope] repository instead of using forks__. There is nothing stopping you from also having a fork, but all pull requests must originate from a branch in the main repository. Pull requests originating from user forked repositories will closed, copied to a new branch on `openscope/openscope` and reopened there. -For access to the repository, contact Nate Geslin or Erik Quinn via [slack](http://slack.openscope.co). After you join, you will be able to push your branch to the main repository. +For access to the repository, contact Nate Geslin or Erik Quinn via [slack](http://slack.openscope.io). After you join, you will be able to push your branch to the main repository. ## Creating a pull request Every pull request on openScope has a corresponding issue that describes the work to be done, and a category that it falls into. If no issue exists for the planned changes, create a new one. Remember to keep each issue and pull request focused and specific, and _keep the PR changes focused on the changes planned by the issue._ Generally, the smaller they are, the sooner they're merged. @@ -34,7 +34,7 @@ For all commit messages, please: Example: `documentation/723 - Add contribution guidelines file` ## Additional Information -More information on our processes and file formats can be found in the [documentation folder](documentation/). If you have any questions, send us a message on [slack](http://slack.openscope.co), and we're always happy to help! We are a large, global team, so somebody is always awake and around to help you out. +More information on our processes and file formats can be found in the [documentation folder](documentation/). If you have any questions, send us a message on [slack](http://slack.openscope.io), and we're always happy to help! We are a large, global team, so somebody is always awake and around to help you out. We really appreciate your willingness to put your time into improving openScope! It is thanks to our dedicated contributors that the simulator continues to grow and improve every month. diff --git a/README.md b/README.md index 4ed52401e1..5f81a692a6 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ [![openScope Current Release](https://img.shields.io/github/release/openscope/openscope.svg)](https://github.com/openscope/openscope/releases) [![Travis Production Build State](https://img.shields.io/travis/openscope/openscope/master.svg)](https://github.com/openscope/openscope/tree/master) [![Coverage Status](https://coveralls.io/repos/github/openscope/openscope/badge.svg?branch=develop)](https://coveralls.io/github/openscope/openscope?branch=develop) -[![Slack Status](http://slack.openscope.co/badge.svg)](http://slack.openscope.co) +[![Slack Status](http://slack.openscope.io/badge.svg)](http://slack.openscope.io) [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) # openScope Air Traffic Control Simulator -Visit http://openscope.co to begin playing now! +Visit http://openscope.io to begin playing now! If you're just getting started, try the tutorial and see the [command reference](documentation/commands.md) for a full list of commands you can use. For information on each airport, see the [airport guide](documentation/airport-guides/airport-guide-directory.md). -Feel free to [join us on slack](http://slack.openscope.co/) if you have questions, comments or would like to contribute to the project. We can then add you to the organization so you can begin committing to this repo. +Feel free to [join us on slack](http://slack.openscope.io/) if you have questions, comments or would like to contribute to the project. We can then add you to the organization so you can begin committing to this repo. --- @@ -41,7 +41,7 @@ Listening on PORT 3003 Success!! -You you do not see this message and are having trouble getting set up, please join us on [Slack](http://slack.openscope.co) and someone will be able to troubleshoot with you. +You you do not see this message and are having trouble getting set up, please join us on [Slack](http://slack.openscope.io) and someone will be able to troubleshoot with you. For more information on the available tools, please view the [Tools Readme](tools/README.md). diff --git a/documentation/airport-file-standards.md b/documentation/airport-file-standards.md index af43c55417..868633a9b9 100644 --- a/documentation/airport-file-standards.md +++ b/documentation/airport-file-standards.md @@ -4,7 +4,7 @@ This document serves as a checklist for airport contributors to review to ensure their airport file is "up to snuff". There are two levels of airports: `Standard` and `Premium`, the latter designator being used only for our most pristine, complete, realistic, and well-documented airports. In order for a new airport to be merged, it must at least meet all the `Standard` specifications listed in the section below. If it does not meet these requirements, it will require extra work before being merged. It will often require a team of people to complete work on an airport, because of the wide variety of tasks to complete. -If you ever need help working on an airport, the best place to go is the [openScope Slack](https://openscopeatc.slack.com) ([click here if you need an invite](http://slack.openscope.co)). There is always somebody available, and many who will be glad to walk you through anything you may need help with. +If you ever need help working on an airport, the best place to go is the [openScope Slack](https://openscopeatc.slack.com) ([click here if you need an invite](http://slack.openscope.io)). There is always somebody available, and many who will be glad to walk you through anything you may need help with. If you have not contributed before, please note that we will need to add you to the organization so you can keep your branch _directly_ on the openScope repository. We do all branching and pull requests internally like this, instead of using forks. Join slack and request to be invited to the openScope team by `@erikquinn`. diff --git a/documentation/airport-terrain-generation.md b/documentation/airport-terrain-generation.md index 97f50a31ac..7bcc1cdfa3 100644 --- a/documentation/airport-terrain-generation.md +++ b/documentation/airport-terrain-generation.md @@ -34,7 +34,7 @@ ## Introduction -This guide will show you how to generate a terrain file for any airport in openScope. This is mainly done using QGIS, a free and open source Geographic Information System. The process can be quite tedious and often frustrating, so if you get stuck somewhere, you can talk to us on [Slack](http://slack.openscope.co/), where we will be happy to help you! +This guide will show you how to generate a terrain file for any airport in openScope. This is mainly done using QGIS, a free and open source Geographic Information System. The process can be quite tedious and often frustrating, so if you get stuck somewhere, you can talk to us on [Slack](http://slack.openscope.io/), where we will be happy to help you! ## Initial setup (QGIS 2.18) @@ -216,7 +216,7 @@ Download and install QGIS from the [QGIS website](http://www.qgis.org/en/site/fo If you've made it this far, you have successfully generated a terrain file for openScope. Give yourself a break now, you deserve it! -If you're having any problems while following this guide, you can talk to us on [Slack](http://slack.openscope.co/), where we will be happy to help you! +If you're having any problems while following this guide, you can talk to us on [Slack](http://slack.openscope.io/), where we will be happy to help you! # Terrain Generation (QGIS 3.4+) diff --git a/documentation/environments.md b/documentation/environments.md index 52600b4a7e..bd447c09d6 100644 --- a/documentation/environments.md +++ b/documentation/environments.md @@ -4,15 +4,15 @@ We use several environments hosted on Heroku. ## Production -The [`production`](https://openscope-prod.herokuapp.com/) app is what you see when you visit [www.openscope.co](http://www.openscope.co). This app is synced with our `master` branch and should be considered _production_ code. We want to keep this app as reliable and pristine as possible. The code in this branch has been tested and verified to be working. Any bugs discovered here will be addressed during a sprint and merged back into this branch following the standard procedures. +The [`production`](https://openscope-prod.herokuapp.com/) app is what you see when you visit [www.openscope.io](http://www.openscope.io). This app is synced with our `master` branch and should be considered _production_ code. We want to keep this app as reliable and pristine as possible. The code in this branch has been tested and verified to be working. Any bugs discovered here will be addressed during a sprint and merged back into this branch following the standard procedures. ## Staging -The [`staging`](https://openscope-staging.herokuapp.com/) app is used only briefly at the end of each sprint. This app is synced with the current `release/#.#.#` branch. It represents code that _will be_ merged into `master` and should be considered _production-ready_. It is vital that we diligently test this app before pushing any changes to `master`. We want to prevent exposing our users to any bugs or incomplete code. +The [`staging`](https://staging.openscope.io/) app is used only briefly at the end of each sprint. This app is synced with the current `release/#.#.#` branch. It represents code that _will be_ merged into `master` and should be considered _production-ready_. It is vital that we diligently test this app before pushing any changes to `master`. We want to prevent exposing our users to any bugs or incomplete code. ## Develop -The [`develop`](https://openscope-dev.herokuapp.com/) app is where bugfixes and feature development happens during the development phase of the sprint. Occasionally, things might break here, but every effort should be made to make sure that doesn't happen. At the end of a sprint we review, and fix, anything that may have broken through the course of development. +The [`develop`](https://dev.openscope.io) app is where bugfixes and feature development happens during the development phase of the sprint. Occasionally, things might break here, but every effort should be made to make sure that doesn't happen. At the end of a sprint we review, and fix, anything that may have broken through the course of development. ## Review Apps diff --git a/package-lock.json b/package-lock.json index 6989696fea..d742772d30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openscope", - "version": "6.16.0", + "version": "6.17.0-BETA", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 56e5584b39..9d26d599d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openscope", - "version": "6.16.0", + "version": "6.17.0-BETA", "description": "An ATC simulator in HTML5", "engines": { "node": "11.3.0", diff --git a/src/templates/layout.hbs b/src/templates/layout.hbs index 5551e6477a..5c4f391762 100644 --- a/src/templates/layout.hbs +++ b/src/templates/layout.hbs @@ -10,7 +10,7 @@ - +