Private
Public Access
1
0

Commit Graph

  • 0797599be7 tested Sander Roosendaal 2019-03-31 16:29:12 +02:00
  • 0dd446dc1f Merge branch 'develop' into feature/django2 Sander Roosendaal 2019-03-31 16:02:36 +02:00
  • af5ffe7b0d adding tombstones Sander Roosendaal 2019-03-29 13:57:49 +01:00
  • bda7ff1d2d Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop Sander Roosendaal 2019-03-29 12:31:47 +01:00
  • bc40ce42a4 Merge branch 'release/v9.62' Sander Roosendaal 2019-03-28 21:13:17 +01:00
  • 6ca4039a5b fix #466 Sander Roosendaal 2019-03-28 21:10:14 +01:00
  • 73fcd8da07 Merge branch 'feature/flexchartimprovements' into develop Sander Roosendaal 2019-03-27 21:12:24 +01:00
  • 83f92a4951 tested Sander Roosendaal 2019-03-27 21:12:12 +01:00
  • 47c3b91137 some flex chart improvements Sander Roosendaal 2019-03-27 21:05:41 +01:00
  • c8e74b72ea Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop Sander Roosendaal 2019-03-27 08:09:45 +01:00
  • c34e77f5d5 checking in test file Sander Roosendaal 2019-03-27 08:09:10 +01:00
  • f8303427a2 Merge branch 'release/v9.61' Sander Roosendaal 2019-03-26 21:45:50 +01:00
  • 4a68b55052 tested Sander Roosendaal 2019-03-26 21:43:42 +01:00
  • e79206c7c1 fxix #464 Sander Roosendaal 2019-03-26 21:08:40 +01:00
  • 20af0e1aa2 Merge branch 'develop' of bitbucket.org:sanderroosendaal/rowsandall into develop Sander Roosendaal 2019-03-26 20:34:26 +01:00
  • 3bc962071d improving css for flex charts on mobile Sander Roosendaal 2019-03-26 16:44:50 +01:00
  • 0838f0de66 fix #461 Sander Roosendaal 2019-03-26 11:55:11 +01:00
  • 70cd7bb060 Merge branch 'feature/attachments' into develop Sander Roosendaal 2019-03-26 11:48:31 +01:00
  • 4582128128 re tested Sander Roosendaal 2019-03-26 11:46:36 +01:00
  • c9b2ad15a5 adding ignoring ATT files Sander Roosendaal 2019-03-26 11:20:45 +01:00
  • 61e9af1208 change submit to select workouts Sander Roosendaal 2019-03-25 20:58:51 +01:00
  • b0901f8ac9 Merge branch 'feature/searchfix' into develop Sander Roosendaal 2019-03-25 20:49:55 +01:00
  • 84cdf0433b fixes #448 Sander Roosendaal 2019-03-25 20:49:43 +01:00
  • 2e77366b94 fixes #447 Sander Roosendaal 2019-03-25 20:44:13 +01:00
  • 61982d24ce added django2 virtualenv to gitignore Sander Roosendaal 2019-03-25 20:19:25 +01:00
  • b8e48a5626 added requirements for win (not working) Sander Roosendaal 2019-03-25 13:57:06 +01:00
  • 8e29b616b1 passes tests! Sander Roosendaal 2019-03-22 15:48:06 +01:00
  • 41f739726e login fixed Sander Roosendaal 2019-03-22 14:58:12 +01:00
  • 9f71991c02 still login page not working Sander Roosendaal 2019-03-22 14:51:10 +01:00
  • 304486c4f9 updating thinkpad settings for django2 Sander Roosendaal 2019-03-22 14:01:37 +01:00
  • 59566df08c django2 new virtualenv on linux Sander Roosendaal 2019-03-22 14:00:37 +01:00
  • 588c145b6e djanogo 2 Sander Roosendaal 2019-03-22 12:09:09 +01:00
  • da0842fc8b passing checks with django 2.1.7 Sander Roosendaal 2019-03-22 10:59:49 +01:00
  • bec008d429 windows requirements.txt Sander Roosendaal 2019-03-22 08:57:55 +01:00
  • deef9c17a5 added Sander Roosendaal 2019-03-21 21:20:08 +01:00
  • 3c82949ce4 Merge branch 'release/v9.60' Sander Roosendaal 2019-03-21 20:29:39 +01:00
  • de9390090e tested Sander Roosendaal 2019-03-21 20:29:18 +01:00
  • 78d878cb14 fix #444 Sander Roosendaal 2019-03-21 19:21:51 +01:00
  • 1582e8dc18 added compare to analytics Sander Roosendaal 2019-03-21 19:11:41 +01:00
  • 2dec44cdf6 Merge branch 'bugfix/interactivenotes' into develop Sander Roosendaal 2019-03-21 09:55:33 +01:00
  • 9de1e834b2 fix #445 and tested Sander Roosendaal 2019-03-21 09:54:09 +01:00
  • 203ef96649 fixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfix Sander Roosendaal 2019-03-21 09:46:40 +01:00
  • 18d848a591 one forgotten decode on base64 encoded string Sander Roosendaal 2019-03-20 08:42:29 +01:00
  • 1439e74ef9 Merge branch 'release/v9.59' into develop Sander Roosendaal 2019-03-18 21:49:04 +01:00
  • 7258a8574a Merge branch 'release/v9.59' Sander Roosendaal 2019-03-18 21:48:56 +01:00
  • b1c781f8f8 tested Sander Roosendaal 2019-03-18 21:48:43 +01:00
  • 9482682d4b fixed polar auth Sander Roosendaal 2019-03-18 21:46:20 +01:00
  • f1630a64df Merge branch 'release/v9.58' into develop Sander Roosendaal 2019-03-17 11:43:46 +01:00
  • 74458e0a46 Merge branch 'release/v9.58' Sander Roosendaal 2019-03-17 11:43:39 +01:00
  • 71953beed1 tested Sander Roosendaal 2019-03-17 11:43:27 +01:00
  • b7a09ca019 shortening links Sander Roosendaal 2019-03-17 11:39:57 +01:00
  • 24aa67e090 Merge branch 'hotfix/v9.57' into develop Sander Roosendaal 2019-03-17 11:09:42 +01:00
  • 7209d07574 Merge branch 'hotfix/v9.57' Sander Roosendaal 2019-03-17 11:09:35 +01:00
  • a3ebba1c5f removing non-used code (bugfix) Sander Roosendaal 2019-03-17 11:09:17 +01:00
  • 59da0870e3 Merge branch 'release/v9.56' into develop Sander Roosendaal 2019-03-17 11:05:10 +01:00
  • becd773273 Merge branch 'release/v9.56' Sander Roosendaal 2019-03-17 11:04:57 +01:00
  • e9487c111e tested Sander Roosendaal 2019-03-17 11:04:47 +01:00
  • 5726833c7d Merge branch 'feature/fixbokeh' into develop Sander Roosendaal 2019-03-17 11:01:31 +01:00
  • 7a56b49278 tested Sander Roosendaal 2019-03-17 11:01:22 +01:00
  • 290b624a8b fixed cum_flex sliders and fixed #439 Sander Roosendaal 2019-03-17 10:58:14 +01:00
  • ae1e12a511 fixed flex chart Sander Roosendaal 2019-03-17 10:45:48 +01:00
  • 7bc99b4084 fix #440 Sander Roosendaal 2019-03-17 09:44:22 +01:00
  • 865a047a0b Merge branch 'release/v9.55' into develop Sander Roosendaal 2019-03-15 19:20:13 +01:00
  • 235dd251bc Merge branch 'release/v9.55' Sander Roosendaal 2019-03-15 19:20:00 +01:00
  • 7dd156c8e3 fixed url Sander Roosendaal 2019-03-15 19:19:38 +01:00
  • f7a4a6b976 paid plan info for basic empower users Sander Roosendaal 2019-03-15 18:23:02 +01:00
  • a5064d6422 Merge branch 'feature/dragedit' into develop Sander Roosendaal 2019-03-15 11:14:58 +01:00
  • 4fe6470fce passing tests Sander Roosendaal 2019-03-15 11:13:57 +01:00
  • f0caba6d4f bug fix in test Sander Roosendaal 2019-03-15 10:56:15 +01:00
  • 85a023ce5c fix #433 Sander Roosendaal 2019-03-15 10:33:47 +01:00
  • 3fae33f366 adding drag factor Sander Roosendaal 2019-03-15 10:27:35 +01:00
  • 7fb5eb555a Merge branch 'feature/goals' into develop Sander Roosendaal 2019-03-15 08:52:11 +01:00
  • dfea13b8f9 bugs fixed (passing tests) Sander Roosendaal 2019-03-15 08:50:55 +01:00
  • e5a38c8802 fitness chart popup yyyy-mm-dd Sander Roosendaal 2019-03-15 08:23:06 +01:00
  • 528da3bce8 tools above Sander Roosendaal 2019-03-15 08:22:18 +01:00
  • 8d46cd1e93 Merge branch 'develop' into feature/goals Sander Roosendaal 2019-03-15 08:00:27 +01:00
  • c97b7dabed Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop Sander Roosendaal 2019-03-15 07:58:25 +01:00
  • 6a00853554 fiddling with style & layout Sander Roosendaal 2019-03-15 07:57:00 +01:00
  • 72227fd6f2 Merge branch 'release/v9.54' Sander Roosendaal 2019-03-14 21:41:31 +01:00
  • 2b148b442b correcting stars Sander Roosendaal 2019-03-14 21:41:07 +01:00
  • b617cadad9 Merge branch 'release/v9.53' into develop Sander Roosendaal 2019-03-14 21:31:38 +01:00
  • 5d6dee7fcd Merge branch 'release/v9.53' Sander Roosendaal 2019-03-14 21:31:28 +01:00
  • 343ae24918 tested Sander Roosendaal 2019-03-14 21:31:19 +01:00
  • 8958d4430f issue #437 fixed Sander Roosendaal 2019-03-14 21:28:23 +01:00
  • 3041e59e1d tasks - added csvfile= argument to rowingdata Sander Roosendaal 2019-03-14 15:23:59 +01:00
  • 81f9320787 Merge tag 'v9.52' into develop Sander Roosendaal 2019-03-14 10:43:02 +01:00
  • d31f62c978 Merge branch 'release/v9.52' Sander Roosendaal 2019-03-14 10:42:44 +01:00
  • c2426014d2 losing #436 Sander Roosendaal 2019-03-14 10:41:01 +01:00
  • 4c25d378c1 Merge branch 'bugfix/c2' into develop Sander Roosendaal 2019-03-14 09:30:49 +01:00
  • acf9faff38 fixed Sander Roosendaal 2019-03-14 09:29:26 +01:00
  • fb5e0d38a8 fixed c2 export Sander Roosendaal 2019-03-14 08:24:47 +01:00
  • daf9692d39 tested Sander Roosendaal 2019-03-13 21:44:33 +01:00
  • 7e747ed616 Merge tag 'v9.51' into develop Sander Roosendaal 2019-03-13 17:54:47 +01:00
  • 874c05f543 Merge branch 'hotfix/v9.51' Sander Roosendaal 2019-03-13 17:54:08 +01:00
  • fd0b9361b0 small bug fix Sander Roosendaal 2019-03-13 17:52:32 +01:00
  • c8742bb543 small bug fix Sander Roosendaal 2019-03-13 16:52:24 +01:00
  • c304268dbe Merge branch 'release/v9.50' Sander Roosendaal 2019-03-12 18:27:53 +01:00
  • 8416c46763 tested Sander Roosendaal 2019-03-12 18:26:54 +01:00
  • caa8aca92a fixes #435 Sander Roosendaal 2019-03-12 17:05:13 +01:00
  • bec981cb94 breadcrumb with non opaque reference Sander Roosendaal 2019-03-12 08:46:57 +01:00