Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge remote-tracking branch 'origin/master' into double-progression

Roland Geider46532aa5ab9a
diff --cc CHANGELOG.md
index 89ad3049e,ac23da425..cf50aba0a
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,12 -5,9 +5,11 @@@
## New features
+### Double progression
+Progression requirements can now reference the top of the prescribed range via the new rules `max_repetitions` and `max_weight`, and the new `all_sets` flag requires every prescribed set to qualify. Together they enable classic double progression schemes ("work from 8 to 12 reps at a fixed weight, add weight only once all sets reach 12"), e.g. `{"rules": ["max_repetitions"], "all_sets": true}`.
### Others
-
- <!-- Add other changes here. -->
+ *
### Bug fixes