Sander Roosendaal
|
c82a60f02e
|
moved user and workout permission checks to rules
updated workoutviews, rest of views not done
doesn't pass tests
|
2020-01-12 17:58:55 +01:00 |
|
Sander Roosendaal
|
892b6c0e60
|
small changes
|
2020-01-11 17:56:38 +01:00 |
|
Sander Roosendaal
|
48a361a43e
|
passing tests
|
2020-01-11 17:05:08 +01:00 |
|
Sander Roosendaal
|
ad9cab4392
|
rules now separately in rower_rules
|
2020-01-11 16:38:53 +01:00 |
|
Sander Roosendaal
|
293d4dca17
|
now working with permissions defined in models.py
|
2020-01-11 15:23:26 +01:00 |
|
Sander Roosendaal
|
67c3c1e4a3
|
Merge branch 'develop' into feature/rules
|
2020-01-11 13:55:18 +01:00 |
|
Sander Roosendaal
|
1b13b92b21
|
Merge branch 'feature/improvements' into develop
|
2020-01-11 13:11:52 +01:00 |
|
Sander Roosendaal
|
f5bfef34cf
|
small fixes
|
2020-01-11 13:11:39 +01:00 |
|
Sander Roosendaal
|
1ec5e9f6c8
|
small changes
|
2020-01-11 13:07:18 +01:00 |
|
Sander Roosendaal
|
5811b860d1
|
Merge tag 'v10.89' into develop
releasing survey cap
|
2020-01-10 16:17:23 +01:00 |
|
Sander Roosendaal
|
ee6f4b56ee
|
Merge branch 'release/v10.89'
|
2020-01-10 16:15:40 +01:00 |
|
Sander Roosendaal
|
04f0ff5781
|
adding survey storage
|
2020-01-10 16:09:33 +01:00 |
|
Sander Roosendaal
|
79afd29b19
|
rules first attempt
|
2020-01-10 08:06:18 +01:00 |
|
Sander Roosendaal
|
1f96ff4fa7
|
Merge tag 'v10.88' into develop
improvements re survey (new user exempted)
|
2020-01-09 13:15:05 +01:00 |
|
Sander Roosendaal
|
97a38e05ed
|
Merge branch 'release/v10.88'
|
2020-01-09 13:14:04 +01:00 |
|
Sander Roosendaal
|
782c9b089d
|
passing all tests
|
2020-01-09 13:10:01 +01:00 |
|
Sander Roosendaal
|
6c827bef96
|
14 days no survey for new users
|
2020-01-09 10:53:06 +01:00 |
|
Sander Roosendaal
|
44bbcef227
|
Merge branch 'release/v10.87'
|
2020-01-08 22:47:48 +01:00 |
|
Sander Roosendaal
|
09a490c064
|
committing survey
|
2020-01-08 22:43:41 +01:00 |
|
Sander Roosendaal
|
cfc61e8621
|
redirect to survey
|
2020-01-08 22:27:49 +01:00 |
|
Sander Roosendaal
|
c03f3600b4
|
basic users can now see alerts created by their coaches
|
2020-01-08 09:34:37 +01:00 |
|
Sander Roosendaal
|
f11a4f0579
|
bug fixes
|
2020-01-07 22:44:16 +01:00 |
|
Sander Roosendaal
|
2aa9702cf9
|
Merge branch 'feature/usegps' into develop
|
2020-01-07 22:15:43 +01:00 |
|
Sander Roosendaal
|
498a06ef1d
|
gps/impeller switching implemented
|
2020-01-07 22:14:57 +01:00 |
|
Sander Roosendaal
|
dfbae0b2db
|
added bullet
|
2020-01-07 18:21:00 +01:00 |
|
Sander Roosendaal
|
d88a0f7aea
|
added menu items
|
2020-01-07 18:14:27 +01:00 |
|
Sander Roosendaal
|
07e9a5abf1
|
added impeller to Workout model and saving of this in dataprep
need more work and testing
|
2020-01-07 14:57:05 +01:00 |
|
Sander Roosendaal
|
92cc9d5811
|
forgot to save
|
2020-01-07 14:20:22 +01:00 |
|
Sander Roosendaal
|
7d5fa928d3
|
Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop
|
2020-01-07 13:59:40 +01:00 |
|
Sander Roosendaal
|
33bc4a7870
|
updated alert approvals
|
2020-01-07 13:44:51 +01:00 |
|
Sander Roosendaal
|
aabcdb64bb
|
Merge branch 'release/v10.86'
|
2020-01-06 22:56:04 +01:00 |
|
Sander Roosendaal
|
2fed2d79f7
|
adding app.py
|
2020-01-06 22:55:37 +01:00 |
|
Sander Roosendaal
|
55298728c5
|
Merge branch 'release/v10.85'
|
2020-01-06 22:54:26 +01:00 |
|
Sander Roosendaal
|
e4676d908e
|
changes
|
2020-01-06 22:53:59 +01:00 |
|
Sander Roosendaal
|
af937c45ad
|
Merge branch 'release/v10.84'
|
2020-01-06 22:39:59 +01:00 |
|
Sander Roosendaal
|
4c1f717be5
|
improved contact form
|
2020-01-06 22:35:58 +01:00 |
|
Sander Roosendaal
|
028ddfcfe7
|
Merge branch 'release/v10.83' into develop
|
2020-01-06 21:14:20 +01:00 |
|
Sander Roosendaal
|
738b5376b2
|
Merge branch 'release/v10.83'
|
2020-01-06 21:14:09 +01:00 |
|
Sander Roosendaal
|
8fa46ce8d8
|
bug fixes and better user emails
|
2020-01-06 21:13:54 +01:00 |
|
Sander Roosendaal
|
251a52c159
|
better welcomes
|
2020-01-06 21:03:35 +01:00 |
|
Sander Roosendaal
|
8ae0c796a7
|
fix and adding welcome emails to trial takers
|
2020-01-06 20:32:57 +01:00 |
|
Sander Roosendaal
|
7df562ab18
|
fixing next_run date shift issue on Alert
|
2020-01-06 10:02:41 +01:00 |
|
Sander Roosendaal
|
69148b426a
|
Better navigation on mini video page
|
2020-01-05 19:22:22 +01:00 |
|
Sander Roosendaal
|
a3b44fa3b7
|
Merge branch 'feature/templates' into develop
|
2020-01-04 15:26:01 +01:00 |
|
Sander Roosendaal
|
c2bdc89609
|
team clone gets dates right now
|
2020-01-04 15:25:52 +01:00 |
|
Sander Roosendaal
|
c46d4d977c
|
removed init.sh
|
2020-01-04 14:52:27 +01:00 |
|
Sander Roosendaal
|
2cbe44ad81
|
Merge branch 'feature/bugfix' into develop
|
2020-01-04 11:02:48 +01:00 |
|
Sander Roosendaal
|
c4d104a5da
|
fix date bug
|
2020-01-04 11:02:34 +01:00 |
|
Sander Roosendaal
|
0a08d22366
|
adding test and fixing get_dates_timeperiod
|
2020-01-04 10:59:50 +01:00 |
|
Sander Roosendaal
|
52a1659d9f
|
Merge branch 'release/v10.82'
|
2020-01-03 19:36:07 +01:00 |
|