Skip to content

Commit 13614ee

Browse files
committed
Merge branch 'master' into fork/mutairibassam/feature/min-version-handling
# Conflicts: # AUTHORS.md # lib/providers/auth.dart
2 parents 5010eca + 73ac022 commit 13614ee

File tree

806 files changed

+37034
-17633
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

806 files changed

+37034
-17633
lines changed

.github/ISSUE_TEMPLATE/1_bug.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/1_bug.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
2+
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
3+
4+
name: Bug report
5+
description: Report an error or unexpected behavior
6+
type: bug
7+
body:
8+
- type: dropdown
9+
id: priority
10+
attributes:
11+
label: Priority/Impact
12+
description: How severe is the issue?
13+
options:
14+
- Low (minor inconvenience)
15+
- Medium (affects some functionality)
16+
- High (critical issue, blocks workflow)
17+
18+
- type: textarea
19+
id: description
20+
attributes:
21+
label: Description
22+
description: |
23+
A clear and concise description of the bug.
24+
placeholder: |
25+
Please include any information you think is relevant to the issue you are experiencing.
26+
This could include any steps to reproduce it (if it happens consistently), expected vs.
27+
actual behavior, logs, screenshots, links to related issues, etc.
28+
validations:
29+
required: true
30+
31+
- type: input
32+
id: server-version
33+
attributes:
34+
label: Server version
35+
description: |
36+
What version of wger are you using and how did you install it (you use our server,
37+
docker compose, manual installation, etc)?
38+
placeholder: |
39+
Check https://<server>/software/about-us or the git sha1 of the last commit you pulled
40+
validations:
41+
required: false
42+
43+
- type: input
44+
id: app-version
45+
attributes:
46+
label: Mobile app version
47+
description: |
48+
What version of the mobile app are you using and how did you install it
49+
(Play Store, App Store, Flathub, self compiled, etc.)?
50+
placeholder: |
51+
Check the "about wger" dialog
52+
validations:
53+
required: false

.github/ISSUE_TEMPLATE/2_feature_request.md

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Feature request
2+
description: Suggest a new idea for wger
3+
type: enhancement
4+
body:
5+
- type: textarea
6+
id: description
7+
attributes:
8+
label: Use case
9+
description: |
10+
A description of what new feature or behavior you would like to see.
11+
validations:
12+
required: true
13+
14+
- type: textarea
15+
id: proposal
16+
attributes:
17+
label: Proposal
18+
description: |
19+
Why is this feature needed? What problems does it solve?
20+
validations:
21+
required: false
22+
23+
- type: textarea
24+
id: additional-context
25+
attributes:
26+
label: Additional Context
27+
description: |
28+
Any extra details, related issues, or mockups
29+
placeholder: |
30+
Screenshots or mockups, links to similar features in other applications, or other relevant
31+
information.
32+
validations:
33+
required: false

.github/contributing.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Contributing to wger
2+
3+
🎉 Thanks for showing interest in contributing! 🎉
4+
5+
We have centralized the documentation for contributing to wger in the online
6+
docs, especially for non-code contributions such as documentation, translations,
7+
etc.:
8+
9+
<https://wger.readthedocs.io/en/latest/contributing.html>
10+
11+
## Questions
12+
13+
Are you just using the software and have a question or improvement? Let us know!
14+
15+
* Discord: <https://discord.gg/rPWFv6W>
16+
* Mastodon: <https://fosstodon.org/@wger>
17+
18+
## Issues
19+
20+
If you run into a bug describe the problem as well as you can.
21+
22+
- Steps and any useful information to reproduce the issue
23+
- If you use our server, the time when this happened, we might be able to get some
24+
information from the logs
25+
- Environment details (app type: web / mobile, installation method, OS, etc.)
26+
- Screenshots or logs if applicable
27+
- Git SHA1 if installed from source

.github/pull_request_template.md

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1-
## Description (Proposed Changes)
2-
(Please try to mention in bullet points.)
1+
# Proposed Changes
32

43
-
54
-
65

7-
## Link to the issue :
6+
## Related Issue(s)
87

9-
(Add link of the issue you have proposed changes to)
8+
If applicable, please link to any related issues (`Closes #123`,
9+
`Closes wger-project/other-repo#123`, `See also #123`, etc.)
1010

11-
- Link :
11+
## Please check that the PR fulfills these requirements
1212

13-
## Tests
14-
15-
Please make sure to add tests when implementing new features.
16-
17-
## Checklist
18-
19-
Please check that the PR fulfills all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
20-
21-
- [ ] Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
2213
- [ ] Tests for the changes have been added (for bug fixes / features)
23-
- [ ] Added yourself to AUTHORS.md
14+
- [ ] Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
15+
(run `dart format --line-length=100 .`)
2416
- [ ] Updated/added relevant documentation (doc comments with `///`).
2517
- [ ] Added relevant reviewers.

.github/release.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
2+
changelog:
3+
categories:
4+
- title: Features
5+
labels:
6+
- '*'
7+
exclude:
8+
labels:
9+
- dependencies
10+
- title: Dependencies
11+
labels:
12+
- dependencies

.github/workflows/build-release.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: subosito/flutter-action@v2
2727
with:
2828
channel: stable
29-
flutter-version: 3.16.x
29+
flutter-version: 3.29.2
3030

3131
- name: Flutter info
3232
run: |
@@ -68,20 +68,22 @@ jobs:
6868
6969
- name: Build AAB
7070
run: flutter build appbundle --release
71-
env:
72-
WGER_API_KEY: ${{ secrets.WGER_API_KEY }}
71+
72+
- name: Build APK
73+
run: flutter build apk --release
7374

7475
- name: Upload build to Play Store
7576
run: |
7677
bundle install
7778
bundle exec fastlane android production
7879
7980
- name: Make Github release
80-
uses: softprops/action-gh-release@v1
81+
uses: softprops/action-gh-release@v2
8182
with:
8283
tag_name: ${{ env.VERSION }}
8384
files: |
8485
build/app/outputs/bundle/release/app-release.aab
86+
build/app/outputs/flutter-apk/app-release.apk
8587
flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.tar.gz
8688
flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.sha256
8789
@@ -92,6 +94,7 @@ jobs:
9294
dart manifest_generator.dart --meta ../flatpak_meta.json --github
9395
mkdir ../../flathub
9496
cp flatpak_generator_exports/de.wger.flutter.json ../../flathub
97+
cp flatpak_generator_exports/flathub.json ../../flathub
9598
9699
- name: Push updated config to flathub repository
97100
uses: cpina/github-action-push-to-another-repository@main
@@ -120,7 +123,5 @@ jobs:
120123
git checkout -b release-${{ env.VERSION }}
121124
git add pubspec.yaml
122125
git commit -m "Bump version to $( flutter pub run cider version )"
123-
git tag ${{ env.VERSION }}
124-
git push origin ${{ env.VERSION }}
125126
git push origin --delete ${{ env.VERSION_V }}
126-
git push
127+
git push --set-upstream origin release-${{ env.VERSION }}

.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,23 @@ jobs:
1818
- name: Install Flutter
1919
uses: subosito/flutter-action@v2
2020
with:
21+
cache: true
2122
channel: 'stable'
22-
flutter-version: '3.16.x'
23+
flutter-version: '3.29.x'
2324

2425
- run: dart --version
2526
- run: flutter --version
2627

28+
- name: Install sqlite3-dev
29+
run: sudo apt install libsqlite3-dev
30+
2731
- name: Install app dependencies
2832
run: flutter pub get
2933

3034
- name: Test app
3135
run: flutter test --coverage
3236

3337
- name: Coveralls
34-
uses: coverallsapp/github-action@master
38+
uses: coverallsapp/github-action@v2
3539
with:
3640
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linter.yml renamed to .github/workflows/linter.yml.bak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: subosito/flutter-action@v2
2121
with:
2222
channel: 'stable'
23-
flutter-version: '3.16.x'
23+
flutter-version: '3.24.x'
2424

2525
- name: Get dependencies
2626
run: flutter pub get

0 commit comments

Comments
 (0)