sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Commit Graph

  • 1f39a05c08 Merge branch 'release/v5.23' Sander Roosendaal 2017-12-01 12:04:59 +01:00
  • 519effd8c2 bug fix Sander Roosendaal 2017-12-01 09:56:15 +01:00
  • b0ca9418e5 corrected typo in advanced page title Sander Roosendaal 2017-11-30 11:31:39 +01:00
  • b649650f33 Merge tag 'v5.22' into develop Sander Roosendaal 2017-11-29 16:02:42 +01:00
  • 2052e90034 Merge branch 'release/v5.22' Sander Roosendaal 2017-11-29 16:00:33 +01:00
  • 6e15c6f715 Merge branch 'feature/additionalmetrics' into develop Sander Roosendaal 2017-11-29 15:43:04 +01:00
  • a80df03d60 additional metrics are available in flex chart Sander Roosendaal 2017-11-29 13:26:29 +01:00
  • 4e5b661923 first bit of plotting extra metrics Sander Roosendaal 2017-11-28 23:12:32 +01:00
  • 79d20bb860 added warning message in config.yaml Sander Roosendaal 2017-11-28 13:50:43 +01:00
  • 69ae507618 Merge tag 'v5.21' into develop Sander Roosendaal 2017-11-28 10:19:19 +01:00
  • fe64a6df21 Merge branch 'hotfix/v5.21' Sander Roosendaal 2017-11-28 10:18:07 +01:00
  • 91a6b0f261 bug fix upload empty file name Sander Roosendaal 2017-11-28 10:15:57 +01:00
  • bfb3d64792 Merge tag 'v5.20' into develop Sander Roosendaal 2017-11-27 22:14:25 +01:00
  • d8f4a3b49c Merge branch 'release/v5.20' Sander Roosendaal 2017-11-27 22:13:51 +01:00
  • e7a192ddc0 added link to power curve on advanced erg Sander Roosendaal 2017-11-27 22:12:04 +01:00
  • 86faa3a681 Merge tag 'v5.19' into develop Sander Roosendaal 2017-11-27 22:05:59 +01:00
  • eb16f2bd61 Merge branch 'release/v5.19' Sander Roosendaal 2017-11-27 22:05:19 +01:00
  • 6012463a4d power curve Sander Roosendaal 2017-11-27 22:01:12 +01:00
  • d155d6250d Merge tag 'v5.18' into develop Sander Roosendaal 2017-11-27 21:01:38 +01:00
  • 0af9a4e2fc Merge branch 'release/v5.18' Sander Roosendaal 2017-11-27 21:00:46 +01:00
  • fd8076b161 Merge branch 'feature/accelerationcurves' into develop Sander Roosendaal 2017-11-27 20:47:51 +01:00
  • 8ef65bcea5 moved site_url to config.yaml Sander Roosendaal 2017-11-27 20:41:35 +01:00
  • 60ac117fb4 added static plot of in stroke from geeky page Sander Roosendaal 2017-11-27 18:14:40 +01:00
  • dddbcad037 changed reading of non painsled to get better data Sander Roosendaal 2017-11-27 10:39:15 +01:00
  • cf8d15cdca Merge tag 'v5.17' into develop Sander Roosendaal 2017-11-26 20:50:26 +01:00
  • 782fce87bf Merge branch 'release/v5.17' Sander Roosendaal 2017-11-26 20:49:56 +01:00
  • ee88de09fc restored settings.py Sander Roosendaal 2017-11-26 20:15:28 +01:00
  • 8b565d9057 Merge tag 'v5.16' into develop Sander Roosendaal 2017-11-26 20:08:08 +01:00
  • 2ff4347f65 Merge branch 'hotfix/v5.16' Sander Roosendaal 2017-11-26 20:07:35 +01:00
  • 4a9447991b dev test Sander Roosendaal 2017-11-26 20:05:27 +01:00
  • 7fc5c8f35a Merge tag 'v5.15' into develop Sander Roosendaal 2017-11-26 19:34:48 +01:00
  • 8a4ddcb6d5 Merge branch 'hotfix/v5.15' Sander Roosendaal 2017-11-26 19:34:08 +01:00
  • 6dd8dc06fc team model change for dev Sander Roosendaal 2017-11-26 19:32:16 +01:00
  • 37430488ec Merge tag 'v5.14' into develop Sander Roosendaal 2017-11-26 19:15:33 +01:00
  • dcd4ddc705 Merge branch 'hotfix/v5.14' Sander Roosendaal 2017-11-26 19:15:07 +01:00
  • 33af6176a3 bug fix Sander Roosendaal 2017-11-26 18:09:32 +01:00
  • 7c4010e162 Merge tag 'v5.13' into develop Sander Roosendaal 2017-11-26 15:48:08 +01:00
  • c2fc846530 Merge branch 'hotfix/v5.13' Sander Roosendaal 2017-11-26 15:47:28 +01:00
  • e40a943705 fix join Sander Roosendaal 2017-11-26 15:45:27 +01:00
  • d2d6a62d9d Merge tag 'v5.12' into develop Sander Roosendaal 2017-11-26 09:37:13 +01:00
  • 36cabd5fb0 Merge branch 'release/v5.12' Sander Roosendaal 2017-11-26 09:17:52 +01:00
  • ec3a9700a5 inheritance in gluing Sander Roosendaal 2017-11-26 08:32:47 +01:00
  • 0a98e3c27c Merge tag 'v5.11' into develop Sander Roosendaal 2017-11-24 10:39:30 +01:00
  • d0bae1f440 Merge branch 'release/v5.11' Sander Roosendaal 2017-11-24 10:39:00 +01:00
  • e9289dbaa6 Merge branch 'feature/glue' into develop Sander Roosendaal 2017-11-24 09:42:14 +01:00
  • 79c3b86034 added glue to templates Sander Roosendaal 2017-11-24 09:41:01 +01:00
  • b1c642c968 join works Sander Roosendaal 2017-11-23 17:19:17 +01:00
  • fbdf017676 bug fixes Sander Roosendaal 2017-11-23 10:08:33 +01:00
  • 618e64579c join working but needs improvement (form with title) Sander Roosendaal 2017-11-22 18:06:45 +01:00
  • 6a76ba05fa email processing looking for Quiske in first line Sander Roosendaal 2017-11-22 09:14:19 +01:00
  • b97db946af Merge tag 'v5.10' into develop Sander Roosendaal 2017-11-20 09:36:53 +01:00
  • b61e1348c4 Merge branch 'release/v5.10' Sander Roosendaal 2017-11-20 09:36:00 +01:00
  • fa84ca0ada Merge branch 'feature/manualranking' into develop Sander Roosendaal 2017-11-18 17:44:16 -07:00
  • ec287cc4b5 manually adding ranking pieces works Sander Roosendaal 2017-11-18 17:38:01 -07:00
  • b21c0c122f manual workout form - datetime is 48 years off Sander Roosendaal 2017-11-18 17:03:18 -07:00
  • 0f88d004b1 adds distance pieces to OTE ranking piece (PRO) Sander Roosendaal 2017-11-18 15:45:51 -07:00
  • d0ebf56cef Merge tag 'v5.09' into develop Sander Roosendaal 2017-11-17 05:31:42 -07:00
  • 665b7f7688 Merge branch 'release/v5.09' Sander Roosendaal 2017-11-17 05:31:28 -07:00
  • ebc7ff7e8a fixes bug in import all Sander Roosendaal 2017-11-16 08:00:45 -06:00
  • c3ad8a8500 solving issue #232 and #234 Sander Roosendaal 2017-11-15 20:05:14 -06:00
  • 7e02f4ab37 Merge tag 'v5.07' into develop Sander Roosendaal 2017-11-14 21:55:11 -06:00
  • 7e8032744f Merge branch 'release/v5.07' Sander Roosendaal 2017-11-14 21:53:02 -06:00
  • ffd2abc815 imports more than 50 workouts from C2 Sander Roosendaal 2017-11-14 21:49:53 -06:00
  • 8f3c59fa2f Merge tag 'v5.06' into develop Sander Roosendaal 2017-11-14 00:59:11 +01:00
  • 343a64c794 Merge branch 'release/v5.06' Sander Roosendaal 2017-11-14 00:56:45 +01:00
  • 14a10becf1 some bug fixes Sander Roosendaal 2017-11-13 14:51:28 +01:00
  • f1bed2ec4f Merge tag 'v5.05' into develop Sander Roosendaal 2017-11-10 14:17:33 +01:00
  • 0028b93f30 Merge branch 'release/v5.05' Sander Roosendaal 2017-11-10 14:17:18 +01:00
  • 9e636ccd67 more robust for parser errors Sander Roosendaal 2017-11-10 14:10:42 +01:00
  • bb77efb6fc bug fix javascript upload Sander Roosendaal 2017-11-10 13:56:04 +01:00
  • 92e49fe468 Merge branch 'bugfix/emails' into develop Sander Roosendaal 2017-11-10 13:23:58 +01:00
  • ec4e756e50 type correction Sander Roosendaal 2017-11-10 12:54:29 +01:00
  • 4f34668c27 tests if message encoded Sander Roosendaal 2017-11-10 11:53:08 +01:00
  • d19ddec79e some fixes email processing Sander Roosendaal 2017-11-10 11:40:47 +01:00
  • 768d1540e6 Merge tag 'v5.04' into develop Sander Roosendaal 2017-11-08 15:28:06 +01:00
  • 23ff227096 Merge branch 'release/v5.04' Sander Roosendaal 2017-11-08 15:27:49 +01:00
  • 7acc41fa6f small refinement upload Sander Roosendaal 2017-11-08 15:16:05 +01:00
  • 29b93a00fd Merge tag 'v5.03' into develop Sander Roosendaal 2017-11-08 14:23:22 +01:00
  • 009ed6db13 Merge branch 'release/v5.03' Sander Roosendaal 2017-11-08 14:22:40 +01:00
  • c9b3c03efb http to https on ajax libraries Sander Roosendaal 2017-11-08 14:21:59 +01:00
  • 5f9292c04c Merge tag 'v5.02' into develop Sander Roosendaal 2017-11-08 13:53:27 +01:00
  • a5e535c291 Merge branch 'release/v5.02' Sander Roosendaal 2017-11-08 13:53:09 +01:00
  • 9f96a875d2 better numbering for zip file content Sander Roosendaal 2017-11-08 13:33:25 +01:00
  • 1489e9c47a checks email for uniqueness upon change Sander Roosendaal 2017-11-08 13:19:25 +01:00
  • a5c34c85d1 Merge branch 'feature/betteremailbody' into develop Sander Roosendaal 2017-11-08 11:42:00 +01:00
  • cc9a004e92 fix Sander Roosendaal 2017-11-08 11:41:30 +01:00
  • 7e0e8dcfea added watermark to drag area Sander Roosendaal 2017-11-08 10:20:45 +01:00
  • a8eae5911d upload options work in background upload Sander Roosendaal 2017-11-08 09:22:15 +01:00
  • 70b5529029 alternative natural language for plot,sync,privacy Sander Roosendaal 2017-11-07 22:21:01 +01:00
  • 518c7fd999 Merge branch 'develop' into feature/betteremailbody Sander Roosendaal 2017-11-07 21:16:35 +01:00
  • e7926811d3 Merge tag 'v5.01' into develop Sander Roosendaal 2017-11-07 21:09:41 +01:00
  • a696f8a155 Merge branch 'hotfix/v5.01' Sander Roosendaal 2017-11-07 21:08:50 +01:00
  • 4d50a53ee4 upload page tested on various browers Sander Roosendaal 2017-11-07 21:04:06 +01:00
  • 5061cbcd1c work in progress: now has alternative way to find chart settings Sander Roosendaal 2017-11-07 17:00:18 +01:00
  • 9561245756 zip file now with enumerated workout title Sander Roosendaal 2017-11-07 16:09:37 +01:00
  • ae3ce88baf Merge tag 'v5.00' into develop Sander Roosendaal 2017-11-07 15:20:34 +01:00
  • 2d3d5dfdbe Merge branch 'release/v5.00' Sander Roosendaal 2017-11-07 15:20:04 +01:00
  • b53201be4c last minute bug fix Sander Roosendaal 2017-11-07 15:10:28 +01:00
  • 75a195394a Merge branch 'feature/ziphandle' into develop Sander Roosendaal 2017-11-07 13:01:52 +01:00
  • e22e084552 adds testing of email Sander Roosendaal 2017-11-07 12:56:10 +01:00