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

Commit Graph

  • d45b674a15 Merge tag 'v5.89' into develop Sander Roosendaal 2018-02-16 10:52:25 +01:00
  • f4dfecdff6 Merge branch 'release/v5.89' Sander Roosendaal 2018-02-16 10:51:54 +01:00
  • 13aa939b3e Merge branch 'feature/planningimprovements' into develop Sander Roosendaal 2018-02-16 10:43:00 +01:00
  • 0c9bfcad8d improved session completion date Sander Roosendaal 2018-02-16 10:41:26 +01:00
  • af2ae853bd guidance added for plannedsession forms Sander Roosendaal 2018-02-16 09:42:57 +01:00
  • 79fd61ce3b clean up Sander Roosendaal 2018-02-15 16:58:33 +01:00
  • c8e9aeaf9b Merge tag 'v5.88' into develop Sander Roosendaal 2018-02-15 16:47:12 +01:00
  • d3ba2c5db1 Merge branch 'release/v5.88' Sander Roosendaal 2018-02-15 16:46:20 +01:00
  • 2221a633b1 test type plannedsessions now have a ranking Sander Roosendaal 2018-02-15 16:32:33 +01:00
  • 706ffc90fd changed startdate, time ordering to startdatetime ordering in join Sander Roosendaal 2018-02-15 08:52:40 +01:00
  • f1f28650f6 updated criteria after the committee decided Sander Roosendaal 2018-02-14 21:59:01 +01:00
  • 7d7c376b2a changed completion criteria for approximate cycletarget Sander Roosendaal 2018-02-14 21:50:11 +01:00
  • 826310b62b Merge tag 'v5.87' into develop Sander Roosendaal 2018-02-14 21:04:23 +01:00
  • ff18fb419e Merge branch 'release/v5.87' Sander Roosendaal 2018-02-14 21:03:35 +01:00
  • 55b2f02e51 ibug fix Sander Roosendaal 2018-02-14 20:57:12 +01:00
  • 50599d6c02 Merge tag 'v5.86' into develop Sander Roosendaal 2018-02-14 11:30:56 +01:00
  • b930d5d70e Merge branch 'release/v5.86' Sander Roosendaal 2018-02-14 11:30:38 +01:00
  • 76cadea8b6 some fine tuning of plannedsession UI Sander Roosendaal 2018-02-14 11:27:17 +01:00
  • 55513c8470 Merge tag 'v5.85' into develop Sander Roosendaal 2018-02-13 22:00:35 +01:00
  • 574f77aa6a Merge branch 'release/v5.85' Sander Roosendaal 2018-02-13 22:00:09 +01:00
  • c4b727f4e4 Merge branch 'feature/multiplanningform' into develop Sander Roosendaal 2018-02-13 21:57:59 +01:00
  • 57b70c586b Merge tag 'v5.84' into develop Sander Roosendaal 2018-02-13 21:54:10 +01:00
  • c799cd261c Merge branch 'release/v5.84' Sander Roosendaal 2018-02-13 21:53:42 +01:00
  • 1030b3f126 bulk edit links Sander Roosendaal 2018-02-13 21:50:25 +01:00
  • 4b5b33b1f5 small improvement Sander Roosendaal 2018-02-13 21:45:52 +01:00
  • 0a47d0b840 somehow working Sander Roosendaal 2018-02-13 20:13:18 +01:00
  • 7d4a2f2251 initial multicreate plannedsesssion not working Sander Roosendaal 2018-02-13 16:03:58 +01:00
  • 41c38354bc Merge tag 'v5.83' into develop Sander Roosendaal 2018-02-13 13:55:28 +01:00
  • d43134be35 Merge branch 'release/v5.83' Sander Roosendaal 2018-02-13 13:54:32 +01:00
  • fd9388402a added age verification and improvements on plannedsession Sander Roosendaal 2018-02-13 13:40:08 +01:00
  • 5f287b9ccd Merge branch 'bugfix/rscore' into develop Sander Roosendaal 2018-02-13 08:31:18 +01:00
  • a874609bb5 date is sticky in plannedsession create form Sander Roosendaal 2018-02-13 08:29:50 +01:00
  • ae0e0650e8 TSS calculation now always includes rest strokes Sander Roosendaal 2018-02-13 08:18:17 +01:00
  • 3a30c7dafc Merge branch 'feature/planningimprovements' into develop Sander Roosendaal 2018-02-12 17:36:19 +01:00
  • 9b8d2229a2 minor improvements plannedsession views Sander Roosendaal 2018-02-12 17:35:14 +01:00
  • cd96820985 bug fixes Sander Roosendaal 2018-02-12 08:22:33 +01:00
  • 1a5d89fcbb Merge tag 'v5.82' into develop Sander Roosendaal 2018-02-11 20:11:32 +01:00
  • 3afa92c278 Merge branch 'release/v5.82' Sander Roosendaal 2018-02-11 20:10:58 +01:00
  • d833b9c1c9 Merge branch 'feature/planning3' into develop Sander Roosendaal 2018-02-11 20:03:23 +01:00
  • c185d680c6 navigation for coach view Sander Roosendaal 2018-02-11 14:23:33 +01:00
  • 8884e2f7b1 session coach view v1 Sander Roosendaal 2018-02-11 13:55:51 +01:00
  • fdc4ec15ea added other rowers result to session view Sander Roosendaal 2018-02-10 17:16:10 +01:00
  • ba8fc0f035 bug fix Sander Roosendaal 2018-02-10 16:37:14 +01:00
  • f3b4f64223 Merge tag 'v5.81' into develop Sander Roosendaal 2018-02-10 09:48:56 +01:00
  • 7155ceb945 Merge branch 'hotfix/v5.81' Sander Roosendaal 2018-02-10 09:45:17 +01:00
  • 3a5ddf3d1a fixed wrong permission setting Sander Roosendaal 2018-02-10 09:44:09 +01:00
  • ee4b7455e5 Merge tag 'v5.80' into develop Sander Roosendaal 2018-02-09 16:53:09 +01:00
  • e9d457ce85 Merge branch 'release/v5.80' Sander Roosendaal 2018-02-09 16:52:49 +01:00
  • 0fd217bae7 Merge branch 'feature/planningcoach2' into develop Sander Roosendaal 2018-02-09 16:44:13 +01:00
  • cd134a40fd edit and create team sessions Sander Roosendaal 2018-02-09 16:40:47 +01:00
  • c22740002c Merge branch 'develop' into feature/planningcoach2 Sander Roosendaal 2018-02-09 10:35:06 +01:00
  • 71ad6a0dee implemented Pro trial period Sander Roosendaal 2018-02-09 10:26:54 +01:00
  • a32eb96567 add rower select to session edit Sander Roosendaal 2018-02-08 23:15:54 +01:00
  • 6ff73c44c4 improved date behavior for cloning Sander Roosendaal 2018-02-08 23:11:26 +01:00
  • 9df9969939 Merge tag 'v5.79' into develop Sander Roosendaal 2018-02-08 22:55:20 +01:00
  • ecb7ac9ea5 Merge branch 'release/v5.79' Sander Roosendaal 2018-02-08 22:54:17 +01:00
  • ce99837957 Merge branch 'feature/coachplanning' into develop Sander Roosendaal 2018-02-08 22:52:47 +01:00
  • f149e2b431 minor improvements Sander Roosendaal 2018-02-08 22:47:35 +01:00
  • 2457a0d968 minor improvements Sander Roosendaal 2018-02-08 20:50:37 +01:00
  • d9d6c3d6d3 Merge tag 'v5.78' into develop Sander Roosendaal 2018-02-08 15:40:43 +01:00
  • 362d0857ad Merge branch 'release/v5.78' Sander Roosendaal 2018-02-08 15:40:19 +01:00
  • c99196d02a Merge branch 'feature/planning' into develop Sander Roosendaal 2018-02-08 15:32:33 +01:00
  • 42426cdda2 fine tuning Sander Roosendaal 2018-02-08 15:31:23 +01:00
  • 7d51bb9356 import cross training allowed Sander Roosendaal 2018-02-08 11:29:07 +01:00
  • d785404815 link to session number on plan overview Sander Roosendaal 2018-02-07 22:46:28 +01:00
  • 6a56bb98b6 some javascript to improve planned session manage Sander Roosendaal 2018-02-07 22:30:47 +01:00
  • 1e70708ce0 save Sander Roosendaal 2018-02-07 16:50:34 +01:00
  • 91d59dfc28 attach workouts to sessions version 0 Sander Roosendaal 2018-02-07 16:37:03 +01:00
  • d3448c66f1 Date range selection on session view Sander Roosendaal 2018-02-06 21:00:59 +01:00
  • 7bb91c33c7 added date ranges to sessionview Sander Roosendaal 2018-02-06 20:14:46 +01:00
  • 7e73a5c06b updated basic plannedsession view Sander Roosendaal 2018-02-06 11:28:46 +01:00
  • da02466f8a very basic plannedsession view view Sander Roosendaal 2018-02-06 10:57:47 +01:00
  • c33d6cb5e5 Merge branch 'develop' into feature/planning Sander Roosendaal 2018-02-06 08:24:20 +01:00
  • f47130c071 Merge tag 'v5.77' into develop Sander Roosendaal 2018-02-06 08:23:58 +01:00
  • 0490278fbf Merge branch 'hotfix/v5.77' Sander Roosendaal 2018-02-06 08:21:56 +01:00
  • 8045931b75 updated rowingtimer.gif Sander Roosendaal 2018-02-06 08:20:55 +01:00
  • 1fe1d08aa9 replaced all with rowing timers Sander Roosendaal 2018-02-06 08:20:19 +01:00
  • 51d8f3c9e1 adding session edit Sander Roosendaal 2018-02-05 22:02:25 +01:00
  • ba334554eb create plannedsession view v1.0 Sander Roosendaal 2018-02-05 21:36:11 +01:00
  • cdf18058b9 first version of session create page Sander Roosendaal 2018-02-05 20:43:54 +01:00
  • 7a51a51df4 Merge branch 'develop' into feature/planning Sander Roosendaal 2018-02-05 20:08:12 +01:00
  • c30ec4b570 add plan to member plans Sander Roosendaal 2018-02-05 20:07:35 +01:00
  • e7f053b9de Merge tag 'v5.76' into develop Sander Roosendaal 2018-02-05 19:38:30 +01:00
  • 77693ddf9e Merge branch 'hotfix/v5.76' Sander Roosendaal 2018-02-05 19:35:05 +01:00
  • ad07cdbe7e initial replacement of gif Sander Roosendaal 2018-02-05 19:32:05 +01:00
  • 802258df00 added some model forms Sander Roosendaal 2018-02-05 17:01:40 +01:00
  • a60bba671e working on low level plannedsession Sander Roosendaal 2018-02-05 13:49:59 +01:00
  • 4c38b27ae6 Merge tag 'v5.75' into develop Sander Roosendaal 2018-02-05 10:10:51 +01:00
  • c704bf1988 Merge branch 'hotfix/v5.75' Sander Roosendaal 2018-02-05 10:10:24 +01:00
  • b9e3e482e5 bug fix Sander Roosendaal 2018-02-05 10:09:10 +01:00
  • 92d69087cf defined basic models and some low level functions Sander Roosendaal 2018-01-26 11:03:00 +01:00
  • bb48cfb96b model update Sander Roosendaal 2018-01-25 17:36:40 +01:00
  • 6abdacbc4e link to plannedsession in workout model Sander Roosendaal 2018-01-25 07:50:44 +01:00
  • 66f1baf258 Merge tag 'v5.74' into develop Sander Roosendaal 2018-01-24 18:46:59 +01:00
  • e7890a4e54 Merge branch 'hotfix/v5.74' Sander Roosendaal 2018-01-24 18:45:07 +01:00
  • a014605deb hotfix get_job_status Sander Roosendaal 2018-01-24 18:43:50 +01:00
  • 9e1486aa94 typo correction Sander Roosendaal 2018-01-24 18:37:04 +01:00
  • 177af2b49e basic PlannedSession object in models.py Sander Roosendaal 2018-01-24 18:20:30 +01:00
  • 3e0b98fab8 easy changing to athlete's workouts list for coaches Sander Roosendaal 2018-01-24 14:55:18 +01:00
  • 865d7837f9 changed order - rotating resized image Sander Roosendaal 2018-01-23 22:07:54 +01:00