Sander Roosendaal
|
d5056cb029
|
Merge branch 'release/v2.63'
|
2017-05-10 21:06:03 +02:00 |
|
Sander Roosendaal
|
ce5de5cbb6
|
trying with queue
|
2017-05-10 21:03:53 +02:00 |
|
Sander Roosendaal
|
104094b4f5
|
Merge tag 'v2.62' into develop
removed Workout object
|
2017-05-10 20:59:05 +02:00 |
|
Sander Roosendaal
|
cf653b6cc0
|
Merge branch 'release/v2.62'
|
2017-05-10 20:58:49 +02:00 |
|
Sander Roosendaal
|
5f948dadf9
|
removed Workout object
|
2017-05-10 20:56:44 +02:00 |
|
Sander Roosendaal
|
e78b8ffc22
|
Merge tag 'v2.61' into develop
furhter tests
|
2017-05-10 17:32:23 +02:00 |
|
Sander Roosendaal
|
df4143cf13
|
Merge branch 'release/v2.61'
|
2017-05-10 17:32:06 +02:00 |
|
Sander Roosendaal
|
7fdac73358
|
further settings test
|
2017-05-10 17:30:58 +02:00 |
|
Sander Roosendaal
|
8ad20dccda
|
Merge tag 'v2.60' into develop
further debugging
|
2017-05-10 17:13:48 +02:00 |
|
Sander Roosendaal
|
b92bc7dcdf
|
Merge branch 'release/v2.60'
|
2017-05-10 17:13:28 +02:00 |
|
Sander Roosendaal
|
c31e51145c
|
runs under dev
|
2017-05-10 17:12:08 +02:00 |
|
Sander Roosendaal
|
6008adc97a
|
Merge tag 'v2.59' into develop
debugging
|
2017-05-10 17:09:08 +02:00 |
|
Sander Roosendaal
|
028a2bc605
|
Merge branch 'release/v2.59'
|
2017-05-10 17:07:49 +02:00 |
|
Sander Roosendaal
|
bbce299277
|
import django in tasks
|
2017-05-10 17:06:34 +02:00 |
|
Sander Roosendaal
|
638b0dd09b
|
Merge tag 'v2.58' into develop
added settings to standalone tasks
|
2017-05-10 16:59:58 +02:00 |
|
Sander Roosendaal
|
bf5d987c07
|
Merge branch 'release/v2.58'
|
2017-05-10 16:59:40 +02:00 |
|
Sander Roosendaal
|
ac2bdbce3d
|
improved standalone tasks
|
2017-05-10 16:57:12 +02:00 |
|
Sander Roosendaal
|
e40db4c55c
|
Merge tag 'v2.57' into develop
another try
|
2017-05-10 14:54:32 +02:00 |
|
Sander Roosendaal
|
8d21cacf48
|
Merge branch 'release/v2.57'
|
2017-05-10 14:53:53 +02:00 |
|
Sander Roosendaal
|
50eda6b135
|
try with standalone
|
2017-05-10 14:51:06 +02:00 |
|
Sander Roosendaal
|
be2f6803d3
|
Merge tag 'v2.56' into develop
job decorator test
|
2017-05-10 13:03:44 +02:00 |
|
Sander Roosendaal
|
0ca440fe7c
|
Merge branch 'release/v2.56'
|
2017-05-10 13:03:23 +02:00 |
|
Sander Roosendaal
|
dff5b2a975
|
further testing job
|
2017-05-10 13:02:13 +02:00 |
|
Sander Roosendaal
|
a173a4d601
|
Merge tag 'v2.55' into develop
further testing
|
2017-05-10 12:48:06 +02:00 |
|
Sander Roosendaal
|
49a3fe8c91
|
Merge branch 'release/v2.55'
|
2017-05-10 12:47:52 +02:00 |
|
Sander Roosendaal
|
44fa1ec056
|
added further testing
|
2017-05-10 12:46:27 +02:00 |
|
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 |
|