Commit Graph

157 Commits

Author SHA1 Message Date
alex
17fdc7705e news transfer fin 2019-12-23 11:53:34 +03:00
alex
56b2b243da Merge remote-tracking branch 'origin/develop' into nes_transfer 2019-12-23 08:28:28 +03:00
Kuroshini
ee8d133248 Example for tags creation 2019-12-20 20:11:58 +03:00
alex
2499c0406d news transfer serializer 2019-12-20 16:19:04 +03:00
alex
ffa8409032 fix establishment description 2019-12-18 12:43:18 +03:00
Anatoly
471239983e Merge branch 'develop' into feature/guides
# Conflicts:
#	apps/collection/views/back.py
#	apps/transfer/models.py
2019-12-17 14:47:26 +03:00
alex
6c483dd228 recipe transfer 2019-12-16 17:02:20 +03:00
Anatoly
ab82d9a2d6 refactoring guide and collection endpoints 2019-12-10 16:24:37 +03:00
Kuroshini
912431690d rename attrs #2 2019-12-09 15:21:39 +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
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
alex
86e29173ba transfer partner 2019-11-21 16:45:27 +03:00
alex
9156d9cc35 fix partner migrations 2019-11-21 14:00:17 +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
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
Anatoly
c293ae4b9c remove debug tracer 2019-11-15 21:04:37 +03:00
alex
422b89ede9 fix comment transfer 2019-11-15 16:10:01 +03:00
Anatoly
4b4dc27a49 added method to transfer advertisement 2019-11-15 15:59:02 +03:00
alex
71dd52c194 news in_favs nested fix 2019-11-15 15:28:27 +03:00
Dmitriy Kuzmenko
4a53cca6c0 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 12:15:03 +03:00
Dmitriy Kuzmenko
41c842e224 change review transfer 2019-11-15 12:14:53 +03:00
alex
1348a1def6 notification serializer start 2019-11-15 10:36:23 +03:00
alex
418ef27694 transfer newsletter_subscriber 2019-11-15 10:21:28 +03:00
Dmitriy Kuzmenko
6b83003eac add product review loader 2019-11-15 02:44:09 +03:00
alex
bf8afab0fb refactor refactor reviews 2019-11-14 15:33:46 +03:00
Anatoly
2ca4ab6bb5 fixed product related tags 2019-11-14 14:05:51 +03:00
Anatoly
688bc851bb fixed product related tags 2019-11-14 12:39:09 +03:00
Anatoly
92ee7537a3 fixed assemblage tags 2019-11-14 10:23:18 +03:00
Anatoly
b56829accc added command add_cepage_tag_category to link cepage tag category with wine region 2019-11-13 16:30:30 +03:00
alex
3a5c34fd4f comment command 2019-11-12 18:29:24 +03:00
alex
3ace542deb comment created date 2019-11-12 18:12:14 +03:00
Anatoly
70614abc03 - renamed fix_wine_color_tag to fix_wine_color_tag
- added command add_assemblage_tag
- added transfer commands: cepage, assemblage (execute in this order)
2019-11-12 17:40:15 +03:00
alex
3f2de46420 fix filter comment by establishment and user 2019-11-12 16:38:06 +03:00