Anatoly
|
26ff9963d8
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# requirements/base.txt
|
2019-10-17 13:43:24 +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 |
|
Kuroshini
|
6a85e52abc
|
Rename variable
|
2019-10-17 12:30:40 +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 |
|
Kuroshini
|
40f1cc1e22
|
Add lookup for categories
|
2019-10-16 20:56:56 +03:00 |
|
Kuroshini
|
9fc4a8703c
|
Search establishment by working time (added lookup)
|
2019-10-16 19:13:33 +03:00 |
|
Kuroshini
|
2f656c459d
|
Search establishment by working time (added fields to serializer)
|
2019-10-16 19:09:38 +03:00 |
|
Kuroshini
|
ed03f0f40f
|
Search establishment by working time
|
2019-10-16 19:05:16 +03:00 |
|
Виктор Гладких
|
32de6f7705
|
Readme
|
2019-10-16 15:54:15 +03:00 |
|
Kuroshini
|
6d7341377b
|
Show timetables list (remove pagination)
|
2019-10-16 14:46:36 +03:00 |
|
Kuroshini
|
c2c9f33b57
|
Show timetables list (only necessary fields)
|
2019-10-16 14:44:55 +03:00 |
|
Kuroshini
|
12a339cd1b
|
Show timetables list
|
2019-10-16 14:36:17 +03:00 |
|
Kuroshini
|
8dad3df4bf
|
Added route for mobile tags
|
2019-10-16 14:11:07 +03:00 |
|
Kuroshini
|
e0bce99ca9
|
Fix issue with copies
|
2019-10-15 21:40:55 +03:00 |
|
evgeniy-st
|
a0e24a26a0
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:53:25 +03:00 |
|
evgeniy-st
|
ccf6e12e3f
|
remove tag category from establishment type
|
2019-10-15 18:52:32 +03:00 |
|
evgeniy-st
|
c09b1eb295
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:44:24 +03:00 |
|
evgeniy-st
|
3a54b70093
|
update tag on document index
|
2019-10-15 18:43:08 +03:00 |
|
evgeniy-st
|
c268575a04
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:33:44 +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
|
f7eb534570
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 17:48:40 +03:00 |
|
evgeniy-st
|
c94ad3f017
|
comment some code
|
2019-10-15 17:48:01 +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 |
|
Anatoly
|
449eae060d
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 12:52:38 +03:00 |
|
Anatoly
|
1764cfc08b
|
added urlpath to get establishment tags to all platform
|
2019-10-15 12:52:21 +03:00 |
|
Anatoly
|
f86b7d489f
|
fix merge
|
2019-10-15 12:23:13 +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
|
07bb0f1b8f
|
Merge branch 'develop' into feature/gm-148
|
2019-10-14 18:24:58 +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 |
|
Виктор Гладких
|
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 |
|