Private
Public Access
1
0
Commit Graph

229 Commits

Author SHA1 Message Date
Sander Roosendaal
ed6790387b tasks gzipped 2016-12-08 21:54:20 +01:00
Sander Roosendaal
2bff507c2d gzipped 2016-12-08 21:50:49 +01:00
Sander Roosendaal
7817de6f3d Merge branch 'release/maxify' 2016-12-08 17:58:42 +01:00
Sander Roosendaal
c1f8d0059d Switched off minify 2016-12-08 17:55:59 +01:00
Sander Roosendaal
6dadf99d7a Merge tag 'bgchecks' into develop
Background checks 1.0
2016-12-08 17:06:29 +01:00
Sander Roosendaal
8691450e78 Merge branch 'release/bgchecks' 2016-12-08 17:06:15 +01:00
Sander Roosendaal
09d6d92cbb repair stroke data 2016-12-08 17:02:06 +01:00
Sander Roosendaal
28d2664f38 minification of html 2016-12-08 15:45:10 +01:00
Sander Roosendaal
ee7f22876d Merge tag 'favoritemanager' into develop
FavoriteCharts 1.3
2016-12-08 12:06:09 +01:00
Sander Roosendaal
66ef493605 Merge branch 'hotfix/favoritemanager' 2016-12-08 12:05:55 +01:00
Sander Roosendaal
044393d8a6 bugfix manager fav charts 2016-12-08 12:05:19 +01:00
Sander Roosendaal
391c339de8 Merge tag 'favoritecharts1.2' into develop
FavoriteCharts 1.2
2016-12-08 11:59:25 +01:00
Sander Roosendaal
8d3ce97fc8 Merge branch 'release/favoritecharts1.2' 2016-12-08 11:59:03 +01:00
Sander Roosendaal
7dfff7e3df added reststrokes to favoritechart settings 2016-12-08 11:50:58 +01:00
Sander Roosendaal
92cb0ca0cb Merge tag 'favoritecharts2' into develop
FavoriteChart 1.1
2016-12-07 21:48:00 +01:00
Sander Roosendaal
762f85a21f Merge branch 'release/favoritecharts2' 2016-12-07 21:47:37 +01:00
Sander Roosendaal
4695dad489 FavoriteCharts update 2016-12-07 21:43:16 +01:00
Sander Roosendaal
83a2080062 Merge tag 'favoritecharts' into develop
FavoriteCharts 1.0
2016-12-07 21:29:21 +01:00
Sander Roosendaal
768dba33d2 Merge branch 'release/favoritecharts' 2016-12-07 21:28:41 +01:00
Sander Roosendaal
923e33990d Updated about page 2016-12-07 21:25:42 +01:00
Sander Roosendaal
313aa327f8 Merge branch 'feature/favoritecharts' into develop 2016-12-07 21:23:07 +01:00
Sander Roosendaal
49be534e95 Favoritecharts 2016-12-07 21:22:30 +01:00
Sander Roosendaal
7122540bad empower axis minima maxima 2016-12-07 20:45:29 +01:00
Sander Roosendaal
25191f28b8 3 columns of fav charts 2016-12-07 18:39:43 +01:00
Sander Roosendaal
f4fe519a49 Merge branch 'develop' into feature/favoritecharts 2016-12-07 18:35:52 +01:00
Sander Roosendaal
861c7055ad Fixed interactive_chart 2016-12-07 18:21:08 +01:00
Sander Roosendaal
84c3b7e175 added OTW and workouttype to favoritechart model 2016-12-07 18:12:38 +01:00
Sander Roosendaal
bfc05a7de6 favorites on ote flex - need to do otw flex 2016-12-06 17:45:05 +01:00
Sander Roosendaal
bd4f9cbe4c nothing 2016-12-06 13:35:35 +01:00
Sander Roosendaal
c50bcc2938 checked fpace/ftime on customJS 2016-12-06 12:33:40 +01:00
Sander Roosendaal
9f39ae596f Bug fix for small rows (low nr of strokes) 2016-12-05 12:43:45 +01:00
Sander Roosendaal
10ea7f5dc3 Merge tag 'callouts' into develop
Callouts hotfix (pace only)
2016-12-04 17:27:45 +01:00
Sander Roosendaal
3aa112265b Merge branch 'hotfix/callouts' 2016-12-04 17:27:05 +01:00
Sander Roosendaal
22c69653de Callouts hotfix on flexchart (pace only) 2016-12-04 17:26:19 +01:00
Sander Roosendaal
2364c06c1f interactive_chart reads only 3 columns now 2016-12-04 14:54:30 +01:00
Sander Roosendaal
73a086136d Merge tag 'moreefficient' into develop
Added sort to flexchart
2016-12-04 14:38:02 +01:00
Sander Roosendaal
f67a8d0466 Merge branch 'release/moreefficient' 2016-12-04 14:37:48 +01:00
Sander Roosendaal
a636ed198e Sort / use limited nr of columns on flexchart SQL query 2016-12-04 14:29:19 +01:00
Sander Roosendaal
4f70c57f5f Merge tag 'workoutform' into develop
Bug fix workout form
2016-12-04 13:47:54 +01:00
Sander Roosendaal
0b124108bc Merge branch 'hotfix/workoutform' 2016-12-04 13:46:39 +01:00
Sander Roosendaal
9f8869f0a0 Added workout form test + fixed strokedata update bug 2016-12-04 13:44:39 +01:00
Sander Roosendaal
54c9b521ea Merge tag 'togglestrokes' into develop
togglestrokes hotfix
2016-12-03 08:58:56 +01:00
Sander Roosendaal
5fb7285fdc Merge branch 'hotfix/togglestrokes' 2016-12-03 08:58:43 +01:00
Sander Roosendaal
c4cf0a9afb togglestrokes hotfix 2016-12-03 08:57:56 +01:00
Sander Roosendaal
0b1df3a535 Merge tag 'datums' into develop
datums
2016-12-02 19:39:49 +01:00
Sander Roosendaal
57bb03c81f Merge branch 'release/datums' 2016-12-02 19:39:33 +01:00
Sander Roosendaal
afdf9a93a4 Datums 2016-12-02 19:38:10 +01:00
Sander Roosendaal
22ba557626 Merge tag 'bugfixx' into develop
bugfixx
2016-12-01 22:13:44 +01:00
Sander Roosendaal
2c3212bbc3 Merge branch 'release/bugfixx' 2016-12-01 22:13:24 +01:00
Sander Roosendaal
7c40ad3df1 bug fix 2016-12-01 22:12:36 +01:00