littlewolf
|
8f18320171
|
Merge branch 'develop' into origin/feature/migrate-etablishment
# Conflicts:
# apps/establishment/transfer_data.py
# apps/transfer/management/commands/transfer.py
|
2019-10-31 07:44:07 +03:00 |
|
Dmitriy Kuzmenko
|
1bbe481a39
|
add settings for phone
|
2019-10-31 00:16:33 +03:00 |
|
alex
|
4343060c74
|
Merge branch 'migration_fix' into HEAD
|
2019-10-30 15:49:32 +03:00 |
|
alex
|
8c3306628e
|
news transfer
|
2019-10-30 15:48:32 +03:00 |
|
littlewolf
|
a67df32086
|
Fix establishment_mark
|
2019-10-30 12:55:44 +03:00 |
|
evgeniy-st
|
e371fdceea
|
Merge branch 'develop' into migration_fix
|
2019-10-30 11:50:30 +03:00 |
|
alex
|
adcc43309b
|
fix settings
|
2019-10-29 08:26:52 +03:00 |
|
alex
|
4e868c2d8d
|
transfer dishes
|
2019-10-29 08:25:03 +03:00 |
|
Dmitriy Kuzmenko
|
853b0e047e
|
add settings for dev server
|
2019-10-28 11:41:47 +03:00 |
|
Anatoly
|
37d745eeaa
|
added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype
|
2019-10-26 18:54:22 +03:00 |
|
Anatoly
|
e3616ee7f8
|
change news_preview geometry string on 300x2260
|
2019-10-25 17:32:25 +03:00 |
|
Kuroshini
|
dd0b595132
|
Review fixes
|
2019-10-25 14:13:19 +03:00 |
|
Kuroshini
|
7f23f0e891
|
Establishment each hour reindexing
|
2019-10-25 14:13:19 +03:00 |
|
michail
|
d79946633e
|
fix get_description for recipe.py
|
2019-10-25 13:17:35 +05:00 |
|
alex
|
95811c7437
|
return to localhost
|
2019-10-25 10:33:31 +03:00 |
|
alex
|
cd294961e0
|
Merge remote-tracking branch 'origin/develop' into feature/migration
|
2019-10-25 10:00:25 +03:00 |
|
Semyon Yekhmenin
|
2b9c9d14ef
|
Added temporary stub for international news logic (hardcoded news id's)
|
2019-10-24 12:21:59 +00:00 |
|
alex
|
3ce7e186f7
|
migrate from legacy news
|
2019-10-24 14:01:38 +03:00 |
|
alex
|
0adac058c5
|
Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-24 13:11:05 +03:00 |
|
alex
|
647147bf03
|
Merge branch 'develop' into feature/migrate-news
|
2019-10-24 12:28:51 +03:00 |
|
Kuroshini
|
d5609e4cb8
|
Works now filter first part
|
2019-10-23 17:29:00 +03:00 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
Anatoly
|
fd2c1e0ca6
|
Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/production.py
|
2019-10-23 15:37:14 +03:00 |
|
Anatoly
|
6a9f11e989
|
merge from develop
|
2019-10-23 15:31:04 +03:00 |
|
alex
|
636b15a30c
|
mysql to docker-compose
|
2019-10-23 14:59:40 +03:00 |
|
Sergey Melihov
|
883f94c80a
|
Merge branch 'feature/password-changed-notification' into 'develop'
Feature/password changed notification
See merge request gm/gm-backend!58
|
2019-10-23 11:51:15 +00: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 |
|
evgeniy-st
|
766b6659f1
|
Models created: Product, OnlineProduct (proxy), ProductType, ProductSubtype
|
2019-10-23 11:31:45 +03:00 |
|
littlewolf
|
fed2aae7f1
|
Fix settings/base
Add transfer_data to location
|
2019-10-23 09:30:36 +03:00 |
|
littlewolf
|
f09bd5996a
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# project/settings/base.py
# requirements/base.txt
|
2019-10-23 09:27:42 +03:00 |
|
evgeniy-st
|
45a3cd4b2b
|
Merge branch 'develop' into feature/product
|
2019-10-22 15:58:51 +03:00 |
|
evgeniy-st
|
a9f995adbb
|
Merge branch 'feature/gm-192' into develop
|
2019-10-21 10:30:40 +03:00 |
|
michail
|
019a10db52
|
commit
|
2019-10-21 11:07:54 +05:00 |
|
Kuroshini
|
b77c654c6c
|
Open now filter
|
2019-10-18 02:38:59 +03:00 |
|
evgeniy-st
|
1cbfb12594
|
Merge remote-tracking branch 'origin/develop' into feature/gm-148
|
2019-10-17 16:58:30 +03:00 |
|
evgeniy-st
|
19b3502f58
|
revert auth backends
|
2019-10-17 14:34:31 +03:00 |
|
Anatoly
|
8a363498f5
|
change broker url
|
2019-10-17 14:28:39 +03:00 |
|
Anatoly
|
0c2b657244
|
small fix
|
2019-10-17 13:47:59 +03:00 |
|
Anatoly
|
26ff9963d8
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# requirements/base.txt
|
2019-10-17 13:43:24 +03:00 |
|
Anatoly
|
e2c27bd2e1
|
switched broker storage from rabbtimq to redis
|
2019-10-17 13:42:11 +03:00 |
|
evgeniy-st
|
92529f4c5b
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 17:17:35 +03:00 |
|
evgeniy-st
|
60cdec99e0
|
refactor tags
|
2019-10-15 17:17:03 +03:00 |
|
Kuroshini
|
9c09f000fb
|
Password changed notification email
|
2019-10-15 16:32:47 +03:00 |
|
Anatoly
|
2d830b2821
|
Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
|
2019-10-15 12:08:23 +03:00 |
|
Anatoly
|
6f6717efdc
|
Merge branch 'develop' into feature/gm-192
# Conflicts:
# apps/account/views/common.py
# project/urls/back.py
|
2019-10-15 11:47:14 +03:00 |
|
Anatoly
|
2b35d3473b
|
fix settings
|
2019-10-14 18:23:03 +03:00 |
|
Anatoly
|
228cb72c36
|
Merge branch 'develop' into feature/gm-148
|
2019-10-14 18:19:46 +03:00 |
|
Kuroshini
|
6fa0051c93
|
Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
|
2019-10-14 15:53:40 +03:00 |
|
evgeniy-st
|
0d7104eace
|
Merge branch 'develop' into feature/gm-192
|
2019-10-11 16:44:54 +03:00 |
|
Anatoly
|
32d56ffe83
|
Merge branch 'develop' into feature/gm-148
|
2019-10-11 16:34:06 +03:00 |
|