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

Commit Graph

  • 06eff02eb5 Merge branch 'bugfix/powerintervals' into develop Sander Roosendaal 2017-02-11 07:32:57 +01:00
  • 3fb82307ad testje compleet Sander Roosendaal 2017-02-11 07:32:10 +01:00
  • c512a19fd7 testje Sander Roosendaal 2017-02-11 07:31:27 +01:00
  • 4d971015c6 Merge tag 'teampagebugfix' into develop Sander Roosendaal 2017-02-10 20:03:45 +01:00
  • ca60f615ae Merge branch 'release/teampagebugfix' Sander Roosendaal 2017-02-10 20:02:47 +01:00
  • 86a2127a4e bugfix for basic users Sander Roosendaal 2017-02-10 19:58:45 +01:00
  • 07d152e76b Merge tag 'teamrequestfix2' into develop Sander Roosendaal 2017-02-10 16:29:07 +01:00
  • b387927b95 Merge branch 'hotfix/teamrequestfix2' Sander Roosendaal 2017-02-10 16:28:36 +01:00
  • 288bac995b Checks for users with that email address Sander Roosendaal 2017-02-10 16:27:19 +01:00
  • 70d4050bc9 updated selector & warning on invitations Sander Roosendaal 2017-02-10 16:16:50 +01:00
  • 06c2ffb5cc Merge tag 'teamrequestsfix' into develop Sander Roosendaal 2017-02-10 14:59:46 +01:00
  • 6e6205d739 Merge branch 'release/teamrequestsfix' Sander Roosendaal 2017-02-10 14:59:26 +01:00
  • 90a177b06c bugfix teamrequests Sander Roosendaal 2017-02-10 14:55:15 +01:00
  • c578f350ce Merge tag 'teamrequests' into develop Sander Roosendaal 2017-02-10 14:09:04 +01:00
  • f3cb364ce3 Merge branch 'release/teamrequests' Sander Roosendaal 2017-02-10 14:01:06 +01:00
  • 7858e9956f Merge branch 'feature/teamrequests' into develop Sander Roosendaal 2017-02-10 13:55:16 +01:00
  • 88217f05ce confirmation emails Sander Roosendaal 2017-02-10 13:54:23 +01:00
  • fa86c0c9d5 added requests, revoke and reject buttons Sander Roosendaal 2017-02-10 12:48:22 +01:00
  • fffdb89a53 Merge tag 'teamfix3' into develop Sander Roosendaal 2017-02-09 21:39:32 +01:00
  • 1b9699242d Merge branch 'release/teamfix3' Sander Roosendaal 2017-02-09 21:39:06 +01:00
  • 43403e261a fix messaging Sander Roosendaal 2017-02-09 21:37:19 +01:00
  • 2c9f0fac27 Merge tag 'teamfix2' into develop Sander Roosendaal 2017-02-09 21:31:31 +01:00
  • db00c305a7 Merge branch 'release/teamfix2' Sander Roosendaal 2017-02-09 21:31:06 +01:00
  • 5f97554bc6 indentation error fixed Sander Roosendaal 2017-02-09 21:29:40 +01:00
  • 5e7b36f87b Merge tag 'teamfix' into develop Sander Roosendaal 2017-02-09 21:21:05 +01:00
  • c5f377c074 Merge branch 'release/teamfix' Sander Roosendaal 2017-02-09 21:20:39 +01:00
  • c06dd204d0 buxfix Sander Roosendaal 2017-02-09 21:17:24 +01:00
  • 08f1b0a127 Merge tag 'team_management' into develop Sander Roosendaal 2017-02-09 20:59:32 +01:00
  • 560698a5d1 Merge branch 'release/team_management' Sander Roosendaal 2017-02-09 20:59:18 +01:00
  • 9e147528a4 bug fix Sander Roosendaal 2017-02-09 20:55:07 +01:00
  • 51b97f6821 Merge branch 'feature/team_management' into develop Sander Roosendaal 2017-02-09 20:49:59 +01:00
  • e60320143a Process team invites Sander Roosendaal 2017-02-09 20:45:10 +01:00
  • 32cadef2e5 bug fix Sander Roosendaal 2017-02-09 17:56:03 +01:00
  • 40e18fee21 Team create, delete, leave, create invite Sander Roosendaal 2017-02-09 17:50:32 +01:00
  • f459cea2bd team expiry date added to Rower model Sander Roosendaal 2017-02-09 14:07:44 +01:00
  • 30f420c1a5 Merge branch 'feature/team_lowlevel' into develop Sander Roosendaal 2017-02-09 13:31:28 +01:00
  • 887e7de53d added teams and invitations placeholder views Sander Roosendaal 2017-02-09 13:27:45 +01:00
  • f393862a92 medium level and account page Sander Roosendaal 2017-02-09 12:23:56 +01:00
  • 0969399e36 moved data field prep for stats to dataprep from views Sander Roosendaal 2017-02-09 08:43:07 +01:00
  • d279180d5d low level team functions Sander Roosendaal 2017-02-08 18:49:48 +01:00
  • 7e5d751aef model changes to support team Sander Roosendaal 2017-02-08 15:42:11 +01:00
  • 75a37ff642 added gzip to OTW power calc Sander Roosendaal 2017-02-08 11:30:42 +01:00
  • 6348c67a71 Merge tag 'stats_v5' into develop Sander Roosendaal 2017-02-07 18:05:09 +01:00
  • d9d8cea995 Merge branch 'release/stats_v5' Sander Roosendaal 2017-02-07 18:03:18 +01:00
  • 20e13ca641 Merge branch 'feature/stats_v5' into develop Sander Roosendaal 2017-02-07 17:55:32 +01:00
  • 97e6ad5d27 changed Team model Sander Roosendaal 2017-02-07 17:54:47 +01:00
  • abcf2f1789 using sessions to keep workout type selected Sander Roosendaal 2017-02-07 15:54:07 +01:00
  • 2fc2431de9 Merge tag 'otwpower' into develop Sander Roosendaal 2017-02-07 13:30:03 +01:00
  • 9735221b3b Merge branch 'release/otwpower' Sander Roosendaal 2017-02-07 13:29:21 +01:00
  • 6c7180dd02 bug fix power plot (expecting serialized value) Sander Roosendaal 2017-02-07 13:15:32 +01:00
  • 0d0d70a49c Merge tag 'rq-dashboard' into develop Sander Roosendaal 2017-02-07 12:58:28 +01:00
  • 30f792178f Merge branch 'release/rq-dashboard' Sander Roosendaal 2017-02-07 12:58:09 +01:00
  • 5738de3f99 added RQ dashboard to admin Sander Roosendaal 2017-02-07 12:48:47 +01:00
  • 5e4f22be9d changed correlation to Spearman Sander Roosendaal 2017-02-07 11:53:52 +01:00
  • f1967a9d5f Merge tag 'stats_v4' into develop Sander Roosendaal 2017-02-07 11:27:03 +01:00
  • 05a5d693ce Merge branch 'release/stats_v4' Sander Roosendaal 2017-02-07 11:26:45 +01:00
  • 24565e2ef2 filtered out non meaningul values Sander Roosendaal 2017-02-07 10:49:42 +01:00
  • 955d5aa070 typo Sander Roosendaal 2017-02-07 07:23:13 +01:00
  • f9142a5f6a changed default value for expires Sander Roosendaal 2017-02-06 22:19:41 +01:00
  • 510af9c5bc Merge tag 'deltazero' into develop Sander Roosendaal 2017-02-06 22:07:05 +01:00
  • 74c579cfa0 Merge branch 'hotfix/deltazero' Sander Roosendaal 2017-02-06 22:06:49 +01:00
  • 80008f79c7 bug fix Sander Roosendaal 2017-02-06 22:03:29 +01:00
  • 48899a1809 Merge tag 'stats_v3' into develop Sander Roosendaal 2017-02-06 21:50:50 +01:00
  • a16059e45d Merge branch 'release/stats_v3' Sander Roosendaal 2017-02-06 21:50:35 +01:00
  • 7f6660c0cd stats_v3 Sander Roosendaal 2017-02-06 21:47:15 +01:00
  • b85308602d cumstats Sander Roosendaal 2017-02-06 21:39:56 +01:00
  • aff54b0a79 Merge tag 'gmapfix' into develop Sander Roosendaal 2017-02-06 18:04:31 +01:00
  • a89628dd8a Merge branch 'release/gmapfix' Sander Roosendaal 2017-02-06 18:04:15 +01:00
  • f9eae7f591 Fixed google map overflow issue Sander Roosendaal 2017-02-06 17:38:13 +01:00
  • c6b5aedbc7 Merge tag 'stats_v2' into develop Sander Roosendaal 2017-02-06 15:42:20 +01:00
  • 1c4048e247 Merge branch 'release/stats_v2' Sander Roosendaal 2017-02-06 15:40:50 +01:00
  • 3b3f1845ae removed print statement Sander Roosendaal 2017-02-06 15:24:32 +01:00
  • 0e89864e1d Merge branch 'feature/stats_v2' into develop Sander Roosendaal 2017-02-06 15:08:03 +01:00
  • fb76710681 Stats page v2 Sander Roosendaal 2017-02-06 15:07:24 +01:00
  • 38f7a59476 automating the stats Sander Roosendaal 2017-02-06 09:56:09 +01:00
  • b061eb5b1a Merge tag 'statspage' into develop Sander Roosendaal 2017-02-05 21:40:03 +01:00
  • f5472b1e3e Merge branch 'release/statspage' Sander Roosendaal 2017-02-05 21:39:09 +01:00
  • 75681c1220 Basic Stats page Sander Roosendaal 2017-02-05 21:24:17 +01:00
  • 0b183053ba implemented from_db_value in PowerZOnes model Sander Roosendaal 2017-02-05 15:46:15 +01:00
  • 2a3bfbadee Merge tag 'error500' into develop Sander Roosendaal 2017-01-28 20:53:27 +01:00
  • ed6d569105 Merge branch 'release/error500' Sander Roosendaal 2017-01-28 20:52:48 +01:00
  • 35742a7cd0 Added button to BitBucket Issue to 500 page Sander Roosendaal 2017-01-28 20:48:54 +01:00
  • 0a719de27b Merge tag 'hrform' into develop Sander Roosendaal 2017-01-28 19:29:36 +01:00
  • 0e49ef7a94 Merge branch 'hotfix/hrform' Sander Roosendaal 2017-01-28 19:29:14 +01:00
  • fe85318024 Bug fix HR user form Sander Roosendaal 2017-01-28 19:27:57 +01:00
  • 9ca2f4fc26 don't know Sander Roosendaal 2017-01-28 19:19:24 +01:00
  • 46d55062ea Merge tag 'accountmgmt' into develop Sander Roosendaal 2017-01-27 16:43:48 +01:00
  • 6ac3e3eac2 Merge branch 'release/accountmgmt' Sander Roosendaal 2017-01-27 16:43:31 +01:00
  • 227081cfb3 User can edit name and email address Sander Roosendaal 2017-01-27 11:17:29 +01:00
  • ae36376dbe Merge tag 'smtp3' into develop Sander Roosendaal 2017-01-26 17:46:32 +01:00
  • cfd339ef9c Merge branch 'release/smtp3' Sander Roosendaal 2017-01-26 17:46:06 +01:00
  • 79f2df050d SMTP further testing Sander Roosendaal 2017-01-26 17:44:06 +01:00
  • c23fd20894 EMail to YAML settings Sander Roosendaal 2017-01-26 17:40:15 +01:00
  • 9d9c1fed9c Merge tag 'emailtest2' into develop Sander Roosendaal 2017-01-26 17:34:40 +01:00
  • fdaff20411 Merge branch 'release/emailtest2' Sander Roosendaal 2017-01-26 17:34:27 +01:00
  • 1ffc0cc759 Use TLS = False Sander Roosendaal 2017-01-26 17:32:25 +01:00
  • cc7899f2d1 Merge tag 'emailtest' into develop Sander Roosendaal 2017-01-26 17:23:07 +01:00
  • 6d740f62d5 Merge branch 'release/emailtest' Sander Roosendaal 2017-01-26 17:22:44 +01:00
  • d0c7b3dd5d email to smtp test Sander Roosendaal 2017-01-26 17:21:24 +01:00
  • c91a1a12d9 Merge tag 'powerzonesdefaults' into develop Sander Roosendaal 2017-01-26 13:46:48 +01:00