Sander Roosendaal
|
adf96da539
|
Merge tag 'v2.54' into develop
added rq-suit
|
2017-05-10 12:09:23 +02:00 |
|
Sander Roosendaal
|
8745a1b3b7
|
Merge branch 'release/v2.54'
|
2017-05-10 12:08:12 +02:00 |
|
Sander Roosendaal
|
f091640e96
|
adding rq-suit
|
2017-05-10 12:04:17 +02:00 |
|
Sander Roosendaal
|
9ddba3bb02
|
Merge tag 'v2.53' into develop
prolonged test task
|
2017-05-10 11:14:59 +02:00 |
|
Sander Roosendaal
|
f55705d555
|
Merge branch 'release/v2.53'
|
2017-05-10 11:14:16 +02:00 |
|
Sander Roosendaal
|
b8d9febc91
|
prolonged task
|
2017-05-10 11:12:39 +02:00 |
|
Sander Roosendaal
|
1b76ac8e8a
|
Merge tag 'v2.52' into develop
test error message
|
2017-05-10 10:36:23 +02:00 |
|
Sander Roosendaal
|
e113757046
|
Merge branch 'release/v2.52'
|
2017-05-10 10:35:57 +02:00 |
|
Sander Roosendaal
|
1e2ec0f037
|
added test error message
|
2017-05-10 10:34:45 +02:00 |
|
Sander Roosendaal
|
b2c5571922
|
Merge tag 'v2.51' into develop
trying messages
|
2017-05-10 10:22:20 +02:00 |
|
Sander Roosendaal
|
18196110fd
|
Merge branch 'release/v2.51'
|
2017-05-10 10:21:59 +02:00 |
|
Sander Roosendaal
|
addeef0edd
|
Merge branch 'feature/asynchronous' into develop
|
2017-05-10 10:12:44 +02:00 |
|
Sander Roosendaal
|
4aa7b7151a
|
messages working
|
2017-05-10 10:11:57 +02:00 |
|
Sander Roosendaal
|
c4ffddfb06
|
testing tasks and messages
|
2017-05-10 07:38:14 +02:00 |
|
Sander Roosendaal
|
5857c13330
|
Merge tag 'v2.5' into develop
trainingpeaks, watermark, upload page
|
2017-05-09 21:21:59 +02:00 |
|
Sander Roosendaal
|
1f594aa4cf
|
Merge branch 'release/v2.5'
|
2017-05-09 21:21:31 +02:00 |
|
Sander Roosendaal
|
7fd68ceb96
|
watermark, TrainingPeaks, upload page, brochure
|
2017-05-09 21:19:08 +02:00 |
|
Sander Roosendaal
|
f86e303efd
|
rolling back settings
|
2017-05-09 19:27:58 +02:00 |
|
Sander Roosendaal
|
c1e5112b17
|
changed settings_dev
|
2017-05-09 16:35:56 +02:00 |
|
Sander Roosendaal
|
abc2c5a7f1
|
Merge branch 'feature/uploadpage' into develop
|
2017-05-09 16:19:35 +02:00 |
|
Sander Roosendaal
|
48e42620bc
|
final watermark
|
2017-05-09 16:18:35 +02:00 |
|
Sander Roosendaal
|
1b47469400
|
Merge branch 'develop' into feature/uploadpage
|
2017-05-09 15:48:18 +02:00 |
|
Sander Roosendaal
|
b5acdf8498
|
mail processing
|
2017-05-09 15:48:06 +02:00 |
|
Sander Roosendaal
|
68e6a34919
|
Merge tag 'v2.44' into develop
mail processing bug fix
|
2017-05-09 15:32:38 +02:00 |
|
Sander Roosendaal
|
4faf0015ba
|
Merge branch 'hotfix/v2.44'
|
2017-05-09 15:32:08 +02:00 |
|
Sander Roosendaal
|
b51719f170
|
added queues to mailprocessing.py
|
2017-05-09 15:31:09 +02:00 |
|
Sander Roosendaal
|
46c355e710
|
settings.py
|
2017-05-09 15:24:04 +02:00 |
|
Sander Roosendaal
|
f89d20f5f2
|
watermark v3
|
2017-05-09 15:23:04 +02:00 |
|
Sander Roosendaal
|
c7e2c10d09
|
watermark v2
|
2017-05-09 15:14:30 +02:00 |
|
Sander Roosendaal
|
b0ffb38196
|
first draft watermark on flex plot
|
2017-05-09 13:36:25 +02:00 |
|
Sander Roosendaal
|
7887c46721
|
TP done
|
2017-05-09 11:46:16 +02:00 |
|
Sander Roosendaal
|
7e573d9bdf
|
UA done
|
2017-05-09 11:20:10 +02:00 |
|
Sander Roosendaal
|
cba92b8619
|
some precautions against empty workouts
|
2017-05-09 09:52:37 +02:00 |
|
Sander Roosendaal
|
faa8fa5316
|
Merge branch 'develop' into feature/uploadpage
|
2017-05-09 08:42:40 +02:00 |
|
Sander Roosendaal
|
358782fc0f
|
trainingpeaks to production
|
2017-05-08 18:10:18 +02:00 |
|
Sander Roosendaal
|
0fa374e9e7
|
Merge tag 'v2.43' into develop
hotfix TP sync
|
2017-05-07 07:08:39 +02:00 |
|
Sander Roosendaal
|
5e5cd625c8
|
Merge branch 'hotfix/v2.43'
|
2017-05-07 07:08:09 +02:00 |
|
Sander Roosendaal
|
e41e1e0ba8
|
bug fixes TP sync
|
2017-05-07 07:05:24 +02:00 |
|
Sander Roosendaal
|
4b80e30b74
|
Strava, ST, RK done
|
2017-05-05 11:54:37 +02:00 |
|
Sander Roosendaal
|
25c67319f8
|
now working
|
2017-05-05 08:40:28 +02:00 |
|
Sander Roosendaal
|
4727c1fafb
|
added brochure but doesn't show up
|
2017-05-05 08:35:38 +02:00 |
|
Sander Roosendaal
|
177c3cad74
|
Merge tag 'v2.42' into develop
TP bug fixes
|
2017-05-04 22:17:44 +02:00 |
|
Sander Roosendaal
|
4ba34cf84e
|
Merge branch 'release/v2.42'
|
2017-05-04 22:16:49 +02:00 |
|
Sander Roosendaal
|
027353338d
|
TP stuff
|
2017-05-04 22:14:59 +02:00 |
|
Sander Roosendaal
|
fc5de87053
|
Merge tag 'v2.41' into develop
rowingphysics improvements
|
2017-05-04 21:12:22 +02:00 |
|
Sander Roosendaal
|
315c8c26db
|
Merge branch 'release/v2.41'
|
2017-05-04 20:22:35 +02:00 |
|
Sander Roosendaal
|
45a5199fb1
|
Merge tag 'v2.4' into develop
runkeeper bug fix
|
2017-05-04 20:14:51 +02:00 |
|
Sander Roosendaal
|
b88a0d7f69
|
Merge branch 'hotfix/v2.4'
|
2017-05-04 20:06:40 +02:00 |
|
Sander Roosendaal
|
55dd98cbae
|
runkeeper
|
2017-05-04 20:04:13 +02:00 |
|
Sander Roosendaal
|
d633cbe812
|
removed some double filtering
|
2017-05-04 16:04:18 +02:00 |
|