Private
Public Access
1
0
Commit Graph

3518 Commits

Author SHA1 Message Date
Sander Roosendaal
d85a1a7045 favorite charts by workout source 2018-10-26 09:17:19 +02:00
Sander Roosendaal
4e0db6e2e0 replaced i with em in sessions table 2018-10-26 08:10:01 +02:00
Sander Roosendaal
20e4b6fde4 Merge branch 'feature/comparison' into develop 2018-10-25 15:17:58 +02:00
Sander Roosendaal
929144cc56 added new url to tests.py 2018-10-25 15:16:26 +02:00
Sander Roosendaal
3739cdbda9 comparison with preselected workout 2018-10-25 15:08:44 +02:00
Sander Roosendaal
7b50ff5196 Merge tag 'v8.26' into develop
bug fix
2018-10-25 13:28:50 +02:00
Sander Roosendaal
113e962c2f Merge branch 'hotfix/v8.26' 2018-10-25 13:27:58 +02:00
Sander Roosendaal
a559ec2481 bug fix 2018-10-25 13:24:51 +02:00
Sander Roosendaal
398b170146 Merge tag 'v8.25' into develop
release & bug fix
2018-10-25 13:09:47 +02:00
Sander Roosendaal
e0bbd33e2d Merge branch 'release/v8.25' 2018-10-25 13:09:15 +02:00
Sander Roosendaal
ae161288c6 named stats view 2018-10-25 13:05:37 +02:00
Sander Roosendaal
5cf99742ac Merge branch 'feature/viewtests' into develop 2018-10-25 12:35:22 +02:00
Sander Roosendaal
3bbdbdff05 added 181 new tests 2018-10-25 12:33:59 +02:00
Sander Roosendaal
e2df28888e adding more choice for workout default page 2018-10-25 10:53:56 +02:00
Sander Roosendaal
0a5926adaa added response check in tests for most urls 2018-10-25 10:32:10 +02:00
Sander Roosendaal
f3ddad40bc fixing date selector bug 2018-10-25 09:35:13 +02:00
Sander Roosendaal
697149de63 Merge branch 'feature/blogposts' into develop 2018-10-25 08:25:01 +02:00
Sander Roosendaal
81815316f3 front page improvements 2018-10-25 08:20:11 +02:00
Sander Roosendaal
835466de35 Merge tag 'v8.24' into develop
bug fix
2018-10-25 07:46:55 +02:00
Sander Roosendaal
a4bb8786cf Merge branch 'hotfix/v8.24' 2018-10-24 20:28:29 +02:00
Sander Roosendaal
9b47e0a8ad making flex charts login required 2018-10-24 20:25:30 +02:00
Sander Roosendaal
3aa0445dee improvement (not escaping chars) 2018-10-24 20:13:48 +02:00
Sander Roosendaal
055f128639 first version with blog posts 2018-10-24 20:10:53 +02:00
Sander Roosendaal
f519cdca62 gets analytics posts 2018-10-23 22:18:23 +02:00
Sander Roosendaal
f3b7d2b17d Merge tag 'v8.23' into develop
bug fix
2018-10-23 21:35:33 +02:00
Sander Roosendaal
a7d50f2195 Merge branch 'hotfix/v8.23' 2018-10-23 21:35:04 +02:00
Sander Roosendaal
0c225126d2 fixed bug with disappearing div 2018-10-23 21:33:23 +02:00
Sander Roosendaal
5ccd871317 Merge tag 'v8.22' into develop
better menu states and better redirects
2018-10-23 18:55:20 +02:00
Sander Roosendaal
db078bec8b Merge branch 'release/v8.22' 2018-10-23 18:54:57 +02:00
Sander Roosendaal
a1ce128b7e Merge branch 'feature/decoratordecorator' into develop 2018-10-23 18:38:19 +02:00
Sander Roosendaal
05ff94f6a0 Merge branch 'develop' into feature/decoratordecorator 2018-10-23 18:37:00 +02:00
Sander Roosendaal
464b5cf807 got redirects in wrapper working with messaging 2018-10-23 18:36:07 +02:00
Sander Roosendaal
ffc9ae91e9 Merge tag 'v8.21' into develop
fix
2018-10-23 15:00:19 +02:00
Sander Roosendaal
32195af1c1 Merge branch 'hotfix/v8.21' 2018-10-23 15:00:01 +02:00
Sander Roosendaal
40a24a99a1 bug fix workout delete 2018-10-23 14:58:49 +02:00
Sander Roosendaal
d6c8d48d2d works better now (menu state) 2018-10-23 14:51:53 +02:00
Sander Roosendaal
296ac8147b Merge tag 'v8.20' into develop
releasing sticky menus
2018-10-23 11:50:55 +02:00
Sander Roosendaal
76b0a11971 Merge branch 'release/v8.20' 2018-10-23 11:50:26 +02:00
Sander Roosendaal
ed180edbb2 redirects now all to promembership 2018-10-23 11:49:15 +02:00
Sander Roosendaal
cd825484eb Merge tag 'v8.19' into develop
not fixed
2018-10-23 11:28:08 +02:00
Sander Roosendaal
1ede7c7e5c Merge branch 'hotfix/v8.19' 2018-10-23 11:27:50 +02:00
Sander Roosendaal
a1653f0b7d not fixed 2018-10-23 11:23:55 +02:00
Sander Roosendaal
51a7516a5a Merge branch 'feature/menustate' into develop 2018-10-23 10:57:59 +02:00
Sander Roosendaal
c967d495f1 clearing local storage on logout 2018-10-23 10:56:26 +02:00
Sander Roosendaal
c3dc038c31 script to open/close menu 2018-10-23 10:40:25 +02:00
Sander Roosendaal
17c12020d5 Merge tag 'v8.17' into develop
bug fix
2018-10-22 22:17:58 +02:00
Sander Roosendaal
966b9a2304 Merge branch 'hotfix/v8.17' 2018-10-22 22:16:47 +02:00
Sander Roosendaal
2613fc38b4 fixing obscure Mike bug 2018-10-22 22:15:11 +02:00
Sander Roosendaal
5ee63f01f8 Merge tag 'v8.16' into develop
final release of v1 of new design
2018-10-22 20:32:58 +02:00
Sander Roosendaal
a82c9343e0 Merge branch 'release/v8.16' 2018-10-22 20:31:34 +02:00