Roland Geider
34f2949415
Merge branch 'master' into feature/routine-generator
...
Conflicts:
.gitignore
wger/__init__.py
wger/core/forms.py
wger/core/management/commands/clear-cache.py
wger/core/models.py
wger/core/templates/base.html
wger/core/templates/mobile/navigation.html
wger/core/templates/navigation.html
wger/core/tests/test_preferences.py
wger/exercises/templates/exercise/view.html
wger/manager/fixtures/test-user-data.json
wger/manager/models.py
wger/manager/pdf.py
wger/manager/templates/mobile/schedule/view.html
wger/manager/templates/mobile/tags/render_day.html
wger/manager/templates/schedule/view.html
wger/manager/tests/test_schedule.py
wger/manager/urls.py
wger/manager/views/schedule.py
wger/software/templates/changelog.html
wger/utils/pdf.py
wger/utils/tests/test_unit_conversion.py
wger/utils/units.py
2014-12-23 15:08:09 +01:00
Roland Geider
5aeeff600d
Add user document to fixture filter helper
2014-11-06 22:36:31 +01:00
Roland Geider
f26a6be485
Allow trainers to add notes to users
2014-10-27 20:12:36 +01:00
Roland Geider
f7ec157b95
Remove wrongly commited test file
2014-10-22 22:08:31 +02:00
Roland Geider
1735dbcbf4
Create configuration table for gym members
...
This model works like GymAdminConfig, except that only regular members have
an entry.
2014-10-22 22:06:16 +02:00
Roland Geider
9e5e4ef177
Add edit views for gym admin configurations
2014-10-20 00:37:09 +02:00
Roland Geider
4643e01b38
Add configuration table for individual gyms
...
This allows to set different configuration options on a per-gym basis.
Additionally there are per-user configuration options. At the moment only
the inactivity of members can be set.
2014-10-08 22:19:07 +02:00
Roland Geider
9df3a89f07
Move gym views and models to own app
...
While this is not really necessary right now, this makes the app a bit more
future proof, if later on more models and views are added
2014-10-07 21:49:08 +02:00
Roland Geider
7ad796adc4
Fix group permission fixture
2014-10-03 21:19:20 +02:00
Roland Geider
96086de8bb
Allow gym administrators to delete users
2014-10-03 09:53:42 +02:00
Roland Geider
c375518df1
Commit missing fixture for global gym configuration
2014-09-27 10:20:03 +02:00
Roland Geider
17fca8e0a5
Add system wide gym configuration options
...
At the moment this only allows the administrator to set a default
gym for the installation.
2014-08-11 20:24:34 +02:00
Roland Geider
c876178d0e
Add a language mapper
...
This is a simple way of identifying the same exercises across languages
and can be used e.g. in the automatic routine generator.
2014-07-22 22:33:18 +02:00
Roland Geider
dc3abf1b1d
Add support for gym management
2014-07-13 19:48:16 +02:00
Roland Geider
b13711d822
New License model to use for exercises, ingredients, etc.
...
Also add necessary views to manage the licenses and update or add tests.
2014-02-18 14:50:30 +01:00
Roland Geider
de5af37db8
Add support for equipment needed for exercises
2013-11-02 11:01:31 +01:00
Roland Geider
c47bef41e4
Merge
2013-11-01 19:16:14 +01:00
Roland Geider
5af208bf0a
Commit fixture with permissions for group "admin"
2013-10-30 23:15:11 +01:00
Roland Geider
9fd7a0666b
Update testcase to handle file uploads, also do a little clean up
2013-10-27 17:07:23 +01:00
Roland Geider
25b79ab31d
Make use of application name more consistent
...
Fixes #29
--HG--
rename : wger/manager/templatetags/manager_extras.py => wger/manager/templatetags/wger_extras.py
2013-07-13 22:21:03 +02:00
Roland Geider
0de349e8c2
Add filter for languages and their configs
2013-07-13 13:48:53 +02:00
Roland Geider
049226469b
Add simple helper script for fixture data
...
The script filters the output of django's dumpdata command by model
into more manageable chunks.
--HG--
extra : amend_source : e2026a76729ed38638c5651ccbb927fbe4f0249b
2013-04-29 21:06:06 +02:00
Roland Geider
2dfd31cb1c
Add travis CI configuration file
...
--HG--
branch : 1.1-dev
rename : main.py => wger/main.py
2013-01-25 00:22:03 +01:00
