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

Commit Graph

  • e849f670ea Merge tag 'v7.02' into develop Sander Roosendaal 2018-06-27 09:30:40 +02:00
  • c776dddc9a Merge branch 'hotfix/v7.02' Sander Roosendaal 2018-06-27 09:30:26 +02:00
  • 301f33e813 hotfix strava auto import Sander Roosendaal 2018-06-27 09:29:44 +02:00
  • 783cc4b08d Merge tag 'v7.01' into develop Sander Roosendaal 2018-06-27 07:53:29 +02:00
  • 852c5c0dfd Merge branch 'release/v7.01' Sander Roosendaal 2018-06-27 07:51:10 +02:00
  • c808573c58 removed old view from views.py Sander Roosendaal 2018-06-26 22:15:40 +02:00
  • ac0fc4a355 updated tests Sander Roosendaal 2018-06-26 22:00:57 +02:00
  • e0dd903d68 further code refactoring Sander Roosendaal 2018-06-26 21:43:57 +02:00
  • cff1626603 trying to refactor import Sander Roosendaal 2018-06-26 21:23:44 +02:00
  • 86a97366a3 underarmour (mapmyfitness) done Sander Roosendaal 2018-06-26 20:22:20 +02:00
  • bc396e62a1 done all except mapmyfitness Sander Roosendaal 2018-06-26 16:01:46 +02:00
  • 39c2c23842 Merge branch 'feature/refactoring' into develop Sander Roosendaal 2018-06-26 13:16:15 +02:00
  • bc173cbd9a changed tests to use NoTokenError Sander Roosendaal 2018-06-26 13:15:31 +02:00
  • 55dd757823 removed some more old notokenerrors Sander Roosendaal 2018-06-26 12:54:27 +02:00
  • 3dc998d623 C2NoTokenError = NoTokenError Sander Roosendaal 2018-06-26 12:50:36 +02:00
  • 586cc2b209 unified all notokenerrors Sander Roosendaal 2018-06-26 12:20:24 +02:00
  • 0152c8d20b removing some duplicate code Sander Roosendaal 2018-06-26 12:14:00 +02:00
  • 2350d5aedf bug fix Sander Roosendaal 2018-06-26 08:07:23 +02:00
  • 8e14d3e87b Merge branch 'feature/autostrava' into develop Sander Roosendaal 2018-06-25 22:22:08 +02:00
  • 8c2c995aab seems to auto import well Sander Roosendaal 2018-06-25 22:08:47 +02:00
  • b313726478 sort of works Sander Roosendaal 2018-06-25 18:59:47 +02:00
  • 90dcb2f4f9 sort of working Sander Roosendaal 2018-06-25 18:42:16 +02:00
  • 1e9caf244c Merge branch 'develop' into feature/autostrava Sander Roosendaal 2018-06-25 17:24:37 +02:00
  • 84cba40065 added workstrokesonly keyword to empower force curve Sander Roosendaal 2018-06-25 12:52:22 +02:00
  • 19ded52e57 missing request info Sander Roosendaal 2018-06-25 11:46:12 +02:00
  • a2c0048ba1 small bug fixes Sander Roosendaal 2018-06-25 10:22:39 +02:00
  • ddab8080fb Merge tag 'v7.00' into develop Sander Roosendaal 2018-06-22 17:25:11 +02:00
  • 9ddd6e6b7f Merge branch 'release/v7.00' Sander Roosendaal 2018-06-22 17:24:52 +02:00
  • 6e73ab2d69 bug fix interval coloring Sander Roosendaal 2018-06-22 17:02:51 +02:00
  • 80cbcb9512 not working yet, need to complete in tasks.py Sander Roosendaal 2018-06-22 16:45:19 +02:00
  • 486f47bbb4 Merge branch 'feature/autoc2import' into develop Sander Roosendaal 2018-06-22 14:42:08 +02:00
  • 82ad2d90db concept2 auto import Sander Roosendaal 2018-06-22 14:40:49 +02:00
  • c7c7199a7b added ritmo time logo Sander Roosendaal 2018-06-22 12:50:34 +02:00
  • aad5020723 Merge tag 'v6.99' into develop Sander Roosendaal 2018-06-21 21:58:20 +02:00
  • 0852401a60 Merge branch 'hotfix/v6.99' Sander Roosendaal 2018-06-21 21:57:31 +02:00
  • 40a4774178 bug fix Sander Roosendaal 2018-06-21 21:56:26 +02:00
  • d19029cb0b Merge tag 'v6.98' into develop Sander Roosendaal 2018-06-21 21:25:05 +02:00
  • 3f44f0e8df Merge branch 'release/v6.98' Sander Roosendaal 2018-06-21 21:23:21 +02:00
  • 7482c6e9e3 improved pop ups Sander Roosendaal 2018-06-21 21:18:51 +02:00
  • e17e5f5a86 adding drive energy Sander Roosendaal 2018-06-21 18:52:23 +02:00
  • 9661bb2124 solving issue #331 Sander Roosendaal 2018-06-21 18:13:04 +02:00
  • 172ea9e974 Merge tag 'v6.97' into develop Sander Roosendaal 2018-06-21 14:18:37 +02:00
  • dfe7658e6a Merge branch 'hotfix/v6.97' Sander Roosendaal 2018-06-21 14:18:20 +02:00
  • 29972188fd changed color to violet and fixed bug Sander Roosendaal 2018-06-21 14:17:23 +02:00
  • 127bac8c8f Merge tag 'v6.96' into develop Sander Roosendaal 2018-06-21 13:57:43 +02:00
  • 8fa5221251 Merge branch 'release/v6.96' Sander Roosendaal 2018-06-21 13:57:29 +02:00
  • a794b96bdf error correction Sander Roosendaal 2018-06-21 13:56:28 +02:00
  • 19faa93877 Merge tag 'v6.95' into develop Sander Roosendaal 2018-06-21 13:51:18 +02:00
  • b718d5c47f Merge branch 'release/v6.95' Sander Roosendaal 2018-06-21 13:50:39 +02:00
  • adbb91dddd localization off in summary_edit Sander Roosendaal 2018-06-21 13:47:58 +02:00
  • 67b9879f7f code reuse Sander Roosendaal 2018-06-21 11:07:39 +02:00
  • a8ca762ee9 ritmotime implemented Sander Roosendaal 2018-06-20 20:30:01 +02:00
  • 4ec6dd2a4e Merge branch 'feature/intervals' into develop Sander Roosendaal 2018-06-20 15:46:56 +02:00
  • ddc8d08c3f coloring pink Sander Roosendaal 2018-06-20 15:44:01 +02:00
  • d7b7b0b6d4 graying out the intervals Sander Roosendaal 2018-06-19 22:17:36 +02:00
  • 12bb31553b small bug fixes Sander Roosendaal 2018-06-18 14:07:42 +02:00
  • 77e52ac9c1 fxed submission with teams Sander Roosendaal 2018-06-18 12:30:56 +02:00
  • 521aa945fd Merge tag 'v6.94' into develop Sander Roosendaal 2018-06-15 08:12:59 +02:00
  • 9e8e93e638 Merge branch 'release/v6.94' Sander Roosendaal 2018-06-15 08:12:44 +02:00
  • 3997b0ac08 bugfix & save data to strokedata table Sander Roosendaal 2018-06-15 07:52:44 +02:00
  • d89cb831f1 Merge tag 'v6.93' into develop Sander Roosendaal 2018-06-14 21:16:05 +02:00
  • 29974633e3 Merge branch 'release/v6.93' Sander Roosendaal 2018-06-14 21:15:35 +02:00
  • fe9d29a465 split smooth interval back to 15 sec Sander Roosendaal 2018-06-14 21:13:21 +02:00
  • 93696cfb62 enlarged smooth window Sander Roosendaal 2018-06-14 16:50:38 +02:00
  • 2d7f2af364 Merge tag 'v6.92' into develop Sander Roosendaal 2018-06-14 13:16:57 +02:00
  • 60046efc39 Merge branch 'release/v6.92' Sander Roosendaal 2018-06-14 13:14:39 +02:00
  • 72be79d932 Merge branch 'bugfix/power' into develop Sander Roosendaal 2018-06-14 12:33:30 +02:00
  • e3f6cf0e3f better value for normv Sander Roosendaal 2018-06-14 11:45:41 +02:00
  • b1a8e84bd5 improved form processing in summary edit Sander Roosendaal 2018-06-14 11:38:00 +02:00
  • a14517154c Merge branch 'feature/useradmin' into develop Sander Roosendaal 2018-06-14 10:33:59 +02:00
  • c1cb399ed0 tried to customize password_reset.html Sander Roosendaal 2018-06-14 10:33:18 +02:00
  • 3bbc014c42 user admin better organized Sander Roosendaal 2018-06-14 08:35:52 +02:00
  • c8d1eb4be4 Merge tag 'v6.91' into develop Sander Roosendaal 2018-06-13 21:45:56 +02:00
  • 061fe8a997 Merge branch 'release/v6.91' Sander Roosendaal 2018-06-13 21:45:40 +02:00
  • 973195c93b Merge branch 'feature/powerintervals' into develop Sander Roosendaal 2018-06-13 21:15:41 +02:00
  • f9167c1b88 changes Sander Roosendaal 2018-06-13 21:14:33 +02:00
  • 48632841da Merge tag 'v6.90' into develop Sander Roosendaal 2018-06-12 20:56:06 +02:00
  • e30e639048 Merge branch 'release/v6.90' Sander Roosendaal 2018-06-12 20:54:22 +02:00
  • 8a9984a24d making rankingonly sticky Sander Roosendaal 2018-06-12 20:53:28 +02:00
  • c6038dce4d make rankingpiece sticky Sander Roosendaal 2018-06-12 20:13:54 +02:00
  • 37f28f9544 Merge tag 'v6.89' into develop Sander Roosendaal 2018-06-12 20:04:28 +02:00
  • 06d098c589 Merge branch 'hotfix/v6.89' Sander Roosendaal 2018-06-12 20:04:14 +02:00
  • eab60762b6 hotfix flexall data Sander Roosendaal 2018-06-12 20:02:21 +02:00
  • 91972a73c9 Merge tag 'v6.88' into develop Sander Roosendaal 2018-06-12 16:05:00 +02:00
  • cab5216354 Merge branch 'release/v6.88' Sander Roosendaal 2018-06-12 15:30:26 +02:00
  • 31627c3e86 can now register in one boat class/type with M/F and mixed Sander Roosendaal 2018-06-12 12:21:53 +02:00
  • 7d6f8c5981 bug fix Sander Roosendaal 2018-06-11 15:29:25 +02:00
  • 634e191d65 form in place, not working yet Sander Roosendaal 2018-06-11 15:26:14 +02:00
  • a6a564559c added ranking only options Sander Roosendaal 2018-06-08 13:55:38 +02:00
  • 85ebdd3ba0 removed filter form if no results Sander Roosendaal 2018-06-08 11:40:34 +02:00
  • 9303c0cc67 Merge branch 'feature/betterfilter' into develop Sander Roosendaal 2018-06-08 10:56:40 +02:00
  • 8d580a3ae8 bug fix Sander Roosendaal 2018-06-08 10:55:49 +02:00
  • cd3ee722e2 improved filter form Sander Roosendaal 2018-06-08 10:44:42 +02:00
  • 5603235f56 Merge tag 'v6.87' into develop Sander Roosendaal 2018-06-08 09:41:42 +02:00
  • 3d75545495 Merge branch 'release/v6.87' Sander Roosendaal 2018-06-08 09:39:12 +02:00
  • 15f489e086 bug fixes Sander Roosendaal 2018-06-08 09:35:11 +02:00
  • dcb207fb20 improved workout edit form Sander Roosendaal 2018-06-08 09:08:58 +02:00
  • 229145679a improved workout edit form Sander Roosendaal 2018-06-08 08:47:55 +02:00
  • 358913f250 Merge tag 'v6.86' into develop Sander Roosendaal 2018-06-07 22:18:39 +02:00
  • 175af6483e Merge branch 'release/v6.86' Sander Roosendaal 2018-06-07 22:18:17 +02:00