Private
Public Access
1
0
Commit Graph

1783 Commits

Author SHA1 Message Date
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
Sander Roosendaal
5b5c5c68a9 added ranking piece only button 2017-10-09 09:32:52 +02:00
Sander Roosendaal
e1c1bbee68 Merge tag 'v4.17' into develop
bugfix share a chart
2017-10-08 13:08:14 +02:00
Sander Roosendaal
764b90b9f0 Merge branch 'release/v4.17' 2017-10-08 13:07:51 +02:00
Sander Roosendaal
737a59969c bugfix share a chart 2017-10-08 13:05:27 +02:00
Sander Roosendaal
edb3cdbe2e Merge tag 'v4.16' into develop
share a chart
2017-10-08 12:52:31 +02:00
Sander Roosendaal
f980c97bbf Merge branch 'release/v4.16' 2017-10-08 12:52:08 +02:00
Sander Roosendaal
739f0889f6 share a graph facebook 2017-10-08 12:45:37 +02:00
Sander Roosendaal
c4ba492c51 Merge tag 'v4.15' into develop
bugfix static chart should be Free feature
2017-10-08 12:16:43 +02:00
Sander Roosendaal
b60d4c0862 Merge branch 'hotfix/v4.15' 2017-10-08 12:13:55 +02:00
Sander Roosendaal
5c6d82cf07 fixed bug - static charts were Pro by mistake 2017-10-08 12:12:22 +02:00
Sander Roosendaal
508bd7d349 Merge tag 'v4.14' into develop
bug fix og:image tag
2017-10-06 15:44:23 +02:00
Sander Roosendaal
f612a3d161 Merge branch 'release/v4.14' 2017-10-06 15:43:58 +02:00
Sander Roosendaal
362d6f0c18 bug fix og:image 2017-10-06 15:41:30 +02:00
Sander Roosendaal
075f90fb00 Merge tag 'v4.13' into develop
added og tags for facebook links
2017-10-06 15:27:37 +02:00
Sander Roosendaal
6762a6d567 Merge branch 'release/v4.13' 2017-10-06 15:25:51 +02:00
Sander Roosendaal
55eeed949e added og meta tags for facebook 2017-10-06 15:21:29 +02:00
Sander Roosendaal
11d1703c14 Merge tag 'v4.12' into develop
meta data improvements
2017-10-06 10:02:43 +02:00
Sander Roosendaal
69b234d3e7 Merge branch 'release/v4.12' 2017-10-06 09:57:28 +02:00
Sander Roosendaal
9b4ed44c49 added page title and facebook image info 2017-10-06 09:28:45 +02:00
Sander Roosendaal
9937adbf9c Merge tag 'v4.11' into develop
improved email commands
2017-09-27 09:16:40 +02:00
Sander Roosendaal
3a7b94bb1b Merge branch 'release/v4.11' 2017-09-27 09:15:59 +02:00
Sander Roosendaal
ebce342fce slight improvements in email command parsing 2017-09-27 09:03:16 +02:00
Sander Roosendaal
8bff1dae59 Merge tag 'v4.10' into develop
additional paypal button
2017-09-26 20:44:22 +02:00