chore: resolves upstream conflicts

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'Kind: Bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'Kind: Enhancement'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Eg. As a user of OpenSCD I want to ...
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Requirements**
+What are the minimal requirements you need to have for this feature wish
+
+**Suggestions for a specific user interaction**
+Have a specific UI gesture in mind? If you want to discuss this first, please provide your suggestion in the discussions field.
+
+**Additional information**
+For further reading including e.g parts of IEC 61850, Tissues or other sources that triggered your feature wish

.github/workflows/build-and-deploy.yml

@@ -0,0 +1,30 @@
+name: Build and Deploy
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.1
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.x'
+
+      - name: Install and Build
+        run: |
+          npm ci
+          npm run-script build
+
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@4.1.5
+        with:
+          branch: master
+          folder: build
+          repository-name: JakobVogelsang/openscdtest.github.io
+          ssh-key: ${{ secrets.DEPLOY_KEY }}

.github/workflows/test-and-build.yml

@@ -17,3 +17,4 @@ jobs:
         run: |
           npm ci
           npm run-script build
+

.github/workflows/test.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches-ignore:
       - main
-  !pull_request:
 
 jobs:
   test:
@@ -21,3 +20,4 @@ jobs:
         run: |
           npm ci
           npm run-script test
+

README.md

@@ -10,19 +10,41 @@ Open Substation Communication Designer is an editor for SCL files as described i
 
 ## Installation
 
+In order to install OpenSCD on your local device (only for you), simply visit [openscd.github.io](https://openscd.github.io), click the "Install OpenSCD" button in your address bar (Chrome or Edge on desktop) or click the "Add OpenSCD to home screen" notification in any mobile browser.
+
+In order to install your own instance of OpenSCD on your own webserver (e.g. on your company intranet), simply download [our latest release](https://github.com/openscd/open-scd/releases/latest) (`open-scd.zip` or `open-scd.tar.gz`) and extract the archive contents into the "webroot" directory of your web server.
+
+If you don't have your own webserver but still want your own version of OpenSCD hosted locally (e.g. on a system without an internet connection), you can [use a browser plugin that acts as a local webserver](https://github.com/openscd/open-scd/wiki/Install-OpenSCD#offline) (only for you) instead.
+
+## Contributing
+
+### Building
+
+If you want to build OpenSCD yourself in order to make some changes to your local installation or to contribute to the project, you may first want to install [Node.js](https://nodejs.org/) in order to be able to use our local development setup.
+
+Once Node.js is installed on your system, you may get started by entering the following lines in your command prompt:
+
 ```
 git clone https://github.com/openscd/open-scd.git
 cd open-scd
 npm install
 npm start
 ```
 
-## Scripts
+This will start a local development server and open a browser window which will automatically be reloaded as soon as you save any changes to your local source code files.
+
+If you use VSCode to develop, we recommend you install and use the [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) and [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) extensions in order to automatically lint and format your code as you edit it.
+
+### Scripts
+
+We provide the following `npm` scripts for your convenience:
 
-- `start` runs `OpenSCD` for development, reloading on file changes
-- `test` runs the test suite with Karma
-- `lint` runs the linter
-- `doc` builds markdown documentation in the `doc` directory
+- `npm start` runs `OpenSCD` for development, reloading on file changes
+- `npm test` runs the test suite with Karma
+- `npm run lint` runs the linter (fixes problems in your code)
+- `npm run format` runs the formatter (formats your code in a unified way)
+- `npm run doc` builds HTML documentation into the `doc` directory
+- `npm run build` builds a deployable version of the project into the `dist` directory
 
 ## License
 
@@ -31,6 +53,6 @@ distributed under their [end user license agreement](CC-EULA.pdf).
 
 This project is licensed under the [Apache License 2.0](LICENSE.md).
 
-© 2020-2021 OMICRON electronics GmbH
+© 2020-2022 OMICRON electronics GmbH
 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fopenscd%2Fopen-scd.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fopenscd%2Fopen-scd?ref=badge_large)