Sander Roosendaal
|
f83a493a93
|
Merge tag 'v4.27' into develop
improved bar chart for team, small fixes
|
2017-10-17 17:27:14 +02:00 |
|
Sander Roosendaal
|
276609b8d7
|
Merge branch 'release/v4.27'
|
2017-10-17 17:25:24 +02:00 |
|
Sander Roosendaal
|
63f1895343
|
bar charts on team list by rower, not by type
|
2017-10-17 09:39:30 +02:00 |
|
Sander Roosendaal
|
353aeb5ab3
|
bugfix notes field intervaleditor
|
2017-10-17 08:46:23 +02:00 |
|
Sander Roosendaal
|
38e6880e9c
|
replaced upload with export in upload page
|
2017-10-16 07:36:41 +02:00 |
|
Sander Roosendaal
|
5d24f1c845
|
Merge tag 'v4.26' into develop
bugfix mail processing
|
2017-10-15 08:45:32 +02:00 |
|
Sander Roosendaal
|
b195c2bb70
|
Merge branch 'hotfix/v4.26'
|
2017-10-15 08:44:59 +02:00 |
|
Sander Roosendaal
|
253fd1261d
|
email processing fix
|
2017-10-15 08:43:40 +02:00 |
|
Sander Roosendaal
|
e3876ec85d
|
timestamp takes into account non UTC in weather
|
2017-10-14 10:05:29 +02:00 |
|
Sander Roosendaal
|
69de5054b8
|
Merge tag '4.26' into develop
bugfix mail processing
|
2017-10-14 09:54:53 +02:00 |
|
Sander Roosendaal
|
41a29335f9
|
Merge branch 'hotfix/4.26'
|
2017-10-14 09:54:17 +02:00 |
|
Sander Roosendaal
|
4745505056
|
bug fix mail handling
|
2017-10-14 09:52:37 +02:00 |
|
Sander Roosendaal
|
b8192fe573
|
Merge tag 'v4.25' into develop
bug fix
|
2017-10-13 15:17:14 +02:00 |
|
Sander Roosendaal
|
de7751befa
|
Merge branch 'hotfix/v4.25'
|
2017-10-13 15:16:40 +02:00 |
|
Sander Roosendaal
|
002f61102b
|
added check if workout is owned by requestor
|
2017-10-13 15:15:26 +02:00 |
|
Sander Roosendaal
|
f7dd380680
|
Merge tag 'v4.24' into develop
test version workflow page
|
2017-10-13 14:42:07 +02:00 |
|
Sander Roosendaal
|
e0bb6dcaeb
|
Merge branch 'release/v4.24'
|
2017-10-13 14:41:20 +02:00 |
|
Sander Roosendaal
|
fef1bf66c4
|
Merge branch 'feature/freedefaults' into develop
|
2017-10-13 14:31:28 +02:00 |
|
Sander Roosendaal
|
80cdd24913
|
fine tuning headers
|
2017-10-13 14:30:16 +02:00 |
|
Sander Roosendaal
|
5ab1152825
|
added workflow view
|
2017-10-13 14:10:53 +02:00 |
|
Sander Roosendaal
|
e806089ef7
|
v1 of workflow.html - need speed up chart generation
|
2017-10-12 22:20:07 +02:00 |
|
Sander Roosendaal
|
3028809d24
|
removed obsolete flexchart template files
|
2017-10-12 13:04:18 +02:00 |
|
Sander Roosendaal
|
08b49b32bb
|
more around default fav charts
|
2017-10-12 12:37:33 +02:00 |
|
Sander Roosendaal
|
a226a957c8
|
implemented default set of flex favs on user registration
|
2017-10-12 10:02:50 +02:00 |
|
Sander Roosendaal
|
20aacfd726
|
Merge branch 'feature/betterbreaktrhoughs' into develop
|
2017-10-10 14:52:29 +02:00 |
|
Sander Roosendaal
|
7cc59cb71a
|
refined hard
|
2017-10-10 14:48:07 +02:00 |
|
Sander Roosendaal
|
977c8b9a79
|
added announcement for hard workout
|
2017-10-10 14:41:23 +02:00 |
|
Sander Roosendaal
|
392eff116e
|
added default logo as fallback
|
2017-10-10 10:00:47 +02:00 |
|
Sander Roosendaal
|
3fd0db25a4
|
Merge tag 'v4.23' into develop
changed logo_r image white background
|
2017-10-10 09:49:30 +02:00 |
|
Sander Roosendaal
|
50022d0149
|
Merge branch 'release/v4.23'
|
2017-10-10 09:48:48 +02:00 |
|
Sander Roosendaal
|
91c4fe7c08
|
logo_r background to white
|
2017-10-10 09:46:40 +02:00 |
|
Sander Roosendaal
|
841ab069d8
|
Merge tag 'v4.22' into develop
typo fix graph view
|
2017-10-10 09:36:53 +02:00 |
|
Sander Roosendaal
|
043191bed2
|
Merge branch 'hotfix/v4.22'
|
2017-10-10 09:36:07 +02:00 |
|
Sander Roosendaal
|
7c26fb75d3
|
typo fix in show_graph template
|
2017-10-10 09:34:48 +02:00 |
|
Sander Roosendaal
|
eb32d54b3d
|
Merge tag 'v4.21' into develop
added image width height to image model for FB
|
2017-10-10 09:26:00 +02:00 |
|
Sander Roosendaal
|
87e9885caf
|
Merge branch 'hotfix/v4.21'
|
2017-10-10 09:24:47 +02:00 |
|
Sander Roosendaal
|
b4d854c481
|
image size to image model
|
2017-10-10 09:21:34 +02:00 |
|
Sander Roosendaal
|
0bb672b7c3
|
Merge tag 'v4.20' into develop
added secure_url to image tag
|
2017-10-10 08:30:51 +02:00 |
|
Sander Roosendaal
|
357e077194
|
Merge branch 'hotfix/v4.20'
|
2017-10-10 08:30:25 +02:00 |
|
Sander Roosendaal
|
0e3d9b71ff
|
added secure_url to og_image
|
2017-10-10 08:29:19 +02:00 |
|
Sander Roosendaal
|
ebc2ccebe6
|
Merge tag 'v4.19' into develop
bug fix FB sharing
|
2017-10-10 08:11:11 +02:00 |
|
Sander Roosendaal
|
b6082f2716
|
Merge branch 'hotfix/v4.19'
|
2017-10-10 08:10:11 +02:00 |
|
Sander Roosendaal
|
1237e6999e
|
bug fixes and a few cosmetic changes
|
2017-10-10 08:07:32 +02:00 |
|
Sander Roosendaal
|
2befa3bc85
|
Merge tag 'v4.18' into develop
added social sharing
|
2017-10-09 21:40:51 +02:00 |
|
Sander Roosendaal
|
6774c5c74d
|
Merge branch 'release/v4.18'
|
2017-10-09 21:40:24 +02:00 |
|
Sander Roosendaal
|
ebb10e9465
|
moving share buttons to the right
|
2017-10-09 15:35:20 +02:00 |
|
Sander Roosendaal
|
862df21d2a
|
added rowingdata tag to tweets
|
2017-10-09 12:06:11 +02:00 |
|
Sander Roosendaal
|
901c8fa286
|
Merge branch 'feature/socialshare' into develop
|
2017-10-09 11:19:36 +02:00 |
|
Sander Roosendaal
|
afe1640b45
|
added twitter follow button
|
2017-10-09 11:18:15 +02:00 |
|
Sander Roosendaal
|
1c137a6852
|
added FB and Twitter share buttons
|
2017-10-09 11:07:29 +02:00 |
|