Sander Roosendaal
8b565d9057
Merge tag 'v5.16' into develop
...
dev fix
2017-11-26 20:08:08 +01:00
Sander Roosendaal
2ff4347f65
Merge branch 'hotfix/v5.16'
2017-11-26 20:07:35 +01:00
Sander Roosendaal
4a9447991b
dev test
2017-11-26 20:05:27 +01:00
Sander Roosendaal
7fc5c8f35a
Merge tag 'v5.15' into develop
...
model change for dev
2017-11-26 19:34:48 +01:00
Sander Roosendaal
8a4ddcb6d5
Merge branch 'hotfix/v5.15'
2017-11-26 19:34:08 +01:00
Sander Roosendaal
6dd8dc06fc
team model change for dev
2017-11-26 19:32:16 +01:00
Sander Roosendaal
37430488ec
Merge tag 'v5.14' into develop
...
hotfix
2017-11-26 19:15:33 +01:00
Sander Roosendaal
dcd4ddc705
Merge branch 'hotfix/v5.14'
2017-11-26 19:15:07 +01:00
Sander Roosendaal
33af6176a3
bug fix
2017-11-26 18:09:32 +01:00
Sander Roosendaal
7c4010e162
Merge tag 'v5.13' into develop
...
hotfix join
2017-11-26 15:48:08 +01:00
Sander Roosendaal
c2fc846530
Merge branch 'hotfix/v5.13'
2017-11-26 15:47:28 +01:00
Sander Roosendaal
e40a943705
fix join
2017-11-26 15:45:27 +01:00
Sander Roosendaal
d2d6a62d9d
Merge tag 'v5.12' into develop
...
bug fix glue
2017-11-26 09:37:13 +01:00
Sander Roosendaal
36cabd5fb0
Merge branch 'release/v5.12'
2017-11-26 09:17:52 +01:00
Sander Roosendaal
ec3a9700a5
inheritance in gluing
2017-11-26 08:32:47 +01:00
Sander Roosendaal
0a98e3c27c
Merge tag 'v5.11' into develop
...
has glue
2017-11-24 10:39:30 +01:00
Sander Roosendaal
d0bae1f440
Merge branch 'release/v5.11'
2017-11-24 10:39:00 +01:00
Sander Roosendaal
e9289dbaa6
Merge branch 'feature/glue' into develop
2017-11-24 09:42:14 +01:00
Sander Roosendaal
79c3b86034
added glue to templates
2017-11-24 09:41:01 +01:00
Sander Roosendaal
b1c642c968
join works
2017-11-23 17:19:17 +01:00
Sander Roosendaal
fbdf017676
bug fixes
2017-11-23 10:08:33 +01:00
Sander Roosendaal
618e64579c
join working but needs improvement (form with title)
2017-11-22 18:06:45 +01:00
Sander Roosendaal
6a76ba05fa
email processing looking for Quiske in first line
2017-11-22 09:14:19 +01:00
Sander Roosendaal
b97db946af
Merge tag 'v5.10' into develop
...
manual workload addition and distance pieces
2017-11-20 09:36:53 +01:00
Sander Roosendaal
b61e1348c4
Merge branch 'release/v5.10'
2017-11-20 09:36:00 +01:00
Sander Roosendaal
fa84ca0ada
Merge branch 'feature/manualranking' into develop
2017-11-18 17:44:16 -07:00
Sander Roosendaal
ec287cc4b5
manually adding ranking pieces works
2017-11-18 17:38:01 -07:00
Sander Roosendaal
b21c0c122f
manual workout form - datetime is 48 years off
2017-11-18 17:03:18 -07:00
Sander Roosendaal
0f88d004b1
adds distance pieces to OTE ranking piece (PRO)
...
The PRO ranking piece calculation for erg pieces now also calculates
distance based pieces.
2017-11-18 15:45:51 -07:00
Sander Roosendaal
d0ebf56cef
Merge tag 'v5.09' into develop
...
bug fix
2017-11-17 05:31:42 -07:00
Sander Roosendaal
665b7f7688
Merge branch 'release/v5.09'
2017-11-17 05:31:28 -07:00
Sander Roosendaal
ebc7ff7e8a
fixes bug in import all
2017-11-16 08:00:45 -06:00
Sander Roosendaal
c3ad8a8500
solving issue #232 and #234
2017-11-15 20:05:14 -06:00
Sander Roosendaal
7e02f4ab37
Merge tag 'v5.07' into develop
...
more than 50 C2 workouts to import
2017-11-14 21:55:11 -06:00
Sander Roosendaal
7e8032744f
Merge branch 'release/v5.07'
2017-11-14 21:53:02 -06:00
Sander Roosendaal
ffd2abc815
imports more than 50 workouts from C2
2017-11-14 21:49:53 -06:00
Sander Roosendaal
8f3c59fa2f
Merge tag 'v5.06' into develop
...
bug fixes
2017-11-14 00:59:11 +01:00
Sander Roosendaal
343a64c794
Merge branch 'release/v5.06'
2017-11-14 00:56:45 +01:00
Sander Roosendaal
14a10becf1
some bug fixes
...
Email processing now correctly processes message body on AttributeError
Workflow page now loads correctly - threw Error 500 when user deleted
all his FavoriteCharts
2017-11-13 14:51:28 +01:00
Sander Roosendaal
f1bed2ec4f
Merge tag 'v5.05' into develop
...
improved email queue management
2017-11-10 14:17:33 +01:00
Sander Roosendaal
0028b93f30
Merge branch 'release/v5.05'
2017-11-10 14:17:18 +01:00
Sander Roosendaal
9e636ccd67
more robust for parser errors
2017-11-10 14:10:42 +01:00
Sander Roosendaal
bb77efb6fc
bug fix javascript upload
2017-11-10 13:56:04 +01:00
Sander Roosendaal
92e49fe468
Merge branch 'bugfix/emails' into develop
2017-11-10 13:23:58 +01:00
Sander Roosendaal
ec4e756e50
type correction
2017-11-10 12:54:29 +01:00
Sander Roosendaal
4f34668c27
tests if message encoded
2017-11-10 11:53:08 +01:00
Sander Roosendaal
d19ddec79e
some fixes email processing
2017-11-10 11:40:47 +01:00
Sander Roosendaal
768d1540e6
Merge tag 'v5.04' into develop
...
bug fix
2017-11-08 15:28:06 +01:00
Sander Roosendaal
23ff227096
Merge branch 'release/v5.04'
2017-11-08 15:27:49 +01:00
Sander Roosendaal
7acc41fa6f
small refinement upload
2017-11-08 15:16:05 +01:00
