Aleksandr Popov
|
0a08940f2f
|
Merge branch 'ml_on' into 'dev'
ml_on
See merge request spatial/postamates!114
|
2 years ago |
|
AlexP077
|
37b9fb7690
|
ml_on
|
2 years ago |
|
Aleksandr Popov
|
6f11c780e4
|
Merge branch 'matched_points_dist_fix' into 'dev'
matched_prepoints_dist_fix
See merge request spatial/postamates!113
|
2 years ago |
|
AlexP077
|
78f6831272
|
matched_prepoints_dist_fix
|
2 years ago |
|
Timofey Malinin
|
b529a763a9
|
Merge branch 'move_ml_and_calc' into 'dev'
move_calculations
See merge request spatial/postamates!112
|
2 years ago |
|
AlexP077
|
4218a0b23f
|
move_calculations
|
2 years ago |
|
Aleksandr Popov
|
a64a8051a3
|
Merge branch 'bugfix' into 'dev'
bugfixes
See merge request spatial/postamates!111
|
2 years ago |
|
AlexP077
|
b207044182
|
bugfixes
|
2 years ago |
|
Timofey Malinin
|
d21717b307
|
Merge branch 't.malinin-dev-patch-46950' into 'dev'
Update README.md
See merge request spatial/postamates!109
|
2 years ago |
|
Timofey Malinin
|
897f47efc2
|
Update README.md
|
2 years ago |
|
Aleksandr Popov
|
a25eeec9e4
|
Merge branch 'sample_trn_fix' into 'dev'
smaple_trn_fix
See merge request spatial/postamates!108
|
2 years ago |
|
AlexP077
|
06970b1ce5
|
smaple_trn_fix
|
2 years ago |
|
Aleksandr Popov
|
e4d5369447
|
Merge branch 'fix_1' into 'dev'
delete_preplacement_fix
See merge request spatial/postamates!107
|
2 years ago |
|
AlexP077
|
02cbebdc0e
|
delete_preplacement_fix
|
2 years ago |
|
Aleksandr Popov
|
c0c1211c53
|
Merge branch '2nd_stage_minor_fixes' into 'dev'
delete_preplacement
See merge request spatial/postamates!106
|
2 years ago |
|
AlexP077
|
332683bcc7
|
delete_preplacement
|
2 years ago |
|
Timofey Malinin
|
9e5816b66b
|
Merge branch '2nd_stage_minor_fixes' into 'dev'
delete_preplacement
See merge request spatial/postamates!105
|
2 years ago |
|
AlexP077
|
53c8c632ec
|
delete_preplacement
|
2 years ago |
|
Timofey Malinin
|
5d6b70e64a
|
Merge branch 'fix_ml' into 'dev'
fix ml import file
See merge request spatial/postamates!104
|
2 years ago |
|
timofejmalinin
|
774b3473b8
|
fix ml import file
|
2 years ago |
|
Timofey Malinin
|
36a49be5ef
|
Merge branch 'ml_to_task' into 'dev'
ml_to_celery
See merge request spatial/postamates!103
|
2 years ago |
|
AlexP077
|
65aad125f7
|
ml_to_celery
|
2 years ago |
|
Timofey Malinin
|
261dddda64
|
Merge branch 'fix' into 'dev'
fix
See merge request spatial/postamates!102
|
2 years ago |
|
AlexP077
|
93c591709a
|
fix
|
2 years ago |
|
Timofey Malinin
|
be5e215e7b
|
Merge branch 'preplacement_raschet' into 'dev'
add_preplacement_pvz_dist
See merge request spatial/postamates!101
|
2 years ago |
|
AlexP077
|
128b7436a9
|
add_preplacement_pvz_dist
|
2 years ago |
|
Timofey Malinin
|
b3dd5c724a
|
Merge branch 'preplacement_raschet' into 'dev'
start_raschet_on_preplacement
See merge request spatial/postamates!100
|
2 years ago |
|
AlexP077
|
d411815492
|
start_raschet_on_preplacement
|
2 years ago |
|
Timofey Malinin
|
6c5b34e9ca
|
Merge branch 'mathing_process' into 'dev'
load_preplacementpoints
See merge request spatial/postamates!98
|
2 years ago |
|
Timofey Malinin
|
96fe4e9006
|
Merge branch 't.malinin-dev-patch-89354' into 'dev'
Update README.md
See merge request spatial/postamates!99
|
2 years ago |
|
Timofey Malinin
|
246a313adf
|
Update README.md
|
2 years ago |
|
AlexP077
|
a073636284
|
load_preplacementpoints
|
2 years ago |
|
Timofey Malinin
|
18c68df5c8
|
Merge branch 't.malinin-dev-patch-07124' into 'dev'
Update README.md
See merge request spatial/postamates!97
|
2 years ago |
|
Timofey Malinin
|
23957bad20
|
Update README.md
|
2 years ago |
|
Timofey Malinin
|
a235ff6874
|
Merge branch 't.malinin-dev-patch-26703' into 'dev'
Update django.yml
See merge request spatial/postamates!96
|
3 years ago |
|
Timofey Malinin
|
0334b052ce
|
Update django.yml
|
3 years ago |
|
Timofey Malinin
|
0aa0b0ce9f
|
Merge branch 't.malinin-dev-patch-71269' into 'dev'
Update README.md
See merge request spatial/postamates!95
|
3 years ago |
|
Timofey Malinin
|
2172039fe2
|
Update README.md
|
3 years ago |
|
Timofey Malinin
|
059699ca5f
|
Merge branch 't.malinin-dev-patch-12150' into 'dev'
Update README.md
See merge request spatial/postamates!94
|
3 years ago |
|
Timofey Malinin
|
48e079a6f1
|
Update README.md
|
3 years ago |
|
Timofey Malinin
|
814d16ba48
|
Merge branch 't.malinin-dev-patch-12150' into 'dev'
Update README.md
See merge request spatial/postamates!93
|
3 years ago |
|
Timofey Malinin
|
b74172faff
|
Update README.md
|
3 years ago |
|
Timofey Malinin
|
ed72432727
|
Merge branch 't.malinin-dev-patch-12150' into 'dev'
Update README.md
See merge request spatial/postamates!92
|
3 years ago |
|
Timofey Malinin
|
1e02171e14
|
Update README.md
|
3 years ago |
|
Timofey Malinin
|
ee30b73c1f
|
Merge branch 'fix_file' into 'dev'
fix file
See merge request spatial/postamates!91
|
3 years ago |
|
timofejmalinin
|
cb600f4f2a
|
fix file
|
3 years ago |
|
Timofey Malinin
|
174e93d661
|
Merge branch '2nd_stage' into 'dev'
start_matching_func
See merge request spatial/postamates!77
|
3 years ago |
|
AlexP077
|
ef48df8ad3
|
add_pre_placementpoint
|
3 years ago |
|
AlexP077
|
89d52ab8d9
|
Merge remote-tracking branch 'origin/2nd_stage' into 2nd_stage
# Conflicts:
# service/tasks.py
|
3 years ago |
|
AlexP077
|
48f126f9c5
|
start_matching_func
|
3 years ago |
