Kuroshini
|
3876a6b885
|
Revert "news creation extra kwargs possible fix"
This reverts commit b9a652a
|
2019-12-18 15:03:31 +03:00 |
|
Kuroshini
|
b9a652aeb6
|
news creation extra kwargs possible fix
|
2019-12-18 15:02:19 +03:00 |
|
Kuroshini
|
44c2616efe
|
must of the week is compulsory argument for news creation now
|
2019-12-18 14:59:20 +03:00 |
|
Kuroshini
|
a8003dc1cc
|
fix issue with news creation
|
2019-12-18 14:56:47 +03:00 |
|
Kuroshini
|
2a0d153be5
|
remove filtering news by locale
|
2019-12-18 14:52:49 +03:00 |
|
alex
|
ffa8409032
|
fix establishment description
|
2019-12-18 12:43:18 +03:00 |
|
Anatoly
|
2401763e6c
|
Merge branch 'develop' into feature/guides
|
2019-12-18 12:03:45 +03:00 |
|
Anatoly
|
54eee9565c
|
fix guide element label photo
|
2019-12-18 12:02:39 +03:00 |
|
Kuroshini
|
53387886cd
|
must of the week
|
2019-12-17 23:13:57 +03:00 |
|
Kuroshini
|
23299ad4a1
|
news active logic depended on activated descriptions #3
|
2019-12-17 20:06:31 +03:00 |
|
Kuroshini
|
b9f65a3b18
|
news active logic depended on activated descriptions #2
|
2019-12-17 20:03:11 +03:00 |
|
Kuroshini
|
b469770ff0
|
news active logic depended on activated descriptions
|
2019-12-17 20:01:36 +03:00 |
|
Kuroshini
|
f0585b3ebc
|
fix carousel slugs
|
2019-12-17 18:37:51 +03:00 |
|
Kuroshini
|
41f6b8c930
|
return copied from model after duplication
|
2019-12-17 18:11:32 +03:00 |
|
Kuroshini
|
4da8465c85
|
Merge branch 'feature/news-description-active' into develop
|
2019-12-17 17:34:46 +03:00 |
|
Kuroshini
|
22aefc2f83
|
description is_active logic
|
2019-12-17 17:34:20 +03:00 |
|
Anatoly
|
5032906483
|
revision collection view
|
2019-12-17 17:17:48 +03:00 |
|
evgeniy-st
|
8a7b583154
|
added country_name to endpoint 'determine-location'
|
2019-12-17 16:49:56 +03:00 |
|
Kuroshini
|
900846951e
|
localized description
|
2019-12-17 16:09:03 +03:00 |
|
Kuroshini
|
2863a338e1
|
translated fields work out
|
2019-12-17 16:09:03 +03:00 |
|
Anatoly
|
5d69f2a5e7
|
Merge branch 'develop' into feature/guides
|
2019-12-17 15:21:27 +03:00 |
|
Anatoly
|
387e164510
|
merged from develop, added merge migration and refactored a little bit
|
2019-12-17 15:20:55 +03:00 |
|
alex
|
d29a46c1a5
|
news by_locale
|
2019-12-17 15:13:16 +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 |
|
Kuroshini
|
7608fcb527
|
fix #2
|
2019-12-17 14:22:08 +03:00 |
|
Kuroshini
|
89f8fcf73e
|
fix
|
2019-12-17 14:20:21 +03:00 |
|
Kuroshini
|
f36713ab02
|
description to locale is required now
|
2019-12-17 14:14:21 +03:00 |
|
Kuroshini
|
73f0dd13a5
|
duplicates fix
|
2019-12-17 14:00:52 +03:00 |
|
Anatoly
|
dbbb526902
|
Refactored mechanism to find similar objects. Added endpoints to product app.
|
2019-12-17 13:02:46 +03:00 |
|
alex
|
6a987532ba
|
fix recipe duplicates
|
2019-12-17 11:54:50 +03:00 |
|
alex
|
959eb33043
|
Merge remote-tracking branch 'origin/develop' into recipe
|
2019-12-17 08:56:09 +03:00 |
|
Kuroshini
|
b34ab11fd8
|
description news availability management from BO
|
2019-12-16 23:48:55 +03:00 |
|
Kuroshini
|
0a25ec3e7c
|
news duplication info
|
2019-12-16 23:16:19 +03:00 |
|
Олег Хаятов
|
c456e43f80
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!180
|
2019-12-16 19:41:59 +00:00 |
|
dormantman
|
04bada1cd1
|
Fixed object names
|
2019-12-16 22:32:38 +03:00 |
|
Kuroshini
|
913da37b84
|
return collections dsc field
|
2019-12-16 22:26:38 +03:00 |
|
dormantman
|
1545ca9035
|
Added description field
|
2019-12-16 22:26:14 +03:00 |
|
Kuroshini
|
10ca6d8932
|
remove hardcode from migration
|
2019-12-16 22:13:25 +03:00 |
|
Олег Хаятов
|
1ce8686368
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!179
|
2019-12-16 19:10:33 +00:00 |
|
dormantman
|
b09d3af35f
|
Hardcode collection description migrate
|
2019-12-16 22:00:42 +03:00 |
|
Kuroshini
|
e68142bf2e
|
BO news list by country
|
2019-12-16 18:43:15 +03:00 |
|
Kuroshini
|
b25f387c9b
|
news search
|
2019-12-16 17:29:01 +03:00 |
|
Kuroshini
|
f4fff47d68
|
return news object after binding #2
|
2019-12-16 17:04:52 +03:00 |
|
Kuroshini
|
cf001b3aab
|
return news object after binding
|
2019-12-16 17:02:45 +03:00 |
|
alex
|
6c483dd228
|
recipe transfer
|
2019-12-16 17:02:20 +03:00 |
|
dormantman
|
fb05243281
|
Change related_object field
|
2019-12-16 16:55:11 +03:00 |
|
Kuroshini
|
586f6e373b
|
Anatoly, dont erase working code during refactoring pls
|
2019-12-16 15:30:05 +03:00 |
|
dormantman
|
33ac0ad3e6
|
Delete useless import
|
2019-12-16 14:03:44 +03:00 |
|
Олег Хаятов
|
23522eb1f0
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!178
|
2019-12-16 11:02:27 +00:00 |
|
dormantman
|
c2a520b518
|
Reformat code style
|
2019-12-16 13:59:04 +03:00 |
|