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 |
|
Timofey Malinin
|
595c665204
|
Merge branch 'worker_fix' into 'dev'
fix filters cache
See merge request spatial/postamates!90
|
3 years ago |
|
timofejmalinin
|
828538c929
|
fix filters cache
|
3 years ago |
|
Timofey Malinin
|
89f100d535
|
Merge branch 'worker_fix' into 'dev'
no threading
See merge request spatial/postamates!89
|
3 years ago |
|
timofejmalinin
|
c48d57796d
|
no threading
|
3 years ago |
|
Timofey Malinin
|
5b7217545c
|
Merge branch 'worker_fix' into 'dev'
debug?
See merge request spatial/postamates!88
|
3 years ago |
|
timofejmalinin
|
6883246de6
|
debug?
|
3 years ago |
|
Timofey Malinin
|
2ddf0ef59d
|
Merge branch 'worker_fix' into 'dev'
fix for worker.yml concurrency
See merge request spatial/postamates!87
|
3 years ago |
|
timofejmalinin
|
0e58851ab1
|
fix for worker.yml concurrency
|
3 years ago |
|
Timofey Malinin
|
12cac9a6a7
|
Merge branch 'ml_trigger_fix' into 'dev'
ml_trigger_fix
See merge request spatial/postamates!86
|
3 years ago |
|
AlexP077
|
d69b37ba7b
|
ml_trigger_fix
|
3 years ago |
|
Timofey Malinin
|
9e376d294c
|
Merge branch 'dev_1' into 'dev'
fix other objects
See merge request spatial/postamates!85
|
3 years ago |
|
timofejmalinin
|
6d87face15
|
fix other objects
|
3 years ago |
|
Timofey Malinin
|
5619bfc8e7
|
Merge branch 'count_pvz_status' into 'dev'
pvz_count_status
See merge request spatial/postamates!84
|
3 years ago |
|
AlexP077
|
684cba5e47
|
pvz_count_status
|
3 years ago |
|
Timofey Malinin
|
6823265c53
|
Merge branch 'close_connections_ML' into 'dev'
fix logs
See merge request spatial/postamates!83
|
3 years ago |
|
timofejmalinin
|
4aa35f4bef
|
fix logs
|
3 years ago |
|
Timofey Malinin
|
30223c9a18
|
Merge branch 'close_connections_ML' into 'dev'
fix connections ML
See merge request spatial/postamates!82
|
3 years ago |
|
timofejmalinin
|
a7119234e4
|
fix connections ML
|
3 years ago |
|
Timofey Malinin
|
a19dc7c0fb
|
Merge branch 'some_fixes' into 'dev'
fix sql command
See merge request spatial/postamates!81
|
3 years ago |
|
timofejmalinin
|
5bb347d8af
|
fix sql command
|
3 years ago |
|
Timofey Malinin
|
3473f79b0e
|
Merge branch 'some_fixes' into 'dev'
fix sql command
See merge request spatial/postamates!80
|
3 years ago |
|
timofejmalinin
|
7a2a01b2b7
|
fix sql command
|
3 years ago |
|
Timofey Malinin
|
52c001df3e
|
Merge branch 'some_fixes' into 'dev'
fix models.py
See merge request spatial/postamates!79
|
3 years ago |
|
timofejmalinin
|
f33b5857bf
|
fix models.py
|
3 years ago |
|
Timofey Malinin
|
3d7e9c165a
|
Merge branch 'count_pvz_fix' into 'dev'
count_pvz_fix
See merge request spatial/postamates!78
|
3 years ago |
|
AlexP077
|
c767e63f98
|
count_pvz_fix
|
3 years ago |
|
AlexP077
|
211ee42300
|
start_matching_func
|
3 years ago |
|
Timofey Malinin
|
b1a2cd6552
|
Merge branch 'run_ml_for_pvz' into 'dev'
run_ml_for_pvz
See merge request spatial/postamates!76
|
3 years ago |
|
AlexP077
|
4205cddf9b
|
run_ml_for_pvz
|
3 years ago |
|
Timofey Malinin
|
d8a135d2f5
|
Merge branch '1st_stage_fixes' into 'dev'
stage_1_fixes
See merge request spatial/postamates!75
|
3 years ago |
|
AlexP077
|
3c6d43a5e5
|
stage_1_fixes
|
3 years ago |
|
Timofey Malinin
|
5a682af769
|
Merge branch 'count_pvz' into 'dev'
count_pvz_for_placementpoint
See merge request spatial/postamates!71
|
3 years ago |
|
Aleksandr Popov
|
2897408cba
|
Merge branch 'filters_info_fix' into 'dev'
filters_info_fix
See merge request spatial/postamates!74
|
3 years ago |
|
AlexP077
|
bbde2aed0e
|
filters_info_fix
|
3 years ago |
|
Timofey Malinin
|
8eab84b959
|
Merge branch 'fix_files' into 'dev'
Fix cache delete
See merge request spatial/postamates!73
|
3 years ago |
|
timofejmalinin
|
f5ec5fbcb3
|
Fix cache delete
|
3 years ago |
|
Aleksandr Popov
|
95f30f1891
|
Merge branch 'group_dist_filter_fix' into 'dev'
dist_filter_fix
See merge request spatial/postamates!72
|
3 years ago |
|
AlexP077
|
edef475751
|
dist_filter_fix
|
3 years ago |
|
AlexP077
|
e159fb24e5
|
count_pvz_for_placementpoint
|
3 years ago |
|
Timofey Malinin
|
145fe263f4
|
Merge branch 'distance' into 'dev'
add_distances_to_point_qs
See merge request spatial/postamates!70
|
3 years ago |
|
AlexP077
|
2bdf9679dd
|
add_distances_to_point_qs
|
3 years ago |
|
Timofey Malinin
|
f7ff52ea24
|
Merge branch 'fix_files' into 'dev'
Fix cache
See merge request spatial/postamates!69
|
3 years ago |
|
timofejmalinin
|
33bcde5e09
|
Fix cache
|
3 years ago |
|
Timofey Malinin
|
bd5b5047ad
|
Merge branch 'fix_files' into 'dev'
Test
See merge request spatial/postamates!68
|
3 years ago |
|
timofejmalinin
|
69fd9839cd
|
Test
|
3 years ago |
|
Timofey Malinin
|
4215a2ead1
|
Merge branch 'fix_files' into 'dev'
Admin panel fix
See merge request spatial/postamates!67
|
3 years ago |
|
timofejmalinin
|
3348cfce63
|
Admin panel fix
|
3 years ago |
|
Timofey Malinin
|
988d410212
|
Merge branch 'fix_routing' into 'dev'
Fix routing
See merge request spatial/postamates!65
|
3 years ago |
