Private
Public Access
1
0

Commit Graph

  • c15ece930a Merge tag 'newusers' into develop Sander Roosendaal 2016-12-16 13:28:24 +01:00
  • d711aa76ae Merge branch 'release/newusers' Sander Roosendaal 2016-12-16 13:28:07 +01:00
  • 15c8954b18 Merge branch 'feature/videoredirect' into develop Sander Roosendaal 2016-12-16 13:23:47 +01:00
  • cdb843a7b9 settings Sander Roosendaal 2016-12-16 13:23:10 +01:00
  • 1938506735 added notes to example workout Sander Roosendaal 2016-12-16 13:21:16 +01:00
  • 125e0a72b9 Thank you page + example workout Sander Roosendaal 2016-12-16 13:13:59 +01:00
  • 170d0e43a1 permissions Sander Roosendaal 2016-12-14 22:55:23 +01:00
  • b4d7db324e Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-14 17:30:41 +01:00
  • a182988702 data cleaning improvement Sander Roosendaal 2016-12-13 23:07:30 +01:00
  • 7e1cb2ed63 Merge tag 'removefit' into develop Sander Roosendaal 2016-12-13 22:45:13 +01:00
  • 70ea8cd0d1 Merge branch 'release/removefit' Sander Roosendaal 2016-12-13 22:44:49 +01:00
  • eeddccee48 Removed old CSV and fit files Sander Roosendaal 2016-12-13 22:41:12 +01:00
  • 7ea0adf7d1 Merge tag 'footer' into develop Sander Roosendaal 2016-12-13 22:35:36 +01:00
  • 0239b7baab Merge branch 'hotfix/footer' Sander Roosendaal 2016-12-13 22:35:22 +01:00
  • 972f7a2062 Added attributeerror to repairdata Sander Roosendaal 2016-12-13 22:34:48 +01:00
  • 9ea371f4e7 footer Sander Roosendaal 2016-12-13 22:33:01 +01:00
  • d7096bb5fe Merge tag 'repairdatafix' into develop Sander Roosendaal 2016-12-13 22:23:36 +01:00
  • a120e1df43 Merge branch 'release/repairdatafix' Sander Roosendaal 2016-12-13 22:23:21 +01:00
  • 52fec14a32 bug fix repair data Sander Roosendaal 2016-12-13 22:20:29 +01:00
  • 3474901443 Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-13 16:41:14 +01:00
  • b9db637d19 Merge tag 'editmenus' into develop Sander Roosendaal 2016-12-13 15:53:24 +01:00
  • 8db2a2e47a Merge branch 'hotfix/editmenus' Sander Roosendaal 2016-12-13 15:53:12 +01:00
  • b59aeeee14 bug fix edit and adv edit menus Sander Roosendaal 2016-12-13 15:52:21 +01:00
  • 83ee3a0bce Merge branch 'feature/nk-tools' into develop Sander Roosendaal 2016-12-13 11:06:59 +01:00
  • 0e6fac88b5 NK Tools Force Curve Sander Roosendaal 2016-12-13 10:44:02 +01:00
  • 7d0d7a0fd5 added stats for SpeedCoach 2 GPS Sander Roosendaal 2016-12-11 20:33:41 +01:00
  • 62718ea07a Merge tag 'flexbuttons' into develop Sander Roosendaal 2016-12-09 19:54:31 +01:00
  • a1cfcede0f Merge branch 'release/flexbuttons' Sander Roosendaal 2016-12-09 19:54:17 +01:00
  • e5cb8b856d Flex buttons on workouts list Sander Roosendaal 2016-12-09 19:49:18 +01:00
  • 52dcd6b24c Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-09 08:35:13 +01:00
  • 14e67a07eb Merge tag 'gzip-csvmail' into develop Sander Roosendaal 2016-12-09 08:11:04 +01:00
  • 73a362f067 Merge branch 'hotfix/gzip-csvmail' Sander Roosendaal 2016-12-09 08:10:49 +01:00
  • 2e21979e73 Bug fix Sander Roosendaal 2016-12-09 08:10:20 +01:00
  • 1efeeee6fe Merge tag 'gzip-orphans' into develop Sander Roosendaal 2016-12-09 08:05:40 +01:00
  • 19ed5021b5 Merge branch 'release/gzip-orphans' Sander Roosendaal 2016-12-09 08:05:11 +01:00
  • 2b4b2f8f93 CSV file emailing for gzipped Sander Roosendaal 2016-12-09 07:59:10 +01:00
  • 8efd276bb9 Merge tag 'gzipped2' into develop Sander Roosendaal 2016-12-08 23:34:04 +01:00
  • 79004c5fd9 Merge branch 'release/gzipped2' Sander Roosendaal 2016-12-08 23:33:35 +01:00
  • 20c72c651b Merge branch 'feature/gzipped' into develop Sander Roosendaal 2016-12-08 23:28:08 +01:00
  • 0034c1bc88 gzipped Sander Roosendaal 2016-12-08 23:27:19 +01:00
  • 8895f61e73 gzip Sander Roosendaal 2016-12-08 23:07:57 +01:00
  • a37bb03fd8 Merge tag 'gzipped' into develop Sander Roosendaal 2016-12-08 21:55:43 +01:00
  • 00850cd90a Merge branch 'hotfix/gzipped' Sander Roosendaal 2016-12-08 21:55:19 +01:00
  • ed6790387b tasks gzipped Sander Roosendaal 2016-12-08 21:54:20 +01:00
  • 2bff507c2d gzipped Sander Roosendaal 2016-12-08 21:50:49 +01:00
  • d71723159b Gzipped Sander Roosendaal 2016-12-08 21:35:47 +01:00
  • e292ea8117 Merge tag 'maxify' into develop Sander Roosendaal 2016-12-08 17:59:10 +01:00
  • 7817de6f3d Merge branch 'release/maxify' Sander Roosendaal 2016-12-08 17:58:42 +01:00
  • c1f8d0059d Switched off minify Sander Roosendaal 2016-12-08 17:55:59 +01:00
  • 6dadf99d7a Merge tag 'bgchecks' into develop Sander Roosendaal 2016-12-08 17:06:29 +01:00
  • 8691450e78 Merge branch 'release/bgchecks' Sander Roosendaal 2016-12-08 17:06:15 +01:00
  • 09d6d92cbb repair stroke data Sander Roosendaal 2016-12-08 17:02:06 +01:00
  • 5708aebf1e Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-08 16:02:58 +01:00
  • 28d2664f38 minification of html Sander Roosendaal 2016-12-08 15:45:10 +01:00
  • ee7f22876d Merge tag 'favoritemanager' into develop Sander Roosendaal 2016-12-08 12:06:09 +01:00
  • 66ef493605 Merge branch 'hotfix/favoritemanager' Sander Roosendaal 2016-12-08 12:05:55 +01:00
  • 044393d8a6 bugfix manager fav charts Sander Roosendaal 2016-12-08 12:05:19 +01:00
  • 21dbc43947 Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-08 11:59:43 +01:00
  • 391c339de8 Merge tag 'favoritecharts1.2' into develop Sander Roosendaal 2016-12-08 11:59:25 +01:00
  • 8d3ce97fc8 Merge branch 'release/favoritecharts1.2' Sander Roosendaal 2016-12-08 11:59:03 +01:00
  • 7dfff7e3df added reststrokes to favoritechart settings Sander Roosendaal 2016-12-08 11:50:58 +01:00
  • 92cb0ca0cb Merge tag 'favoritecharts2' into develop Sander Roosendaal 2016-12-07 21:48:00 +01:00
  • 762f85a21f Merge branch 'release/favoritecharts2' Sander Roosendaal 2016-12-07 21:47:37 +01:00
  • 4695dad489 FavoriteCharts update Sander Roosendaal 2016-12-07 21:43:16 +01:00
  • 83a2080062 Merge tag 'favoritecharts' into develop Sander Roosendaal 2016-12-07 21:29:21 +01:00
  • 768dba33d2 Merge branch 'release/favoritecharts' Sander Roosendaal 2016-12-07 21:28:41 +01:00
  • 923e33990d Updated about page Sander Roosendaal 2016-12-07 21:25:42 +01:00
  • 313aa327f8 Merge branch 'feature/favoritecharts' into develop Sander Roosendaal 2016-12-07 21:23:07 +01:00
  • 49be534e95 Favoritecharts Sander Roosendaal 2016-12-07 21:22:30 +01:00
  • 7122540bad empower axis minima maxima Sander Roosendaal 2016-12-07 20:45:29 +01:00
  • 25191f28b8 3 columns of fav charts Sander Roosendaal 2016-12-07 18:39:43 +01:00
  • f4fe519a49 Merge branch 'develop' into feature/favoritecharts Sander Roosendaal 2016-12-07 18:35:52 +01:00
  • 861c7055ad Fixed interactive_chart Sander Roosendaal 2016-12-07 18:21:08 +01:00
  • 84c3b7e175 added OTW and workouttype to favoritechart model Sander Roosendaal 2016-12-07 18:12:38 +01:00
  • bfc05a7de6 favorites on ote flex - need to do otw flex Sander Roosendaal 2016-12-06 17:45:05 +01:00
  • bd4f9cbe4c nothing Sander Roosendaal 2016-12-06 13:35:35 +01:00
  • c50bcc2938 checked fpace/ftime on customJS Sander Roosendaal 2016-12-06 12:33:40 +01:00
  • 9f39ae596f Bug fix for small rows (low nr of strokes) Sander Roosendaal 2016-12-05 12:43:45 +01:00
  • 10ea7f5dc3 Merge tag 'callouts' into develop Sander Roosendaal 2016-12-04 17:27:45 +01:00
  • 3aa112265b Merge branch 'hotfix/callouts' Sander Roosendaal 2016-12-04 17:27:05 +01:00
  • 22c69653de Callouts hotfix on flexchart (pace only) Sander Roosendaal 2016-12-04 17:26:19 +01:00
  • b2802f9285 Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-04 14:55:16 +01:00
  • 2364c06c1f interactive_chart reads only 3 columns now Sander Roosendaal 2016-12-04 14:54:30 +01:00
  • 73a086136d Merge tag 'moreefficient' into develop Sander Roosendaal 2016-12-04 14:38:02 +01:00
  • f67a8d0466 Merge branch 'release/moreefficient' Sander Roosendaal 2016-12-04 14:37:48 +01:00
  • a636ed198e Sort / use limited nr of columns on flexchart SQL query Sander Roosendaal 2016-12-04 14:29:19 +01:00
  • 4f70c57f5f Merge tag 'workoutform' into develop Sander Roosendaal 2016-12-04 13:47:54 +01:00
  • 0b124108bc Merge branch 'hotfix/workoutform' Sander Roosendaal 2016-12-04 13:46:39 +01:00
  • 9f8869f0a0 Added workout form test + fixed strokedata update bug Sander Roosendaal 2016-12-04 13:44:39 +01:00
  • 54c9b521ea Merge tag 'togglestrokes' into develop togglestrokes hotfix Sander Roosendaal 2016-12-03 08:58:56 +01:00
  • 5fb7285fdc Merge branch 'hotfix/togglestrokes' Sander Roosendaal 2016-12-03 08:58:43 +01:00
  • c4cf0a9afb togglestrokes hotfix Sander Roosendaal 2016-12-03 08:57:56 +01:00
  • 769eab2692 Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-02 19:40:49 +01:00
  • 0b1df3a535 Merge tag 'datums' into develop Sander Roosendaal 2016-12-02 19:39:49 +01:00
  • 57bb03c81f Merge branch 'release/datums' Sander Roosendaal 2016-12-02 19:39:33 +01:00
  • afdf9a93a4 Datums Sander Roosendaal 2016-12-02 19:38:10 +01:00
  • f886713639 Merge branch 'develop' into feature/restapi Sander Roosendaal 2016-12-02 09:35:31 +01:00
  • 22ba557626 Merge tag 'bugfixx' into develop Sander Roosendaal 2016-12-01 22:13:44 +01:00
  • 2c3212bbc3 Merge branch 'release/bugfixx' Sander Roosendaal 2016-12-01 22:13:24 +01:00
  • 7c40ad3df1 bug fix Sander Roosendaal 2016-12-01 22:12:36 +01:00