Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge

Roland Geiderf6e5282eff9a
diff --cc wger/manager/models.py
index 78639911e,5b083464d..342039054
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@@ -554,9 -605,9 +619,8 @@@ class WorkoutLog(models.Model)
class UserProfile(models.Model):
-
GENDER_MALE = '1'
GENDER_FEMALE = '2'
-
GENDER = (
(GENDER_MALE, _('Male')),
(GENDER_FEMALE, _('Female')),
diff --cc wger/manager/urls.py
index 4e00855a6,8fa3e621b..5a3ac6337
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@@ -12,10 -12,7 +12,9 @@@ from wger.manager.views.log import Work
from wger.manager.views.log import WorkoutLogUpdateView
from wger.manager.views.day import DayEditView
from wger.manager.views.day import DayCreateView
- from wger.manager.views import set
from wger.manager.views import misc
+from wger.manager.views import ical
+from wger.manager.views import user
from wger.utils.constants import USER_TAB
@@@ -80,10 -81,12 +82,15 @@@ urlpatterns = patterns('wger.manager.vi
url(r'^workout/calendar/(?P<year>\d{4})-(?P<month>\d{1,2})$',
'log.calendar',
name='workout-calendar'),
+ url(r'^workout/(?P<pk>\d+)/ical$',
+ ical.export,
+ name='workout-ical'),
+ # Timer
+ url(r'^workout/(?P<pk>\d+)/timer$',
+ 'workout.timer',
+ name='workout-timer'),
+
# Schedules
url(r'^workout/schedule/overview$',
'schedule.overview',
diff --cc wger/software/templates/changelog.html
index ccb2d6fcf,7552ae9e7..92707ac1e
--- a/wger/software/templates/changelog.html
+++ b/wger/software/templates/changelog.html
@@@ -12,8 -12,7 +12,9 @@@
<ul>
<li>Calendar view to more easily check workout logs</li>
+ <li>Add "gym mode" with timer to do and log the workout while at the gym<li>
+ <li>Add automatic email remainders for new workouts</li>
+ <li>New iCal export to add workouts and schedules e.g. to google calendar</li>
</ul>