Виктор Гладких
|
5ad3776fe3
|
establishment manager
|
2019-10-16 12:14:13 +03:00 |
|
Виктор Гладких
|
86692019d1
|
Add Country admin to views
|
2019-10-16 10:14:23 +03:00 |
|
evgeniy-st
|
c268575a04
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:33:44 +03:00 |
|
evgeniy-st
|
9d4c483f51
|
clean models (tags)
|
2019-10-15 18:25:09 +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
|
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
|
469f7bdf4c
|
added prefetch select related
|
2019-10-14 12:24:26 +03: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 |
|
evgeniy-st
|
0d7104eace
|
Merge branch 'develop' into feature/gm-192
|
2019-10-11 16:44:54 +03:00 |
|
Anatoly
|
ddb3eec679
|
finished endpoint to get tags by establishment type and subtype
|
2019-10-11 15:41:31 +03:00 |
|
Anatoly
|
bdb9348916
|
Merge branch 'bugfix/gm-205' into feature/gm-148
# Conflicts:
# apps/establishment/models.py
|
2019-10-11 13:31:33 +03:00 |
|
Anatoly
|
0b9fd8b1dc
|
Merge branch 'bugfix/gm-205' into develop
|
2019-10-11 13:20:45 +03:00 |
|
Anatoly
|
a25d846028
|
fixed bug with duplicated records in similar establishments
|
2019-10-10 21:02:56 +03:00 |
|
Anatoly
|
f83b735eb3
|
changed files
|
2019-10-10 15:10:43 +03:00 |
|
evgeniy-st
|
2aa51b93d3
|
hide es search
|
2019-10-10 14:43:24 +03:00 |
|
Kuroshini
|
74460b3060
|
Fix imports issue
|
2019-10-10 14:43:24 +03:00 |
|
evgeniy-st
|
bb41f00451
|
hide es search
|
2019-10-10 14:42:42 +03:00 |
|
Kuroshini
|
bd7ba611fc
|
Fix imports issue
|
2019-10-10 14:28:42 +03:00 |
|
Anatoly
|
74fa1fc014
|
Merge branch 'develop' into feature/gm-192
|
2019-10-09 16:21:50 +03:00 |
|
evgeniy-st
|
095b4a4bd7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:11:26 +03:00 |
|
e.stoyushko
|
1969af044c
|
Merge branch 'feature/booking' into 'develop'
Feature/booking
See merge request gm/gm-backend!6
|
2019-10-09 12:00:32 +00:00 |
|
Anatoly
|
ca5f588466
|
fix elastic document, fix prefetch and select related
|
2019-10-09 12:53:35 +03:00 |
|
Anatoly
|
d321866dc2
|
gm-192: in progress
|
2019-10-08 15:38:35 +03:00 |
|
Anatoly
|
8ac5a1970f
|
fixed carousel
|
2019-10-07 10:51:08 +03:00 |
|
Anatoly
|
eaa1795f0c
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/authorization/tasks.py
|
2019-10-04 14:00:06 +03:00 |
|
evgeniy-st
|
729a77866d
|
update elasticsearch index
|
2019-10-03 17:19:30 +03:00 |
|
Kuroshini
|
0408d93599
|
Squashed migrations && added lastable credentials
|
2019-10-03 13:41:45 +03:00 |
|
Anatoly
|
b31e71d4ef
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/serializers.py
# project/settings/local.py
|
2019-10-02 10:20:14 +03:00 |
|
Kuroshini
|
4c960c8abf
|
Booking (squashed commit)
|
2019-10-01 18:25:57 +03:00 |
|
Kuroshini
|
33478580aa
|
Review fixes
|
2019-09-30 16:40:46 +03:00 |
|
Anatoly
|
aeebdd02c6
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
|
2019-09-30 15:43:45 +03:00 |
|
Kuroshini
|
019ac97d19
|
Add vintage year to detail
|
2019-09-30 13:50:17 +03:00 |
|
Kuroshini
|
d42bf43d19
|
Latest award for carousel
|
2019-09-27 22:56:44 +03:00 |
|
Kuroshini
|
9aafe0d69d
|
new establishment attribute
|
2019-09-27 22:27:25 +03:00 |
|
Kuroshini
|
051ddb617d
|
fix conflicts after rebase
|
2019-09-27 22:27:25 +03:00 |
|
Kuroshini
|
98b0a9af5d
|
latest award && test fix
|
2019-09-27 22:27:25 +03:00 |
|
Kuroshini
|
4388fb7346
|
latest award for establishment
|
2019-09-27 22:27:25 +03:00 |
|
evgeniy-st
|
403a60623a
|
Merge branch 'develop' into feature/refactor-establishments
|
2019-09-27 10:05:15 +03:00 |
|
Anatoly
|
14ae75f088
|
gm-148: refactored news serializer
|
2019-09-26 18:38:57 +03:00 |
|
Anatoly
|
c4d8b89a8d
|
gm-127: finished
|
2019-09-26 14:19:01 +03:00 |
|
Anatoly
|
0e0d6e318e
|
GM-127: finished
|
2019-09-26 14:12:49 +03:00 |
|
Anatoly
|
207e35feb1
|
GM-127: in progress
|
2019-09-25 19:39:37 +03:00 |
|
evgeniy-st
|
f18c18110c
|
Refactor some establishment serializer
|
2019-09-25 15:32:45 +03:00 |
|
Anatoly
|
8766388256
|
fixed similar establishments
|
2019-09-25 13:16:02 +03:00 |
|
Anatoly
|
90c9e321f7
|
fixed similar establishments
|
2019-09-25 13:05:07 +03:00 |
|
Anatoly
|
0e643a1dfa
|
Merge branch 'develop' of /home/a.feteleu/projects/gm-backend with conflicts.
|
2019-09-25 12:23:25 +03:00 |
|
Kuroshini
|
6420a676df
|
create slugs manually
|
2019-09-24 10:38:04 +03:00 |
|
Kuroshini
|
1ce71fdcdc
|
slugs for news & establishments
|
2019-09-24 10:38:04 +03:00 |
|
littlewolf
|
aedcd795a9
|
Fix establishment model
|
2019-09-23 14:21:05 +03:00 |
|
Anatoly
|
217c11b970
|
GM-124: Доработать модель establishment-а
|
2019-09-23 12:29:08 +03:00 |
|
Anatoly
|
20766768d8
|
fixed establishment filter by geo
|
2019-09-23 10:12:14 +03:00 |
|
Anatoly
|
5f3947601a
|
rename url path collection to collections, delete property in M2M field
|
2019-09-20 15:11:33 +03:00 |
|
Anatoly
|
2089ca067a
|
chane FK to URLField in Collection model, added properties to field collections in Establishment model
|
2019-09-20 14:22:39 +03:00 |
|
Anatoly
|
413c93bead
|
fixed problem with image, refactored favorites, collection
|
2019-09-20 13:35:59 +03:00 |
|
evgeniy-st
|
e5f4c27495
|
Fix establishment search
|
2019-09-19 18:27:47 +03:00 |
|
Dmitriy Kuzmenko
|
5a36613c97
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/establishment/urls/back.py
|
2019-09-19 17:19:40 +03:00 |
|
Dmitriy Kuzmenko
|
2164e30aef
|
chnage image field to image_url in establishments
|
2019-09-19 17:18:08 +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 |
|
Anatoly
|
38ba443b47
|
gm-80: complete
|
2019-09-19 11:26:54 +03:00 |
|
Semyon Yekhmenin
|
f700491d42
|
Added employee position priority
|
2019-09-19 07:02:45 +00:00 |
|
Anatoly
|
540a819f94
|
gm-80: in progress
|
2019-09-18 18:46:24 +03:00 |
|
Dmitriy Kuzmenko
|
ccc1660e1f
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-17 17:16:48 +03:00 |
|
Anatoly
|
69f1a5cf48
|
GM-73 added ordering
|
2019-09-17 17:16:21 +03:00 |
|
Dmitriy Kuzmenko
|
6d873d66a2
|
Merge remote-tracking branch 'origin/feature/establishment_transportation_field' into develop
# Conflicts:
# apps/establishment/models.py
|
2019-09-17 17:07:29 +03:00 |
|
Anatoly
|
75f75ba3fd
|
Merge branch 'develop' into feature/gm-73
|
2019-09-17 15:37:07 +03:00 |
|
Anatoly
|
27a1998dbc
|
GM-73: Логика похожих ресторанов
|
2019-09-17 15:36:33 +03:00 |
|
Kuroshini
|
4ee6306efb
|
Add transportation text field to establishment model
|
2019-09-17 13:47:41 +03:00 |
|
evgeniy-st
|
8e864d32b9
|
Merge branch 'develop' into feature/elasticsearch
|
2019-09-16 10:58:09 +03:00 |
|
Dmitriy Kuzmenko
|
10d9b52bec
|
Merge remote-tracking branch 'origin/develop' into feature/backoffice
|
2019-09-12 18:27:04 +03:00 |
|
Dmitriy Kuzmenko
|
efac785248
|
add api for estab, social, plates, menu
|
2019-09-12 18:24:21 +03:00 |
|
Semyon
|
5943839eda
|
Added view for nearest establishments
|
2019-09-12 14:24:48 +03:00 |
|
evgeniy-st
|
c58d3bae36
|
Tags indexing and search (by id)
|
2019-09-10 12:58:39 +03:00 |
|
Anatoly
|
273f74f911
|
added flag in_favorites in establishment
|
2019-09-09 11:37:57 +03:00 |
|
Anatoly
|
605c81b33c
|
replace comment model from establishment app, added new app comment
|
2019-09-04 18:47:06 +03:00 |
|
evgeniy-st
|
a2ef5bbfd5
|
small refactor
|
2019-09-02 12:00:19 +03:00 |
|
Anatoly
|
664412d0f4
|
establishment list view - added filter by country code
|
2019-09-02 09:56:55 +03:00 |
|
Anatoly
|
e6b35c8d55
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-09-01 18:11:43 +03:00 |
|
Anatoly
|
e28435aba2
|
added preview image in establishment serializer
|
2019-09-01 18:11:09 +03:00 |
|
Dmitriy Kuzmenko
|
e91a64ad6b
|
add website
|
2019-09-01 17:51:13 +03:00 |
|
evgeniy-st
|
6d6e1169a4
|
extended establishment model (social)
|
2019-09-01 17:30:39 +03:00 |
|
Dmitriy Kuzmenko
|
082a8a1470
|
add fake best_price_menu
|
2019-09-01 17:22:53 +03:00 |
|
Dmitriy Kuzmenko
|
c85347b53a
|
add menu
|
2019-09-01 16:18:17 +03:00 |
|
evgeniy-st
|
f10f6b23a0
|
Merge branch 'feature/employees' into develop
|
2019-09-01 14:33:25 +03:00 |
|
evgeniy-st
|
1b001f303a
|
extended establishment api enpoint by attribute of 'employees'
|
2019-09-01 14:17:03 +03:00 |
|
Anatoly
|
21dd87e0ec
|
Merge remote-tracking branch 'origin/develop' into features/comments
# Conflicts:
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 14:14:38 +03:00 |
|
Anatoly
|
cd0f03f05d
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/serializers.py
|
2019-09-01 14:06:17 +03:00 |
|
Dmitriy Kuzmenko
|
ef59216feb
|
change contacts for est.
|
2019-09-01 13:39:01 +03:00 |
|
Anatoly
|
de8db655ed
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 13:38:40 +03:00 |
|
Anatoly
|
3f90ef6dab
|
fix merge
|
2019-09-01 13:29:17 +03:00 |
|
Dmitriy Kuzmenko
|
fc4facbf83
|
add contacts for establishments
|
2019-09-01 12:35:09 +03:00 |
|
Anatoly
|
0d4f080850
|
added new model - Comment
|
2019-09-01 12:30:00 +03:00 |
|
evgeniy-st
|
805bda3267
|
Extend establishment filterset
|
2019-08-30 17:25:07 +03:00 |
|
Anatoly
|
46faf6ecee
|
Merge remote-tracking branch 'origin/develop' into feature/establishment
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/serializers.py
|
2019-08-29 18:19:57 +03:00 |
|
Anatoly
|
3aa1e92046
|
added table EstablishmentSchedule, added application timetable, added table Timetable
|
2019-08-29 17:59:09 +03:00 |
|
Dmitriy Kuzmenko
|
9a7052026b
|
add metadata
|
2019-08-29 14:51:55 +03:00 |
|
Dmitriy Kuzmenko
|
cb1ff8e410
|
add configuration
|
2019-08-28 17:53:52 +03:00 |
|
evgeniy-st
|
ba00bf1b00
|
Merge branch 'develop' into feature/establishment
|
2019-08-28 15:35:21 +03:00 |
|
evgeniy-st
|
1aef1a5bb1
|
Translation & establishment
|
2019-08-28 15:21:28 +03:00 |
|