Kuroshini
|
b77c654c6c
|
Open now filter
|
2019-10-18 02:38:59 +03:00 |
|
Kuroshini
|
4b5b34de20
|
add preview image url (fix typo)
|
2019-10-17 23:28:13 +03:00 |
|
Kuroshini
|
5f2501c712
|
add preview image url
|
2019-10-17 23:25:49 +03:00 |
|
Anatoly
|
cce0913245
|
change AWS_S3_CUSTOM_DOMAIN
|
2019-10-17 18:37:48 +03:00 |
|
evgeniy-st
|
1cbfb12594
|
Merge remote-tracking branch 'origin/develop' into feature/gm-148
|
2019-10-17 16:58:30 +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 |
|
Kuroshini
|
d2e34e5d49
|
Timetable search results
|
2019-10-17 15:10:26 +03:00 |
|
Kuroshini
|
1998e3dc57
|
Change establishment schedule ES fields type
|
2019-10-17 14:59:35 +03:00 |
|
Kuroshini
|
2c5c067b53
|
try to remove weekday_display
|
2019-10-17 14:56:31 +03:00 |
|
Kuroshini
|
97fc8dce15
|
add schedule to search results
|
2019-10-17 14:45:33 +03:00 |
|
Kuroshini
|
c59811e037
|
Revert "Revert "add schedule to search results""
This reverts commit acea297
|
2019-10-17 14:34:49 +03:00 |
|
Kuroshini
|
acea297c94
|
Revert "add schedule to search results"
This reverts commit c8c66e7
|
2019-10-17 14:33:20 +03:00 |
|
Kuroshini
|
c8c66e7d1b
|
add schedule to search results
|
2019-10-17 14:32:10 +03:00 |
|
Anatoly
|
8a363498f5
|
change broker url
|
2019-10-17 14:28:39 +03:00 |
|
Anatoly
|
79b4b59478
|
enabling celery for development and stage settings
|
2019-10-17 13:49:29 +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
|
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 |
|