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
|
0c8959f4e7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-22 17:11:22 +03:00 |
|
evgeniy-st
|
d1c9e649b7
|
Remove metadatacontent
|
2019-10-22 17:05:54 +03:00 |
|
Anatoly
|
071b634659
|
fixed EstablishmentFilter
|
2019-10-22 15:58:00 +03:00 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
evgeniy-st
|
4ceb0e4d86
|
fix establishment migration
|
2019-10-21 20:22:47 +03:00 |
|
Виктор Гладких
|
87708df084
|
Fix test establishment
|
2019-10-21 16:11:28 +03:00 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +03:00 |
|
evgeniy-st
|
2dbe65a169
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-21 10:31:06 +03:00 |
|
Anatoly
|
7be7315cef
|
added filters and endpoint to get winery list
|
2019-10-18 18:00:57 +03:00 |
|
Виктор Гладких
|
2e2ed19118
|
Fix establishment tests
|
2019-10-18 12:14:10 +03:00 |
|
Kuroshini
|
b77c654c6c
|
Open now filter
|
2019-10-18 02:38:59 +03:00 |
|
evgeniy-st
|
9661de4810
|
Establishment types
|
2019-10-17 15:17:29 +03:00 |
|
Kuroshini
|
6a85e52abc
|
Rename variable
|
2019-10-17 12:30:40 +03:00 |
|
Kuroshini
|
ed03f0f40f
|
Search establishment by working time
|
2019-10-16 19:05:16 +03:00 |
|
Виктор Гладких
|
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
|
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
|
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 |
|
michail
|
54cfccbcbe
|
the fix of types fields in all apps
|
2019-10-15 13:23:31 +05:00 |
|
michail
|
a223832241
|
Relational integers to ForeignKey
|
2019-10-14 15:48:26 +05: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 |
|
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 |
|
littlewolf
|
0e474a16ea
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-10 09:04:01 +03:00 |
|
Anatoly
|
74fa1fc014
|
Merge branch 'develop' into feature/gm-192
|
2019-10-09 16:21:50 +03:00 |
|
michail
|
4cc9fabd73
|
edited transfer.py for notification, account, establishment
|
2019-10-09 17:43:48 +05: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
|
2191a505a5
|
refactored EstablishmentBase serializer
|
2019-10-09 14:11:53 +03:00 |
|
Anatoly
|
ca5f588466
|
fix elastic document, fix prefetch and select related
|
2019-10-09 12:53:35 +03:00 |
|
littlewolf
|
22d2396c6b
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# docker-compose.yml
# project/settings/base.py
|
2019-10-09 07:54:15 +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 |
|
michail
|
511312bb28
|
added transfer.py to partner
|
2019-10-04 16:20:04 +05:00 |
|
Anatoly
|
eaa1795f0c
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/authorization/tasks.py
|
2019-10-04 14:00:06 +03:00 |
|
michail
|
ad17a2ad7a
|
new relations template
|
2019-10-04 13:18:43 +05:00 |
|
evgeniy-st
|
729a77866d
|
update elasticsearch index
|
2019-10-03 17:19:30 +03:00 |
|
michail
|
018d9f6557
|
added establishment and collection transfer.py files
|
2019-10-03 17:54:26 +05: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
|
393aa9ef28
|
Merge migrations after rebase
|
2019-10-01 18:30:49 +03:00 |
|
Kuroshini
|
4c960c8abf
|
Booking (squashed commit)
|
2019-10-01 18:25:57 +03:00 |
|
evgeniy-st
|
e42f4d061c
|
refactor address
|
2019-10-01 18:07:04 +03:00 |
|
evgeniy-st
|
f034377405
|
fix establishment serializer
|
2019-10-01 15:11:14 +03:00 |
|
evgeniy-st
|
051957c7cf
|
Refactor JSON Validation
|
2019-10-01 13:03:59 +03:00 |
|
e.stoyushko
|
1798978cf7
|
Merge branch 'feature/establishment-award' into 'develop'
Feature/establishment award
See merge request gm/gm-backend!40
|
2019-09-30 13:53:59 +00: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 |
|
d.kuzmenko
|
8745c57f84
|
Merge branch 'bugfix/bunch-of-fixes' into 'develop'
Bugfix/bunch of fixes
See merge request gm/gm-backend!38
|
2019-09-30 07:57:12 +00: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 |
|
Kuroshini
|
4d113a6916
|
Fix all test
|
2019-09-27 22:06:46 +03:00 |
|
Kuroshini
|
d71ed0c1de
|
Fix lot/lat x/y mapping && address serialization
|
2019-09-27 19:44:00 +03:00 |
|
evgeniy-st
|
993e58d215
|
fix views after merge
|
2019-09-27 11:20:43 +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
|
f1eec96ce8
|
Merge branch 'develop' into feature/gm-127
# Conflicts:
# apps/establishment/models.py
# apps/establishment/urls/common.py
|
2019-09-26 14:29:39 +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 |
|
Виктор Гладких
|
40d9f2f2ed
|
check
|
2019-09-26 11:45:26 +03:00 |
|
Виктор Гладких
|
86d754f4bb
|
validate json translated field
|
2019-09-26 11:38:37 +03:00 |
|
d.kuzmenko
|
e0f71d2646
|
Merge branch 'feature/add-base-attributes-autouse' into 'develop'
Feature/add base attributes autouse
See merge request gm/gm-backend!24
|
2019-09-26 08:34:38 +00:00 |
|
d.kuzmenko
|
0e4b714d2f
|
Merge branch 'feature/update-establishment-slug-urls' into 'develop'
Feature/update establishment slug urls
See merge request gm/gm-backend!29
|
2019-09-26 08:32:27 +00:00 |
|
d.kuzmenko
|
218787bec1
|
Merge branch 'hotfix/favorites-create' into 'develop'
Fix favorites creation by slug
See merge request gm/gm-backend!27
|
2019-09-26 08:31:52 +00:00 |
|
littlewolf
|
3279fce339
|
Update tests
|
2019-09-26 11:19:06 +03:00 |
|
littlewolf
|
877d3d9e6a
|
Fix test
Add todo to fix error
|
2019-09-25 19:44:33 +03:00 |
|
Anatoly
|
207e35feb1
|
GM-127: in progress
|
2019-09-25 19:39:37 +03:00 |
|
littlewolf
|
cabee12fab
|
Add comment tests
Add favorite tests
|
2019-09-25 18:58:52 +03:00 |
|
littlewolf
|
07a0f8e295
|
Temp commit
|
2019-09-25 17:34:11 +03:00 |
|
evgeniy-st
|
f18c18110c
|
Refactor some establishment serializer
|
2019-09-25 15:32:45 +03:00 |
|
Kuroshini
|
f38924db42
|
Fix favorites creation by slug
|
2019-09-25 14:09:24 +03:00 |
|
littlewolf
|
a2ade761b4
|
Update web urls
|
2019-09-25 14:04:52 +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 |
|
littlewolf
|
a55695b120
|
Switch to decorator
Add update test
|
2019-09-24 20:12:09 +03:00 |
|
Kuroshini
|
1534c9b09c
|
Remove unique
(cherry picked from commit f793c20)
|
2019-09-24 14:51:51 +03:00 |
|
Kuroshini
|
65914659e5
|
Slugs serializers
|
2019-09-24 12:31:35 +03:00 |
|
Kuroshini
|
d224c77a01
|
Fix issues with test && recreate migrations
|
2019-09-24 12:06:11 +03:00 |
|
Kuroshini
|
73a858cc8c
|
Slugs feature migrations
|
2019-09-24 10:38:04 +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 |
|
evgeniy-st
|
83fddd63c3
|
fix migration establishment
|
2019-09-23 16:41:20 +03:00 |
|
d.kuzmenko
|
524a2d814d
|
Merge branch 'feature/collection-tests-api-status' into 'develop'
Feature/collection tests api status
See merge request gm/gm-backend!17
|
2019-09-23 12:51:28 +00:00 |
|
d.kuzmenko
|
a0ff8eae56
|
Merge branch 'feature/establishment-tests-api-status' into 'develop'
Feature/establishment tests api status
See merge request gm/gm-backend!13
|
2019-09-23 12:20:13 +00:00 |
|
littlewolf
|
aedcd795a9
|
Fix establishment model
|
2019-09-23 14:21:05 +03:00 |
|
Anatoly
|
202aabf15e
|
GM-124: added establishment migration
|
2019-09-23 12:40:27 +03:00 |
|
Anatoly
|
217c11b970
|
GM-124: Доработать модель establishment-а
|
2019-09-23 12:29:08 +03:00 |
|
littlewolf
|
9f89deb23b
|
Fix establishment RUD serializer
|
2019-09-23 11:16:22 +03:00 |
|
Anatoly
|
20766768d8
|
fixed establishment filter by geo
|
2019-09-23 10:12:14 +03:00 |
|
Anatoly
|
07d17d5bf1
|
refactored similar establishment endpoint
|
2019-09-20 16:55:04 +03:00 |
|
littlewolf
|
eaac6ca885
|
Fix
|
2019-09-20 16:47:20 +03:00 |
|
littlewolf
|
4e495fa47d
|
Remove debug
|
2019-09-20 16:42:35 +03:00 |
|
littlewolf
|
e39bc835fd
|
Fix class name
|
2019-09-20 16:41:24 +03:00 |
|
littlewolf
|
0d7b26bbb2
|
Add update tests
|
2019-09-20 16:40:53 +03:00 |
|
littlewolf
|
85fef10eb3
|
Fix establishment tests
|
2019-09-20 16:28:23 +03:00 |
|
littlewolf
|
aaff7fd3ba
|
Add schedule tests
|
2019-09-20 16:22:41 +03:00 |
|
littlewolf
|
2d8b30c3ee
|
Add patch test to plates class
|
2019-09-20 16:10:51 +03:00 |
|
littlewolf
|
7f973bbf52
|
Merge branch 'develop' into feature/establishment-tests-api-status
|
2019-09-20 16:00:39 +03:00 |
|
littlewolf
|
df0afc5653
|
Fix plates RUD view
|
2019-09-20 16:00:16 +03:00 |
|
littlewolf
|
2f74c63fd9
|
Fix plate tests
Add menu tests
|
2019-09-20 15:58:23 +03:00 |
|
Dmitriy Kuzmenko
|
1e1b09660d
|
fix news_type
|
2019-09-20 15:55:37 +03:00 |
|
littlewolf
|
014931d2c4
|
Add plate tests
Add is_publish to serializer
Add TODO for is_publish
|
2019-09-20 15:39:53 +03:00 |
|
Anatoly
|
193ecfba7a
|
fixed comments
|
2019-09-20 15:38:20 +03:00 |
|
Anatoly
|
5f3947601a
|
rename url path collection to collections, delete property in M2M field
|
2019-09-20 15:11:33 +03:00 |
|
littlewolf
|
e616d3970c
|
Add class to test childs
|
2019-09-20 14:55:34 +03:00 |
|
littlewolf
|
ee93905556
|
Add phone tests
|
2019-09-20 14:49:04 +03:00 |
|
Anatoly
|
09c9d666b5
|
rename image_url to image, preview_image_url to preview_image
|
2019-09-20 14:42:34 +03:00 |
|
littlewolf
|
00d8f09881
|
Add email tests
|
2019-09-20 14:42:00 +03:00 |
|
littlewolf
|
49d2070544
|
Add establishment tests
|
2019-09-20 14:31:02 +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 |
|
Sergey Melihov
|
2a79018f76
|
Merge branch 'feature/employee_crud' into 'develop'
Feature/employee crud
See merge request gm/gm-backend!11
|
2019-09-20 06:39:20 +00:00 |
|
evgeniy-st
|
e5f4c27495
|
Fix establishment search
|
2019-09-19 18:27:47 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
4a08abbfd9
|
employee test crd
|
2019-09-19 18:02:43 +03:00 |
|
Dmitriy Kuzmenko
|
b23a79775d
|
add merge for migrations
|
2019-09-19 17:57:30 +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
|
2ce69eb003
|
added establishment tag identifier to TagListAPIView
|
2019-09-19 17:10:18 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
d3238f50c2
|
add login test
|
2019-09-19 17:06:38 +03:00 |
|
Anatoly
|
00925b7e0a
|
fixed tag list
|
2019-09-19 17:02:27 +03:00 |
|
Anatoly
|
1db37a7cee
|
fixed tag list
|
2019-09-19 16:56:00 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
356ea9465b
|
add get_tokkens and add cookies
|
2019-09-19 16:25:57 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
3095b5940f
|
modify base test for route 'employees'
|
2019-09-19 15:40:07 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
4e47a5b7a4
|
add base test for route 'employees'
|
2019-09-19 15:33:23 +03:00 |
|
Anatoly
|
306a6010e8
|
added merge migration
|
2019-09-19 14:37:01 +03:00 |
|
Anatoly
|
5f42039068
|
Merge branch 'feature/gm-80' into develop
|
2019-09-19 14:34:47 +03:00 |
|
Anatoly
|
24f364084e
|
gm-80: refactored
|
2019-09-19 14:34:36 +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 |
|
evgeniy-st
|
140172a17d
|
merge migrations
|
2019-09-19 12:55:58 +03:00 |
|
Anatoly
|
38ba443b47
|
gm-80: complete
|
2019-09-19 11:26:54 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
fd0a491e89
|
Merge branch 'develop' into feature/employee_crud
|
2019-09-19 10:10:31 +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 |
|
ВашÐВиктор ГладкихÐ
|
a1ea35fce1
|
CRUD logic for employee
|
2019-09-18 18:12:49 +03:00 |
|
Semyon Yekhmenin
|
bb5e294d6e
|
Fixed preview image crop
|
2019-09-18 13:52:09 +00: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 |
|
Dmitriy Kuzmenko
|
c3717ecfd9
|
merge transportation
|
2019-09-17 17:16:35 +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
|
15f02b72ca
|
add email and phone api for establishments
|
2019-09-13 12:20:36 +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 |
|
Anatoly
|
e4eedd8af2
|
Merge remote-tracking branch 'origin/feature/nearest_restaurants' into develop
# Conflicts:
# apps/establishment/views.py
|
2019-09-12 17:36:52 +03:00 |
|
Anatoly
|
f45ac7e7fe
|
fixed establishment detail
|
2019-09-12 17:33:55 +03:00 |
|
Anatoly
|
1ee21edb8e
|
added endpoint to retrieve establishment tags
|
2019-09-12 16:18:42 +03:00 |
|
Semyon
|
bdc2c327f6
|
Registered path for nearest establishments
|
2019-09-12 14:25:03 +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
|
0647c46292
|
GM-68: Реализовать метод возвращения списка избранного для пользователя
|
2019-09-10 12:00:32 +03:00 |
|
Anatoly
|
808178d56c
|
GM-70: Добавить пагинацию комментариев в карточке ресторанов
|
2019-09-09 13:12:48 +03:00 |
|
Anatoly
|
273f74f911
|
added flag in_favorites in establishment
|
2019-09-09 11:37:57 +03:00 |
|
Anatoly
|
2f5240adfa
|
GM-67: Внедрить передачу флага нахождения заведения в избранном пользователя
|
2019-09-09 11:36:17 +03:00 |
|
Anatoly
|
7577ad330c
|
union favorites create/destroy in one endpoint
|
2019-09-09 10:47:38 +03:00 |
|
Anatoly
|
0f6786fb13
|
favorites refactoring
|
2019-09-09 10:25:34 +03:00 |
|
Anatoly
|
e6144d8f33
|
small fix
|
2019-09-09 09:25:38 +03:00 |
|
Anatoly
|
1848bafd64
|
added new model favorites
|
2019-09-06 17:55:17 +03:00 |
|
Anatoly
|
742d700d3c
|
refactored comments
|
2019-09-06 11:06:02 +03:00 |
|
Anatoly
|
111e859f74
|
refactored establishment serializers
|
2019-09-05 15:50:52 +03:00 |
|
Anatoly
|
a133cfe1dd
|
added default value of is_main flag in comment section for establishments
|
2019-09-05 11:53:48 +03:00 |
|
Anatoly
|
3cac53c77d
|
fixed comments in establishment list or detail endpoints
|
2019-09-05 10:32:44 +03:00 |
|
Anatoly
|
c6cbb9bd36
|
fixed return in establishment serializer last published review
|
2019-09-05 09:54:43 +03:00 |
|
Anatoly
|
605c81b33c
|
replace comment model from establishment app, added new app comment
|
2019-09-04 18:47:06 +03:00 |
|
evgeniy-st
|
aa88721800
|
sites endpoint
|
2019-09-04 10:14:11 +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
|
2f692bacf3
|
add migrate
|
2019-09-01 17:52:01 +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 |
|
Anatoly
|
998204b7c5
|
added created field to comments serializer
|
2019-09-01 15:24:55 +03:00 |
|
evgeniy-st
|
45f990af4c
|
update serializer
|
2019-09-01 15:07:27 +03:00 |
|
evgeniy-st
|
ef02e68c70
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-01 15:05:47 +03:00 |
|
evgeniy-st
|
0da20bbcd1
|
added awards to employee
|
2019-09-01 15:05:25 +03:00 |
|
Anatoly
|
a1fed35c69
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-09-01 15:02:38 +03:00 |
|
Anatoly
|
360f88d996
|
replace textfield with tjsonfield in model Review
|
2019-09-01 15:01:55 +03:00 |
|
evgeniy-st
|
ddabac60d1
|
Fix establishment retrieve view
|
2019-09-01 14:53:46 +03:00 |
|
evgeniy-st
|
abecc6f99a
|
update migrations
|
2019-09-01 14:42:41 +03:00 |
|
evgeniy-st
|
48ac4cceab
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-01 14:33:43 +03:00 |
|
evgeniy-st
|
f10f6b23a0
|
Merge branch 'feature/employees' into develop
|
2019-09-01 14:33:25 +03:00 |
|
Anatoly
|
305da0e008
|
merge migrations
|
2019-09-01 14:31:42 +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
|
1494bbbf36
|
Merge branch 'feature/reviews' into develop
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 14:09:37 +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 |
|
Anatoly
|
e8d4626cdb
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
# apps/establishment/models.py
|
2019-09-01 13:26:55 +03:00 |
|
Anatoly
|
c1738478ab
|
added new model Review
|
2019-09-01 13:24:37 +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 |
|
evgeniy-st
|
62da2ee114
|
api establishment-detail
|
2019-08-29 17:26:22 +03:00 |
|
Dmitriy Kuzmenko
|
2a16198a8b
|
add award filter
|
2019-08-29 15:00:30 +03:00 |
|
Dmitriy Kuzmenko
|
9a7052026b
|
add metadata
|
2019-08-29 14:51:55 +03:00 |
|
evgeniy-st
|
d9793b2056
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-08-28 18:03:09 +03:00 |
|
Dmitriy Kuzmenko
|
cb1ff8e410
|
add configuration
|
2019-08-28 17:53:52 +03:00 |
|
evgeniy-st
|
c09b495bfd
|
update Establishment serializer
|
2019-08-28 16:31:02 +03:00 |
|
evgeniy-st
|
e5989273dc
|
Establishment add pagination
|
2019-08-28 15:41:17 +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 |
|
Dmitriy Kuzmenko
|
253da87a99
|
URL refactoring
|
2019-08-28 11:35:38 +03:00 |
|
Dmitriy Kuzmenko
|
262e98b9e1
|
add awards
|
2019-08-28 10:15:17 +03:00 |
|
evgeniy-st
|
c04771ca58
|
recalculate price level preview version
|
2019-08-27 16:53:05 +03:00 |
|
evgeniy-st
|
6667047537
|
establishment admin conf
|
2019-08-27 14:23:41 +03:00 |
|
evgeniy-st
|
910027d10f
|
update establishment model, migrations
|
2019-08-27 14:23:11 +03:00 |
|
evgeniy-st
|
c942f00bd6
|
remove unused views
|
2019-08-27 12:36:48 +03:00 |
|
evgeniy-st
|
f82784cd19
|
update establishment-list endpoint
|
2019-08-27 12:33:16 +03:00 |
|
evgeniy-st
|
bb284420c4
|
initial app
|
2019-08-26 18:07:01 +03:00 |
|