Merge branch 'v0.9.x' into add-social-features_ap

SamR1 · Jan 5, 2025 · d796927 · d796927
2 parents d952a31 + 31e162c
commit d796927
Show file tree

Hide file tree

Showing 229 changed files with 10,859 additions and 6,627 deletions.
diff --git a/.github/workflows/.tests-and-publish-python.yml b/.github/workflows/.tests-and-publish-python.yml
@@ -313,6 +313,8 @@ jobs:
           images: |
             fittrackee/fittrackee
             ${{ env.GITHUB_REGISTRY }}/${{ env.GITHUB_IMAGE_NAME}}
+          tags: |
+            type=pep440,pattern={{version}},prefix=v
 
       - name: Build and push Docker images
         id: push

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,51 @@
 # Change log
 
+## Version 0.9.0b6 (2025/01/05)
+
+**This is a pre-release. Don't install this version in production, you may not be able to safely downgrade to a stable version.**  
+If you find bugs, please report them.
+
+
+### Features and enhancements
+
+* [PR#677](https://github.com/SamR1/FitTrackee/pull/677) - Add notification preferences
+* [PR#678](https://github.com/SamR1/FitTrackee/pull/678) - Display users who like comment/workout
+
+### Bugs Fixed
+
+* [d743abf](https://github.com/SamR1/FitTrackee/commit/d743abf0e59a3c7cc1e11adbd9c8d0214d0c7da7) - display missing errors in user profile
+
+
+**Note:** This release contains database migration (see upgrade instructions in [documentation](https://samr1.github.io/FitTrackee/en/installation.html#upgrade))
+
+
+## Version 0.9.0b5 (2024/12/30)
+
+**This is a pre-release. Don't install this version in production, you may not be able to safely downgrade to a stable version.**  
+If you find bugs, please report them.
+
+
+### Features and enhancements
+
+* [PR#675](https://github.com/SamR1/FitTrackee/pull/675) - CLI - create user with provided role
+
+### Bugs Fixed
+
+* [PR#671](https://github.com/SamR1/FitTrackee/pull/671) - Fix sport icon when unauthenticated user displays user profile
+* [PR#674](https://github.com/SamR1/FitTrackee/pull/674) - Fix display of privacy policy message with privacy extension
+* [2e9f9d](https://github.com/SamR1/FitTrackee/commit/2e9f9d69eb38d5f310236944d45b4b60d8faff20) - fix translations
+* [edc677](https://github.com/SamR1/FitTrackee/commit/edc6776c922925746762f7ac76c267feda7cde2f) - Fix notification icons
+
+### Misc
+
+* [174240](https://github.com/SamR1/FitTrackee/commit/174240f1d9dc702d4346c85e6add4022af2a88c6) - add tags input to docker image build job
+
+
 ## Version 0.8.13 (2024/12/29)
 
 ### Translations
 
-* [PR#667](https://github.com/SamR1/FitTrackee/pull/667) - Translations update (Galicien)
+* [PR#667](https://github.com/SamR1/FitTrackee/pull/667) - Translations update (Galician)
 
 Translation status:
 - Basque: 100%

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.0b4
+0.9.0b6
diff --git a/docs/en/.buildinfo b/docs/en/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 1f40293afebca1273c520c0d2b420351
+config: 99d8b9a616473d517d6f312337cba177
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/en/_images/administration-menu.png b/docs/en/_images/administration-menu.png
diff --git a/docs/en/_images/dashboard.png b/docs/en/_images/dashboard.png
diff --git a/docs/en/_images/equipment-detail.png b/docs/en/_images/equipment-detail.png
diff --git a/docs/en/_images/equipments-list.png b/docs/en/_images/equipments-list.png
diff --git a/docs/en/_images/notifications.png b/docs/en/_images/notifications.png
diff --git a/docs/en/_images/oauth2-app-authorization.png b/docs/en/_images/oauth2-app-authorization.png
diff --git a/docs/en/_images/oauth2-client-creation.png b/docs/en/_images/oauth2-client-creation.png
diff --git a/docs/en/_images/sports-administration.png b/docs/en/_images/sports-administration.png
diff --git a/docs/en/_images/statistics-by-sport.png b/docs/en/_images/statistics-by-sport.png
diff --git a/docs/en/_images/statistics-by-time-period.png b/docs/en/_images/statistics-by-time-period.png
diff --git a/docs/en/_images/users-directory.png b/docs/en/_images/users-directory.png
diff --git a/docs/en/_images/workout-detail.png b/docs/en/_images/workout-detail.png
diff --git a/docs/en/_images/workouts-list.png b/docs/en/_images/workouts-list.png
diff --git a/docs/en/_sources/api/auth.rst.txt b/docs/en/_sources/api/auth.rst.txt
@@ -12,6 +12,7 @@ Authentication and account
     auth.edit_user_preferences,
     auth.edit_user_sport_preferences,
     auth.reset_user_sport_preferences,
+    auth.edit_user_notifications_preferences,
     auth.edit_picture,
     auth.del_picture,
     auth.request_password_reset,

diff --git a/docs/en/_sources/api/comments.rst.txt b/docs/en/_sources/api/comments.rst.txt
@@ -9,6 +9,7 @@ Comments
     comments.update_workout_comment,
     comments.like_comment,
     comments.undo_comment_like,
+    comments.get_comment_likes,
     comments.appeal_comment_suspension,
     comments.delete_workout_comment
 
diff --git a/docs/en/_sources/api/workouts.rst.txt b/docs/en/_sources/api/workouts.rst.txt
@@ -18,4 +18,5 @@ Workouts
     workouts.delete_workout,
     workouts.like_workout,
     workouts.undo_workout_like,
+    workouts.get_workout_likes,
     workouts.appeal_workout_suspension
diff --git a/docs/en/_sources/changelog.md.txt b/docs/en/_sources/changelog.md.txt
@@ -1,10 +1,51 @@
 # Change log
 
+## Version 0.9.0b6 (2025/01/05)
+
+**This is a pre-release. Don't install this version in production, you may not be able to safely downgrade to a stable version.**  
+If you find bugs, please report them.
+
+
+### Features and enhancements
+
+* [PR#677](https://github.com/SamR1/FitTrackee/pull/677) - Add notification preferences
+* [PR#678](https://github.com/SamR1/FitTrackee/pull/678) - Display users who like comment/workout
+
+### Bugs Fixed
+
+* [d743abf](https://github.com/SamR1/FitTrackee/commit/d743abf0e59a3c7cc1e11adbd9c8d0214d0c7da7) - display missing errors in user profile
+
+
+**Note:** This release contains database migration (see upgrade instructions in [documentation](https://samr1.github.io/FitTrackee/en/installation.html#upgrade))
+
+
+## Version 0.9.0b5 (2024/12/30)
+
+**This is a pre-release. Don't install this version in production, you may not be able to safely downgrade to a stable version.**  
+If you find bugs, please report them.
+
+
+### Features and enhancements
+
+* [PR#675](https://github.com/SamR1/FitTrackee/pull/675) - CLI - create user with provided role
+
+### Bugs Fixed
+
+* [PR#671](https://github.com/SamR1/FitTrackee/pull/671) - Fix sport icon when unauthenticated user displays user profile
+* [PR#674](https://github.com/SamR1/FitTrackee/pull/674) - Fix display of privacy policy message with privacy extension
+* [2e9f9d](https://github.com/SamR1/FitTrackee/commit/2e9f9d69eb38d5f310236944d45b4b60d8faff20) - fix translations
+* [edc677](https://github.com/SamR1/FitTrackee/commit/edc6776c922925746762f7ac76c267feda7cde2f) - Fix notification icons
+
+### Misc
+
+* [174240](https://github.com/SamR1/FitTrackee/commit/174240f1d9dc702d4346c85e6add4022af2a88c6) - add tags input to docker image build job
+
+
 ## Version 0.8.13 (2024/12/29)
 
 ### Translations
 
-* [PR#667](https://github.com/SamR1/FitTrackee/pull/667) - Translations update (Galicien)
+* [PR#667](https://github.com/SamR1/FitTrackee/pull/667) - Translations update (Galician)
 
 Translation status:
 - Basque: 100%

diff --git a/docs/en/_sources/cli.rst.txt b/docs/en/_sources/cli.rst.txt
@@ -98,6 +98,7 @@ Remove blacklisted tokens expired for more than provided number of days.
 """"""""""""""""""""""
 .. versionadded:: 0.7.15
 .. versionchanged:: 0.8.4  User preference for interface language is added.
+.. versionchanged:: 0.9.0  Add option for user role.
 
 Create a user account.
 
@@ -121,6 +122,8 @@ Create a user account.
      - User password (if not provided, a random password is generated).
    * - ``--lang LANGUAGE``
      - User preference for interface language (two-letter code, ISO 639-1). If not provided or not supported, it falls back to English ('en').
+   * - ``--role [owner|admin|moderator|user]``
+     - User role (default: 'user').
 
 
 
@@ -160,7 +163,7 @@ Modify a user account (role, active status, email and password).
      - Username.
    * - ``--set-admin BOOLEAN``
      - [DEPRECATED] Add/remove admin rights (when adding admin rights, it also activates user account if not active).
-   * - ``--set-role ROLE``
+   * - ``--set-role [owner|admin|moderator|user]``
      - Set user role (when setting 'moderator', 'admin' and 'owner' role, it also activates user account if not active).
    * - ``--activate``
      - Activate user account.

diff --git a/docs/en/_sources/features.rst.txt b/docs/en/_sources/features.rst.txt
@@ -225,6 +225,14 @@ Notifications
 
 - Users with administration rights can also receive notifications on user creation.
 - Users can mark notifications as read or unread.
+- Notifications can be disabled or enabled the following events in user preferences:
+
+  - follow request and follow
+  - follow request approval when follow request approval is manual
+  - like on comment or workout
+  - comment on workout
+  - mention on comment
+  - user registration (if authenticated user has administration rights)
 
 Dashboard
 =========

diff --git a/docs/en/_static/documentation_options.js b/docs/en/_static/documentation_options.js
@@ -1,5 +1,5 @@
 const DOCUMENTATION_OPTIONS = {
-    VERSION: '0.9.0b4',
+    VERSION: '0.9.0b6',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',