littlewolf
|
181e9599e4
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-16 20:36:31 +03:00 |
|
Anatoly
|
f861aa419c
|
refactored transfer location serializers
|
2019-12-16 17:47:01 +03:00 |
|
littlewolf
|
4c27ad5d5a
|
Fix location address transfer
|
2019-12-16 15:37:29 +03:00 |
|
Anatoly
|
956aae281f
|
refactored fix duplicates
|
2019-12-16 13:46:52 +03:00 |
|
littlewolf
|
eb514c0ce2
|
Add clean db setup
|
2019-12-13 12:16:02 +03:00 |
|
Dmitriy Kuzmenko
|
4c872b936b
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/account/urls/back.py
# apps/account/views/back.py
# apps/transfer/models.py
|
2019-12-13 11:17:12 +03:00 |
|
littlewolf
|
6ef0e7adfe
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-13 09:18:44 +03:00 |
|
Dmitriy Kuzmenko
|
b03cd4fe09
|
add transfer command, models and crud api.
|
2019-12-12 15:37:42 +03:00 |
|
Anatoly
|
28bf782731
|
update method to remove city duplicates
|
2019-12-12 11:17:59 +03:00 |
|
Dmitriy Kuzmenko
|
86b2e708f0
|
add datamigrate and change for models
|
2019-12-11 18:12:26 +03:00 |
|
Anatoly
|
1b7c83899a
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-11 15:01:17 +03:00 |
|
Dmitriy Kuzmenko
|
9d557e4ce8
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-09 17:47:51 +03:00 |
|
Dmitriy Kuzmenko
|
6af7a7da5b
|
add footer migrations and api
|
2019-12-09 17:47:37 +03:00 |
|
Kuroshini
|
912431690d
|
rename attrs #2
|
2019-12-09 15:21:39 +03:00 |
|
Anatoly
|
d330aa5205
|
refactoring
|
2019-12-09 13:34:17 +03:00 |
|
littlewolf
|
c480089f30
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# _dockerfiles/db/Dockerfile
# apps/transfer/management/commands/transfer.py
# docker-compose.mysql.yml
# project/settings/local.py
|
2019-12-09 10:41:01 +03:00 |
|
Dmitriy Kuzmenko
|
831cb4bc81
|
add home_page
|
2019-12-06 18:17:16 +03:00 |
|
littlewolf
|
17ca27c751
|
Temp fiz
|
2019-12-06 15:28:58 +03:00 |
|
Dmitriy Kuzmenko
|
c62b4016f1
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-05 15:23:24 +03:00 |
|
Dmitriy Kuzmenko
|
f06596b5b6
|
fix review
|
2019-12-05 15:23:16 +03:00 |
|
Anatoly
|
9dc8e34e3a
|
Merge branch 'develop' into feature/transfer-guide
# Conflicts:
# apps/establishment/models.py
# apps/establishment/serializers/common.py
|
2019-12-04 20:16:21 +03:00 |
|
Anatoly
|
29ff10fb4b
|
added wine origins
|
2019-12-04 20:13:09 +03:00 |
|
Anatoly
|
627f7562ec
|
finalizing transfer guides
|
2019-12-04 14:21:54 +03:00 |
|
Dmitriy Kuzmenko
|
637903e613
|
fix scheduler
|
2019-12-03 15:15:02 +03:00 |
|
Dmitriy Kuzmenko
|
b6d0815ed0
|
add news author migration
|
2019-12-03 09:59:11 +03:00 |
|
littlewolf
|
4c273a00be
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-02 15:29:14 +03:00 |
|
Anatoly
|
076d14fd5b
|
added filter model
|
2019-12-02 13:51:48 +03:00 |
|
Anatoly
|
52872ce364
|
updated
|
2019-11-29 14:09:00 +03:00 |
|
Anatoly
|
0fb28467fb
|
updated serializer
|
2019-11-29 13:26:05 +03:00 |
|
Anatoly
|
eaeebae72a
|
in progress
|
2019-11-28 15:31:47 +03:00 |
|
Anatoly
|
8d4de46496
|
commenting out GuideElements and GuideSections from transfer models
|
2019-11-26 17:02:33 +03:00 |
|
littlewolf
|
c2b6de7322
|
Add subcommand to delete old records
|
2019-11-21 19:38:31 +03:00 |
|
littlewolf
|
a7513e6ca0
|
Add transfer cleaner
Add clean to Country, Region and City
|
2019-11-21 18:34:22 +03:00 |
|
alex
|
86e29173ba
|
transfer partner
|
2019-11-21 16:45:27 +03:00 |
|
littlewolf
|
470bd096b0
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/location/transfer_data.py
# apps/location/views/common.py
# apps/transfer/management/commands/transfer.py
# project/settings/local.py
|
2019-11-21 14:43:30 +03:00 |
|
alex
|
9156d9cc35
|
fix partner migrations
|
2019-11-21 14:00:17 +03:00 |
|
Anatoly
|
3f164459a7
|
added transfer for filling city gallery
|
2019-11-21 12:37:13 +03:00 |
|
littlewolf
|
5217e097d1
|
Add command
|
2019-11-21 11:29:35 +03:00 |
|
Anatoly
|
617552841f
|
refactored product, fix transfer and etc., see changelist
|
2019-11-21 09:58:43 +03:00 |
|
Anatoly
|
0e6a4eded2
|
fixed transfer_product_reviews
|
2019-11-20 12:10:28 +03:00 |
|
Anatoly
|
484a9a3250
|
added field - average price to model Product and transfer command
|
2019-11-19 17:37:23 +03:00 |
|
alex
|
8b194f8324
|
fix transfer review text
|
2019-11-19 16:40:03 +03:00 |
|
Anatoly
|
dce951c4f9
|
Merge branch 'develop' into feature/establishment-gallery
# Conflicts:
# apps/product/serializers/common.py
|
2019-11-17 14:25:41 +03:00 |
|
Anatoly
|
a8b3c9aa63
|
refactored galleries, added transfer script
|
2019-11-17 14:22:30 +03:00 |
|
alex
|
4e005a7a4d
|
migrate subscribers
|
2019-11-16 15:56:23 +03:00 |
|
a.feteleu
|
c725da6a9b
|
refactored transfer ads
|
2019-11-16 01:08:31 +03:00 |
|
Anatoly
|
6c82af1940
|
Merge branch 'feature/transfer-ad' into develop
# Conflicts:
# apps/advertisement/transfer_data.py
# apps/transfer/serializers/advertisement.py
|
2019-11-16 00:19:23 +03:00 |
|
Anatoly
|
31399cea83
|
added advertisement image import
|
2019-11-16 00:18:07 +03:00 |
|
Anatoly
|
671a92912e
|
remove debug tracer
|
2019-11-15 21:06:18 +03:00 |
|
Anatoly
|
6f2d41c1ad
|
added method to transfer advertisement
|
2019-11-15 21:06:18 +03:00 |
|