Commit Graph

88 Commits

Author SHA1 Message Date
e.stoyushko
2c9d579a54 Update models.py 2019-10-31 11:42:57 +00:00
Kuroshini
37fb67cbb3 Fix subqueries 2019-10-28 14:40:39 +03:00
Anatoly
1e3c80ad0c small fix 2019-10-23 17:40:42 +03:00
Anatoly
7dbf594809 Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/account/tasks.py
2019-10-23 15:54:21 +03:00
Semyon Yekhmenin
81bd7b4912 Feature/currency sign 2019-10-23 11:58:33 +00:00
evgeniy-st
9c9c49d900 update slug fields 2019-10-23 12:25:50 +03:00
Anatoly
90e53d738d Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/main/models.py
#	apps/news/admin.py
#	apps/news/models.py
#	apps/news/serializers.py
#	apps/news/views.py
#	project/settings/base.py
#	project/settings/production.py
#	requirements/base.txt
2019-10-23 12:00:58 +03:00
Anatoly
3d68f1ba29 added imgae_url field to model Award (gm-183) 2019-10-22 18:20:34 +03:00
evgeniy-st
d1c9e649b7 Remove metadatacontent 2019-10-22 17:05:54 +03:00
Semyon Yekhmenin
1ff571b767 Feature/mobile features 2019-10-17 13:29:29 +00:00
Anatoly
b2f900d15d gm-148: refactored 2019-10-04 13:25:42 +03:00
Kuroshini
516c4458ac Make model name translated 2019-10-01 17:11:24 +03:00
Kuroshini
33478580aa Review fixes 2019-09-30 16:40:46 +03:00
Kuroshini
beb031d0b6 Add slug to carousel serializer 2019-09-30 14:05:38 +03:00
Anatoly
413c93bead fixed problem with image, refactored favorites, collection 2019-09-20 13:35:59 +03:00
Anatoly
a09d6b28f1 Merge branch 'feature/gm-80' into develop
# Conflicts:
#	apps/establishment/serializers/back.py
2019-09-19 14:32:10 +03:00
Semyon Yekhmenin
e2e7734bf2 Feature/advertisements update 2019-09-19 07:05:32 +00:00
Anatoly
540a819f94 gm-80: in progress 2019-09-18 18:46:24 +03:00
Semyon Yekhmenin
28e8bac84e Added priority to site features 2019-09-18 12:51:39 +00:00
Anatoly
6e7a617a67 Added field - vintage_year, absolute image_url to Carousel ListAPIView 2019-09-18 13:14:57 +03:00
Anatoly
306cb76e1c GM-25: Added comments 2019-09-16 09:35:20 +03:00
Anatoly
555aa9a4e1 GM-25: Получение главной зоны 2019-09-13 18:08:36 +03:00
evgeniy-st
aa88721800 sites endpoint 2019-09-04 10:14:11 +03:00
evgeniy-st
a2ef5bbfd5 small refactor 2019-09-02 12:00:19 +03:00
Dmitriy Kuzmenko
fc4facbf83 add contacts for establishments 2019-09-01 12:35:09 +03:00
Dmitriy Kuzmenko
2a16198a8b add award filter 2019-08-29 15:00:30 +03:00
Dmitriy Kuzmenko
9a7052026b add metadata 2019-08-29 14:51:55 +03:00
Dmitriy Kuzmenko
253da87a99 URL refactoring 2019-08-28 11:35:38 +03:00
Dmitriy Kuzmenko
3d7727b4b4 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-08-28 10:15:29 +03:00
Dmitriy Kuzmenko
262e98b9e1 add awards 2019-08-28 10:15:17 +03:00
evgeniy-st
f65b1caf9a Fix redirect settings 2019-08-28 09:49:50 +03:00
evgeniy-st
f33fa21c0c update site feautures 2019-08-26 18:12:15 +03:00
Dmitriy Kuzmenko
f86a94274d put cookies in request, refactored JWTViewMixin, change endpoint to get news list 2019-08-23 09:42:31 +03:00
evgeniy-st
948cff2ac0 fix string method for sitesettings 2019-08-22 14:29:23 +03:00
evgeniy-st
e839094e28 Site settings and determine user location over ip 2019-08-22 14:23:02 +03:00
evgeniy-st
6cba003960 Site features 2019-08-21 11:37:22 +03:00
evgeniy-st
6e57679e86 SiteSettings: model, migration, view, serializer 2019-08-19 16:55:16 +03:00
Dmitriy Kuzmenko
68f6e0bc9c version 0.0.6 new models and api for News 2019-08-13 15:23:00 +03:00