Resolved conflicts

.github/CODE_OF_CONDUCT.md

@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
 Examples of behavior that contributes to creating a positive environment
 include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
 ## Our Responsibilities
 

.github/CONTRIBUTING.md

@@ -7,4 +7,4 @@
 
 **After your pull request is merged**, you can safely delete your branch.
 
-### [<- Back](https://github.com/mbrn/material-table/)
+### [<- Back](https://github.com/mbrn/material-table/)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,21 +6,21 @@ labels: "bug"
 
 # Guidelines
 
- - #### Please include a demo of the issue/behavior/question you have
+- #### Please include a demo of the issue/behavior/question you have
 
- - #### Please try to be as detailed as possible
+- #### Please try to be as detailed as possible
 
- - #### You may fork one of the following starter templates if you would like:
-
-   - #### [CodeSandbox](https://codesandbox.io/s/material-table-starter-template-xnfpo)
-   - #### [StackBlitz](https://stackblitz.com/edit/material-table-starter-template)
+- #### You may fork one of the following starter templates if you would like:
 
+  - #### [CodeSandbox](https://codesandbox.io/s/material-table-starter-template-xnfpo)
+  - #### [StackBlitz](https://stackblitz.com/edit/material-table-starter-template)
 
 **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 '....'
@@ -33,15 +33,17 @@ A clear and concise description of what you expected to happen.
 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]
+
+- 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]
+
+- 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

@@ -6,15 +6,14 @@ labels: "feature"
 
 # Guidelines
 
- - #### Please include a demo of the issue/behavior/question you have
+- #### Please include a demo of the issue/behavior/question you have
 
- - #### Please try to be as detailed as possible
+- #### Please try to be as detailed as possible
 
- - #### You may fork one of the following starter templates if you would like:
-
-   - #### [CodeSandbox](https://codesandbox.io/s/material-table-starter-template-xnfpo)
-   - #### [StackBlitz](https://stackblitz.com/edit/material-table-starter-template)
+- #### You may fork one of the following starter templates if you would like:
 
+  - #### [CodeSandbox](https://codesandbox.io/s/material-table-starter-template-xnfpo)
+  - #### [StackBlitz](https://stackblitz.com/edit/material-table-starter-template)
 
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

.github/ISSUE_TEMPLATE/help.md

@@ -6,11 +6,11 @@ labels: "question"
 
 # Guidelines
 
- - #### Please include a demo of the issue/behavior/question you have
+- #### Please include a demo of the issue/behavior/question you have
 
- - #### Please try to be as detailed as possible
+- #### Please try to be as detailed as possible
 
- - #### You may fork one of the following starter templates if you would like:
+- #### You may fork one of the following starter templates if you would like:
 
-   - #### [CodeSandbox](https://codesandbox.io/s/material-table-starter-template-xnfpo)
-   - #### [StackBlitz](https://stackblitz.com/edit/material-table-starter-template)
+  - #### [CodeSandbox](https://codesandbox.io/s/material-table-starter-template-xnfpo)
+  - #### [StackBlitz](https://stackblitz.com/edit/material-table-starter-template)

.github/actions/setup-node

@@ -0,0 +1,3 @@
+strategy:
+  matrix:
+    node-version: [8.16.2, 10.17.0]

.github/pull_request_template.md

@@ -1,21 +1,26 @@
 ## Related Issue
+
 Relate the Github issue with this PR using `#`
 
 ## Description
+
 Simple words to describe the overall goals of the pull request's commits.
 
 ## Related PRs
+
 List related PRs against other branches:
 
-branch | PR
------- | ------
-other_pr_production | [link]()
-other_pr_master | [link]()
+| branch              | PR       |
+| ------------------- | -------- |
+| other_pr_production | [link]() |
+| other_pr_master     | [link]() |
 
 ## Impacted Areas in Application
+
 List general components of the application that this PR will affect:
 
-*
+\*
 
 ## Additional Notes
-This is optional, feel free to follow your hearth and write here :)
+
+This is optional, feel free to follow your hearth and write here :)

.github/stale.yml

@@ -12,6 +12,6 @@ staleLabel: wontfix
 markComment: >
   This issue has been automatically marked as stale because it has not had
   recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions. You can reopen it if it required. 
+  for your contributions. You can reopen it if it required.
 # Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: false

.github/workflows/prettier.yml

@@ -0,0 +1,19 @@
+name: Prettier CLI
+# This action works with pull requests and pushes
+on:
+  pull_request:
+
+jobs:
+  prettier:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Prettify code
+        uses: creyD/[email protected]
+        with:
+          prettier_options: --write **/*.{js,tsx,ts,md}

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 version: 1.0
 sudo: false
 node_js:
- - 10
+  - 10
 install:
   - npm install
 script: