Merge remote-tracking branch 'upstream/development' into Issue1161_Re…

…moveIcons

CODE_OF_CONDUCT.md

@@ -55,18 +55,19 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team via the [Contact page](https://openenergydashboard.org/contact/),
+using the contact form and selecting the leadership topic/area. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
 Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership. If your concern revolves around a project 
-maintainer or you have concerns contacting us via the leadership email then you 
-can directly contact the main project coordinator at 
-[email protected]. If the issue involves the main project
+members of the project's leadership. If your concern revolves around a project
+maintainer or you have concerns contacting us via the contact form then you
+can directly contact the main project coordinator via Discord (@SteveOED).
+If the issue involves the main project
 coordinator then please contact other project leadership or other project members.
 
 ## Attribution

CONTRIBUTING.md

@@ -4,15 +4,15 @@ We're thrilled that you're interested in contributing to the OED project. We
 welcome all open source contributions, whether bug reports, patches, or anything
 else.
 
-Check out the [developer getting started](https://openenergydashboard.github.io/developer/gettingStarted.html) page to learn how you can set up OED on your
+Check out the [developer first steps](https://openenergydashboard.org/developer/gettingStarted/) page to learn how you can set up OED on your
 own system.
 
 ## Legal Stuff
 
-Please sign our [Contributor License Agreement](https://openenergydashboard.github.io/developer/cla.html) before
+Please sign our [Contributor License Agreement](https://openenergydashboard.org/developer/cla/) before
 contributing code to OED. It is not necessary to sign the CLA in order to
 contribute by filing or discussing issues.
 
 ## Working as a Developer on OED
 
-Web pages with [information for developers](https://openenergydashboard.github.io/developer/) is available to explain how to develop and contribute code to OED.
+Web pages with [information for developers](https://openenergydashboard.org/developer/developer/) is available to explain how to develop and contribute code to OED.

README.md

@@ -2,7 +2,7 @@
 
 ![Github Build](https://github.com/OpenEnergyDashboard/OED/workflows/Build/badge.svg)
 
-Open Energy Dashboard is a user-friendly way to display energy information from smart energy meters or uploaded via CSV files. It is available to anyone and is optimized for non-technical users with a simple interface that provides access to your organization's energy data. To learn more, see [our website](https://openenergydashboard.github.io/).
+Open Energy Dashboard is a user-friendly way to display energy information from smart energy meters or uploaded via CSV files. It is available to anyone and is optimized for non-technical users with a simple interface that provides access to your organization's energy data. To learn more, see [our website](https://openenergydashboard.org/).
 
 Open Energy Dashboard is available under the Mozilla Public License v2, and contributions, in the form of bug reports, feature requests, and code contributions, are welcome.
 
@@ -30,11 +30,11 @@ For a list of contributors, [click here](https://github.com/OpenEnergyDashboard/
 
 This project is licensed under the MPL version 2.0.
 
-See the full licensing agreement [here](LICENSE.txt)
+See the full licensing agreement [here](License.txt)
 
 ## Contributions ##
 
-We welcome others to contribute to this project by writing code for submission or collaborating with us. Before contributing, please sign our [Contributor License Agreement](https://openenergydashboard.github.io/developer/cla.html). Web pages with [information for developers](https://openenergydashboard.github.io/developer/) is available. If you have any questions or concerns feel free to at engage@OpenEnergyDashboard.org.
+We welcome others to contribute to this project by writing code for submission or collaborating with us. Before contributing, please sign our [Contributor License Agreement](https://openenergydashboard.org/developer/cla/). Web pages with [information for developers](https://openenergydashboard.org/developer/developer/) is available. If you have any questions or concerns feel free to [contact us](https://OpenEnergyDashboard.org/contact/).
 
 ## Code of Conduct ##
 
@@ -53,4 +53,4 @@ If you think there is a security concern in the OED software, the please visit o
 
 ## Contact ##
 
-To contact us, see our [contact web page](https://openenergydashboard.github.io/contact.html), send an email to [email protected] or open an issue on GitHub.
+To contact us, see our [contact web page](https://openenergydashboard.org/contact/) or open an issue on GitHub.

SECURITY.md

@@ -2,7 +2,7 @@
 
 OED welcomes input at any time. Having said that, security issues can be special as they could represent a risk to those using the OED software. Given this, OED suggests these avenues for reporting a security concern:
 
-1. If the concern may represent a real risk to sites, you should report it to [[email protected]](mailto:security@OpenEnergyDashboard.org). This email is regularly monitored and you should receive a response indicating your concern has been received by the project. Please provide the type of information that would be in an issue including what you are concerned about, where it is located in the code base (if possible), any links to security notices about this issue and any thoughts on how to address the issue. Additionally, you are welcome to indicate you would like us to publicly acknowledge you when an issue and/or pull request is created. If you would like this then please also provide your GitHub ID if you have one. We may delay doing this until a security patch is available for sites to install.
+1. If the concern may represent a real risk to sites, you should report it via our [contact page](https://OpenEnergyDashboard.org/contact/), click to get to the "Contact Form" and select "Security" as the topic/area. Submissions are regularly monitored and you should receive a response indicating your concern has been received by the project (if you provide contact information). Please provide the type of information that would be in an issue including what you are concerned about, where it is located in the code base (if possible), any links to security notices about this issue and any thoughts on how to address the issue. Additionally, you are welcome to indicate you would like us to publicly acknowledge you when an issue and/or pull request is created. If you would like this then please also provide your GitHub ID if you have one. We may delay doing this until a security patch is available for sites to install.
 2. You can open an [issue](https://github.com/OpenEnergyDashboard/OED/issues) on our GitHub repository. The same information as requested in the previous item is appreciated. The major difference is that issues are usually public so anyone (including bad actors) can see the issue before the OED project can act.
 3. You can create a draft security advisory by using the "Report a vulnerability" as the issue type on the OED [issues](https://github.com/OpenEnergyDashboard/OED/issues) on our GitHub repository. Since OED is not a package included in other software, this may be less applicable but still available. These are not public unless the project chooses to make them so.
 

SUPPORT.md

@@ -1,3 +1,3 @@
 # OED Support
 
-OED maintains a [website](https://openenergydashboard.github.io/), [help ages](https://openenergydashboard.github.io/help/index.html) and [contact info](https://openenergydashboard.github.io/contact.html) to support you in interacting with the project. We welcome your input, thoughts, ideas, questions and requests for help.
+OED maintains a [website](https://openenergydashboard.org/), [help pages](https://openenergydashboard.org/helpV1_0_0/user/) and [contact info](https://openenergydashboard.org/contact/) to support you in interacting with the project. We welcome your input, thoughts, ideas, questions and requests for help.

USAGE.md

@@ -2,8 +2,8 @@
 
 ## Developers
 
-The [developer website](https://openenergydashboard.github.io/developer/) is available to learn about working with the OED project.
+The [developer website](https://openenergydashboard.org/developer/developer/) is available to learn about working with the OED project.
 
 ## Production/Sites
 
-The [admin installation page](https://OpenEnergyDashboard.github.io/help/v0.7.0/adminInstallation.html) is available to learn about installing OED for a production environment (normal OED site). These are part of the overall admin help pages for OED.
+The [admin documentation page](https://openenergydashboard.org/helpV1_0_0/admin/) has a section about "Site Installation" to learn about installing OED for a production environment (normal OED site). These are part of the overall admin help pages for OED.