Skip to content

Commit 188042f

Browse files
BilelJeghamBilelJegham
authored
Merge branch 'master' into l10n_master
2 parents 1395552 + 2f28824 commit 188042f

31 files changed

Lines changed: 985 additions & 832 deletions

‎.env.dist‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ VUE_APP_FIREBASE_MESSAGING_SENDER_ID=YOUR_FIREBASE_MESSAGING_SENDER_ID
99
VUE_APP_FIREBASE_APP_ID=YOUR_FIREBASE_APP_ID
1010
VUE_APP_FIREBASE_MEASUREMENT_ID=YOUR_FIREBASE_MEASUREMENT_ID
1111

12-
VUE_APP_LIST_MAPS_JSON_URL=https://maps.geoguess.games/maps.json
12+
VUE_APP_LIST_MAPS_JSON_URL=https://maps.geoguess.games/maps.json
13+
#VUE_APP_PUBLIC_PATH="/path"

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ''
88
---
99

1010
**Describe the bug**
11-
A clear and concise description of what the bug is.
11+
<!--A clear and concise description of what the bug is.-->
1212

1313
**To Reproduce**
1414
Steps to reproduce the behavior:
@@ -18,15 +18,15 @@ Steps to reproduce the behavior:
1818
4. See error
1919

2020
**Expected behavior**
21-
A clear and concise description of what you expected to happen.
21+
<!--A clear and concise description of what you expected to happen.-->
2222

2323
**Screenshots**
24-
If applicable, add screenshots to help explain your problem.
24+
<!--If applicable, add screenshots to help explain your problem.-->
2525

2626
**Desktop / Smartphone(please complete the following information):**
2727
- OS: [e.g. Windows, iOS]
2828
- Browser [e.g. chrome, stock browser, safari]
2929
- Version [e.g. 22]
3030

3131
**Additional context**
32-
Add any other context about the problem here.
32+
<!--Add any other context about the problem here.-->

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ assignees: ''
88
---
99

1010
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
11+
<!--A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->
1212

1313
**Describe the solution you'd like**
14-
A clear and concise description of what you want to happen.
14+
<!--A clear and concise description of what you want to happen.-->
1515

1616
**Describe alternatives you've considered**
17-
A clear and concise description of any alternative solutions or features you've considered.
17+
<!--A clear and concise description of any alternative solutions or features you've considered.-->
1818

1919
**Additional context**
20-
Add any other context or screenshots about the feature request here.
20+
<!--Add any other context or screenshots about the feature request here.-->

‎.github/pull_request_template.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
Welcome and thanks!
3+
We are glad to see that your contribution to GeoGuess.
4+
Please note we have a [code of conduct](https://github.com/GeoGuess/Geoguess/blob/master/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
5+
-->
6+
7+
8+
## Types of Changes
9+
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
10+
- [ ] Bug fix (non-breaking change that fixes an issue)
11+
- [ ] New feature (non-breaking change that adds functionality)
12+
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
13+
14+
15+
## Description
16+
<!--- Describe your changes in detail -->
17+
<!--- Add 'Close #<issue>', if it's link to issue -->
18+
19+
20+
## How Has This Been Tested?
21+
<!--- Please describe in detail how you tested your changes. -->
22+
<!--- Include details of your testing environment, the tests you ran to -->
23+
<!--- see how your change affects other areas of the code, etc. -->
24+
25+
## Screenshots (if appropriate):
26+
27+

‎.github/workflows/version-patch.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Version Patch
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
version:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- run: git config --global user.name 'GitHub Actions Bot'
12+
- run: git config --global user.email '<>'
13+
- run: npm version patch
14+
- run: git push --tags

‎netlify.toml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,9 @@
1414
VUE_APP_FIREBASE_MEASUREMENT_ID = "YOUR_FIREBASE_MEASUREMENT_ID"
1515

1616
[[plugins]]
17-
package = "@netlify/plugin-functions-install-core"
17+
package = "@netlify/plugin-functions-install-core"
18+
19+
[[redirects]]
20+
from = "/*"
21+
to = "/index.html"
22+
status = 200

0 commit comments

Comments
 (0)