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

Commit Graph

  • aac6094ac3 Merge tag 'v4.66' into develop Sander Roosendaal 2017-10-31 15:08:53 +01:00
  • d36530be70 Merge branch 'release/v4.66' Sander Roosendaal 2017-10-31 15:08:06 +01:00
  • 24482cca8a removed some debug print statements Sander Roosendaal 2017-10-31 14:57:41 +01:00
  • 41f348a70d Merge branch 'feature/autoqueue' into develop Sander Roosendaal 2017-10-31 14:54:41 +01:00
  • 0ecd8c588d debugged some odd behavior Sander Roosendaal 2017-10-31 14:52:52 +01:00
  • 2939accbf2 added myqueue wrapper to teams.py Sander Roosendaal 2017-10-31 11:18:14 +01:00
  • 8c31f5b778 a wrapper around the task queue Sander Roosendaal 2017-10-31 11:12:00 +01:00
  • 092d24d9b2 reload uses timeout Sander Roosendaal 2017-10-31 08:37:47 +01:00
  • 6616fb0ac8 Merge tag 'v4.65' into develop Sander Roosendaal 2017-10-31 07:53:56 +01:00
  • 541c4841ba Merge branch 'hotfix/v4.65' Sander Roosendaal 2017-10-31 07:53:02 +01:00
  • 0949b3cec9 hotfix - check for nan in dataprep windowsize Sander Roosendaal 2017-10-31 07:48:41 +01:00
  • 473c8e39e7 Merge branch 'feature/betterqueues' into develop Sander Roosendaal 2017-10-30 22:35:34 +01:00
  • 98abc68289 with jquery to refresh when tasks are complete Sander Roosendaal 2017-10-30 22:32:34 +01:00
  • 21be4d278b bux fix Sander Roosendaal 2017-10-30 21:22:07 +01:00
  • 5fe6db02dc bug fix Sander Roosendaal 2017-10-30 17:33:58 +01:00
  • 537b7392e6 works on development - needs testing on production Sander Roosendaal 2017-10-30 17:27:13 +01:00
  • c37a0e6b24 Merge tag 'v4.64' into develop Sander Roosendaal 2017-10-29 21:15:50 +01:00
  • cd5daedb39 Merge branch 'release/v4.64' Sander Roosendaal 2017-10-29 21:14:59 +01:00
  • 060e9bc283 Merge branch 'feature/workflowconfig' into develop Sander Roosendaal 2017-10-29 21:06:16 +01:00
  • 40fedbe4c4 bug fix nr of comments on workflow middle panel Sander Roosendaal 2017-10-29 21:04:31 +01:00
  • 13fc8e1fed import now defaults to default landing page Sander Roosendaal 2017-10-29 21:00:40 +01:00
  • 60447b8d30 default landing page toggle button on workflow config Sander Roosendaal 2017-10-29 20:52:24 +01:00
  • 6b793724ed redis monitor for CP update jobs Sander Roosendaal 2017-10-27 11:52:47 +02:00
  • c0f785ed3b Merge tag 'v4.63' into develop Sander Roosendaal 2017-10-26 23:19:26 +02:00
  • 6a898e2211 Merge branch 'hotfix/v4.63' Sander Roosendaal 2017-10-26 23:18:07 +02:00
  • 32efe6b7eb bug fix hopefully Sander Roosendaal 2017-10-26 23:16:15 +02:00
  • ff1696cd43 Merge tag 'v4.62' into develop Sander Roosendaal 2017-10-26 23:01:11 +02:00
  • eccf5f8069 Merge branch 'release/v4.62' Sander Roosendaal 2017-10-26 23:00:44 +02:00
  • 70c8098f11 Merge branch 'feature/altranking' into develop Sander Roosendaal 2017-10-26 22:56:54 +02:00
  • 7152971bfd forgot to save views.py Sander Roosendaal 2017-10-26 22:55:19 +02:00
  • 29243516ae does Alternative OTE ranking Sander Roosendaal 2017-10-26 22:53:02 +02:00
  • 0f5c49de62 slightly improved email processing Sander Roosendaal 2017-10-26 22:15:01 +02:00
  • f13f0a9a7c Merge tag 'v4.61' into develop Sander Roosendaal 2017-10-26 19:10:28 +02:00
  • 5c3186cd83 Merge branch 'hotfix/v4.61' Sander Roosendaal 2017-10-26 19:10:01 +02:00
  • 50a17f97ac bug fix flex chart Sander Roosendaal 2017-10-26 19:08:22 +02:00
  • 94a94a7496 Merge tag 'v4.6' into develop Sander Roosendaal 2017-10-26 18:50:17 +02:00
  • 39ca755c59 Merge branch 'release/v4.6' Sander Roosendaal 2017-10-26 18:49:38 +02:00
  • c5d075487d add 1h15min to ranking Sander Roosendaal 2017-10-26 18:42:19 +02:00
  • a6f1ad6b6d added messaging Sander Roosendaal 2017-10-26 18:25:13 +02:00
  • 7db7d04732 Merge branch 'feature/asynchronousranking' into develop Sander Roosendaal 2017-10-26 18:18:24 +02:00
  • 398f126127 75 minutes is now a ranking distance Sander Roosendaal 2017-10-26 18:16:13 +02:00
  • 0e185f9c2f working, not tested asynchronous OTE ranking Sander Roosendaal 2017-10-26 16:39:02 +02:00
  • 704d7a9128 additional choice (upload another) on upload page Sander Roosendaal 2017-10-26 14:53:46 +02:00
  • 336ccb1c74 show and unshow fav chart notes according user setting Sander Roosendaal 2017-10-25 21:26:40 +02:00
  • 8778ee7106 bug fix in fav chart formset processing Sander Roosendaal 2017-10-25 17:51:31 +02:00
  • 13bb60d8ec adds check if user wants notes on flex chart Sander Roosendaal 2017-10-25 17:46:46 +02:00
  • 6a4eb4583c show Flex Chart notes on Flex Chart page Sander Roosendaal 2017-10-25 17:44:06 +02:00
  • ae520e346f skips CP calculation when OTW workout has no power data Sander Roosendaal 2017-10-25 16:49:38 +02:00
  • 42d9b19a28 removed redundant code Sander Roosendaal 2017-10-25 16:22:36 +02:00
  • 74acd35e7a Offline CP calculations for OTW Sander Roosendaal 2017-10-25 15:17:14 +02:00
  • 470e809ebf Merge tag 'v4.51' into develop Sander Roosendaal 2017-10-25 11:32:54 +02:00
  • 46a962d993 Merge branch 'hotfix/v4.51' Sander Roosendaal 2017-10-25 11:32:30 +02:00
  • e3b5cc1aa8 bug fix, and some additions Sander Roosendaal 2017-10-25 11:29:19 +02:00
  • b64431933a Merge tag 'v4.5' into develop Sander Roosendaal 2017-10-24 15:18:20 +02:00
  • 769179044e Merge branch 'release/v4.5' Sander Roosendaal 2017-10-24 15:05:57 +02:00
  • e636c9fad3 landing page setting has verbose name Sander Roosendaal 2017-10-24 08:00:56 +02:00
  • b4116a4dda Merge branch 'feature/flexchartselectionbasic' into develop Sander Roosendaal 2017-10-23 20:43:58 +02:00
  • 7ce776dcc8 fix of typo in metrics.py (default flex charts) Sander Roosendaal 2017-10-23 20:41:56 +02:00
  • b7e9fbaa45 Pro metrics restricted to Pro users Sander Roosendaal 2017-10-23 20:10:46 +02:00
  • 74e924a3c1 send email to sender of unrecognized file Sander Roosendaal 2017-10-23 08:56:10 +02:00
  • 04d5df245b Merge branch 'feature/emailprocessing' into develop Sander Roosendaal 2017-10-22 16:06:23 +02:00
  • 973bbb9f0b Complete and tested email processing Sander Roosendaal 2017-10-22 16:04:03 +02:00
  • f36911d73b clarify variable naming Sander Roosendaal 2017-10-22 14:38:37 +02:00
  • f7ab21560d refactored, not tested Sander Roosendaal 2017-10-22 13:01:16 +02:00
  • c4c9ec6460 Merge tag 'v4.34' into develop Sander Roosendaal 2017-10-22 11:58:14 +02:00
  • 22f9ed2c92 Merge branch 'hotfix/v4.34' Sander Roosendaal 2017-10-22 11:56:41 +02:00
  • d7592f3c12 bug fix Sander Roosendaal 2017-10-22 11:55:20 +02:00
  • a866b253a1 cleaned up processemail Sander Roosendaal 2017-10-22 11:49:47 +02:00
  • e541289066 Merge branch 'feature/landingpage' into develop Sander Roosendaal 2017-10-22 11:34:19 +02:00
  • dd05cf2d1b cleaning up Sander Roosendaal 2017-10-22 11:33:18 +02:00
  • f0bfb810a4 made a landing page option Sander Roosendaal 2017-10-22 11:11:30 +02:00
  • ca7b02770d Merge tag 'v4.33' into develop Sander Roosendaal 2017-10-21 20:55:46 +02:00
  • b44034ac4e Merge branch 'hotfix/v4.33' Sander Roosendaal 2017-10-21 20:55:17 +02:00
  • db9e38c9bb removed TCXParserNoHR Sander Roosendaal 2017-10-21 20:53:06 +02:00
  • efab457fd2 Merge branch 'feature/backtoworkflow' into develop Sander Roosendaal 2017-10-20 21:40:18 +02:00
  • c1626d8252 removed 2 unused files Sander Roosendaal 2017-10-20 21:39:08 +02:00
  • aa01ed6221 added some explanation Sander Roosendaal 2017-10-20 21:38:22 +02:00
  • 157c0373fe implemented most of Mike's suggestions Sander Roosendaal 2017-10-20 21:32:37 +02:00
  • a0a3ef9f60 added basic info part to workflow middle panel Sander Roosendaal 2017-10-20 20:38:29 +02:00
  • 9101a5aca5 added links to workflow page Sander Roosendaal 2017-10-20 20:28:03 +02:00
  • 360607c999 Merge tag 'v4.32' into develop Sander Roosendaal 2017-10-20 10:23:30 +02:00
  • bd92646057 Merge branch 'release/v4.32' Sander Roosendaal 2017-10-20 10:15:08 +02:00
  • f1d795e335 Merge branch 'feature/simpleworkflow' into develop Sander Roosendaal 2017-10-20 08:49:17 +02:00
  • 3ff3dcff82 simple config page (working) Sander Roosendaal 2017-10-20 07:56:19 +02:00
  • be36e2d77f somewhat working form config2 Sander Roosendaal 2017-10-19 19:00:19 +02:00
  • a9d84c4961 alternative panel config form Sander Roosendaal 2017-10-18 23:41:56 +02:00
  • 456e667432 Merge tag 'v4.31' into develop Sander Roosendaal 2017-10-18 19:19:56 +02:00
  • 43e35835b2 Merge branch 'release/v4.31' Sander Roosendaal 2017-10-18 19:19:40 +02:00
  • 70758cea65 bug fix typo in defaultleft Sander Roosendaal 2017-10-18 19:14:43 +02:00
  • 17d52cd614 Merge tag 'v4.29' into develop Sander Roosendaal 2017-10-18 16:42:41 +02:00
  • 324ba79eb0 Merge branch 'release/v4.29' Sander Roosendaal 2017-10-18 16:42:08 +02:00
  • 8f35cb2b0a Merge branch 'feature/workflowconfigurable' into develop Sander Roosendaal 2017-10-18 16:36:07 +02:00
  • e6b80646b7 added return to workout link Sander Roosendaal 2017-10-18 16:34:22 +02:00
  • 02620e6093 workout overview bar chart with initials on team Sander Roosendaal 2017-10-18 16:20:32 +02:00
  • b14a47d22c more options for left panel Sander Roosendaal 2017-10-18 16:16:55 +02:00
  • 13dee6305d workflow config form working Sander Roosendaal 2017-10-18 15:44:51 +02:00
  • 3bec917456 primitive version of workflow config form (not working) Sander Roosendaal 2017-10-18 12:03:31 +02:00
  • 10cc35b269 accounted for possible 'notgzip' response from rowingdata Sander Roosendaal 2017-10-18 09:24:01 +02:00
  • 35ad449421 try/except around get_file_type to catch corrupt gzip Sander Roosendaal 2017-10-18 09:16:15 +02:00
  • 828f406139 Merge tag 'v4.28' into develop Sander Roosendaal 2017-10-17 18:20:26 +02:00