e.stoyushko
|
42e822e5c1
|
Merge branch 'feature/news_model_update' into 'develop'
Updated news model with agenda and banner
See merge request gm/gm-backend!61
|
2019-10-21 14:45:34 +00:00 |
|
Semyon Yekhmenin
|
afc2127646
|
Updated news model with agenda and banner
|
2019-10-21 14:45:34 +00:00 |
|
evgeniy-st
|
e67516c324
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-21 16:47:58 +03:00 |
|
evgeniy-st
|
94502cfc73
|
added priority field to tag model (f7facf826d)
|
2019-10-21 16:47:01 +03:00 |
|
d.kuzmenko
|
e2cbecf9a9
|
Merge branch 'feature/error_translations_fix' into 'develop'
Login validation error message fix
See merge request gm/gm-backend!60
|
2019-10-21 08:10:32 +00:00 |
|
Semyon Yekhmenin
|
1332a8f65a
|
Login validation error message fix
|
2019-10-21 08:10:32 +00:00 |
|
evgeniy-st
|
a9f995adbb
|
Merge branch 'feature/gm-192' into develop
|
2019-10-21 10:30:40 +03:00 |
|
evgeniy-st
|
1cd586662a
|
fix tagcategory binding serializer
|
2019-10-21 10:12:30 +03:00 |
|
evgeniy-st
|
21e3f76f5a
|
Backoffice Tag&TagCategory
|
2019-10-18 18:02:24 +03:00 |
|
Anatoly
|
7be7315cef
|
added filters and endpoint to get winery list
|
2019-10-18 18:00:57 +03:00 |
|
e.stoyushko
|
a553e459a1
|
Merge branch 'feature/mobile_features' into 'develop'
Feature/mobile features
See merge request gm/gm-backend!53
|
2019-10-17 13:29:29 +00:00 |
|
Semyon Yekhmenin
|
1ff571b767
|
Feature/mobile features
|
2019-10-17 13:29:29 +00:00 |
|
evgeniy-st
|
9661de4810
|
Establishment types
|
2019-10-17 15:17:29 +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
|
8066d5607b
|
comment all rabbitmq dependencies added redis to docker compose file
|
2019-10-17 13:42:11 +03:00 |
|
Anatoly
|
e2c27bd2e1
|
switched broker storage from rabbtimq to redis
|
2019-10-17 13:42:11 +03:00 |
|
d.kuzmenko
|
6926fc350f
|
Merge branch 'feature/location_by_ip' into 'develop'
Added method for getting coordinates and city by ip
See merge request gm/gm-backend!52
|
2019-10-17 07:03:48 +00:00 |
|
Semyon Yekhmenin
|
5176a455c1
|
Added method for getting coordinates and city by ip
|
2019-10-17 07:03:48 +00:00 |
|
Виктор Гладких
|
32de6f7705
|
Readme
|
2019-10-16 15:54:15 +03:00 |
|
evgeniy-st
|
ccf6e12e3f
|
remove tag category from establishment type
|
2019-10-15 18:52:32 +03:00 |
|
evgeniy-st
|
3a54b70093
|
update tag on document index
|
2019-10-15 18:43:08 +03:00 |
|
evgeniy-st
|
bde81b3700
|
update ES documents
|
2019-10-15 18:32:16 +03:00 |
|
evgeniy-st
|
9d4c483f51
|
clean models (tags)
|
2019-10-15 18:25:09 +03:00 |
|
evgeniy-st
|
42ae1cbb87
|
fix tagcategory queryset
|
2019-10-15 18:13:37 +03:00 |
|
evgeniy-st
|
c94ad3f017
|
comment some code
|
2019-10-15 17:48:01 +03:00 |
|
evgeniy-st
|
60cdec99e0
|
refactor tags
|
2019-10-15 17:17:03 +03:00 |
|
Anatoly
|
1764cfc08b
|
added urlpath to get establishment tags to all platform
|
2019-10-15 12:52:21 +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 |
|
Виктор Гладких
|
275c5b467c
|
fixa
|
2019-10-14 18:15:17 +03:00 |
|
Виктор Гладких
|
8d2d5b87ac
|
Fix migrate SQL
|
2019-10-14 17:56:51 +03:00 |
|
Виктор Гладких
|
01a32f66e8
|
Fix location migrate sql
|
2019-10-14 17:38:37 +03:00 |
|
a.feteleu
|
1a70ea2e99
|
Merge branch 'bugfix/account-confirm-pass' into 'develop'
Реверт фичи с паролем
See merge request gm/gm-backend!56
|
2019-10-14 13:55:00 +00:00 |
|
Kuroshini
|
fb4cf25dce
|
Fix empty email after creating account
|
2019-10-14 16:43:59 +03:00 |
|
Kuroshini
|
8eaf611d7e
|
Reverting migration
|
2019-10-14 16:02:02 +03:00 |
|
Kuroshini
|
6fa0051c93
|
Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
|
2019-10-14 15:53:40 +03:00 |
|
Anatoly
|
469f7bdf4c
|
added prefetch select related
|
2019-10-14 12:24:26 +03:00 |
|
Anatoly
|
9e237d4657
|
removed endpoint to display a list of tags by establishment id, added instead filter to filter tags by establishment id
|
2019-10-14 11:40:03 +03:00 |
|
Anatoly
|
47993a7155
|
added endpoint ot get list of tag categories with tags by establishment type
|
2019-10-14 10:22:17 +03:00 |
|
d.kuzmenko
|
1f6bf819e8
|
Merge branch 'feature/roles' into 'develop'
Feature/roles
See merge request gm/gm-backend!50
|
2019-10-14 07:09:18 +00:00 |
|
Anatoly
|
2d41b9142b
|
Merge remote-tracking branch 'origin/feature/gm-192' into feature/gm-192
|
2019-10-11 18:26:26 +03:00 |
|
Anatoly
|
cb762ce746
|
added param to attr for Establoishment model and small refactoring, boost queries
|
2019-10-11 18:26:13 +03:00 |
|
Виктор Гладких
|
1f44777a15
|
Fix
|
2019-10-11 17:04:55 +03:00 |
|
Виктор Гладких
|
e9ad418976
|
Revert migrate location
|
2019-10-11 16:57:59 +03:00 |
|
evgeniy-st
|
0d7104eace
|
Merge branch 'develop' into feature/gm-192
|
2019-10-11 16:44:54 +03:00 |
|
d.kuzmenko
|
35532a32f4
|
Merge branch 'bugfix/account-change' into 'develop'
Don't change email until user confirms it
See merge request gm/gm-backend!51
|
2019-10-11 13:20:13 +00:00 |
|
Виктор Гладких
|
f441896d6a
|
Migrate data
|
2019-10-11 16:00:23 +03:00 |
|
Kuroshini
|
700695cdcc
|
Change route for changed email confirmation
|
2019-10-11 15:57:59 +03:00 |
|
Anatoly
|
ddb3eec679
|
finished endpoint to get tags by establishment type and subtype
|
2019-10-11 15:41:31 +03:00 |
|