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
|
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
|
228cb72c36
|
Merge branch 'develop' into feature/gm-148
|
2019-10-14 18:19:46 +03:00 |
|
Anatoly
|
e435d71e00
|
Merge branch 'feature/gm-192' of https://gl.id-east.ru/gm/gm-backend into feature/gm-192
|
2019-10-10 15:09:45 +03:00 |
|
evgeniy-st
|
074a5ec5ea
|
refactor news tags
|
2019-10-09 18:25:40 +03:00 |
|
Виктор Гладких
|
77839c7e8c
|
Merge branch 'develop' into feature/roles
|
2019-10-09 16:29:11 +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 |
|
Виктор Гладких
|
48ca13803e
|
Pre test permission comment
|
2019-10-09 14:44:01 +03:00 |
|
Anatoly
|
d321866dc2
|
gm-192: in progress
|
2019-10-08 15:38:35 +03:00 |
|
Anatoly
|
4796fce784
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/admin.py
|
2019-10-02 18:11:47 +03:00 |
|
Anatoly
|
d9635a8599
|
gm-148: refactored
|
2019-10-02 10:16:32 +03:00 |
|
michail
|
b96ed30a49
|
added news mail template and task without celery delay
|
2019-10-02 11:48:03 +05:00 |
|
Kuroshini
|
4c960c8abf
|
Booking (squashed commit)
|
2019-10-01 18:25:57 +03:00 |
|
evgeniy-st
|
dc4b63d8b2
|
Refactor news
|
2019-09-23 15:35:37 +03:00 |
|
Anatoly
|
5f3947601a
|
rename url path collection to collections, delete property in M2M field
|
2019-09-20 15:11:33 +03:00 |
|
evgeniy-st
|
cace6a7d3b
|
Recipe list&detail api-endpoints
|
2019-09-19 14:22:40 +03:00 |
|
Dmitriy Kuzmenko
|
e9bf129f82
|
add api locations for back office
|
2019-09-18 11:39:46 +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
|
bdc2c327f6
|
Registered path for nearest establishments
|
2019-09-12 14:25:03 +03:00 |
|
Anatoly
|
0647c46292
|
GM-68: Реализовать метод возвращения списка избранного для пользователя
|
2019-09-10 12:00:32 +03:00 |
|
evgeniy-st
|
99011ba15a
|
Initial search indexes app
|
2019-09-06 14:52:52 +03:00 |
|
Anatoly
|
605c81b33c
|
replace comment model from establishment app, added new app comment
|
2019-09-04 18:47:06 +03:00 |
|
evgeniy-st
|
7d7fa5e347
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-08-30 15:42:12 +03:00 |
|
evgeniy-st
|
2a8ffb16de
|
Notification app & subscription
|
2019-08-30 15:40:53 +03:00 |
|
Anatoly
|
6f322907fe
|
rename advertisement urlpath
|
2019-08-30 11:56:29 +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 |
|
Anatoly
|
a35fbc4456
|
added endpoint to upload an images
|
2019-08-27 19:03:52 +03:00 |
|
Anatoly
|
ce260a69aa
|
Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"
This reverts commit 07333234
|
2019-08-27 18:18:58 +03:00 |
|
Anatoly
|
0733323486
|
added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections
|
2019-08-27 17:15:09 +03:00 |
|
evgeniy-st
|
f82784cd19
|
update establishment-list endpoint
|
2019-08-27 12:33:16 +03:00 |
|
evgeniy-st
|
21985eb8bc
|
Merge branch 'develop' into feature/establishment
|
2019-08-26 18:26:05 +03:00 |
|
evgeniy-st
|
0135b25635
|
update urls conf
|
2019-08-26 18:25:16 +03:00 |
|
Anatoly
|
5edcd0afe9
|
replace image field with svg_image field, added validator, and change serializer
|
2019-08-26 17:39:03 +03:00 |
|
Anatoly
|
da52f38b7f
|
added migrations, added ListAPI view endpoint
|
2019-08-26 15:27:33 +03:00 |
|
Anatoly
|
1de7a84d56
|
added new application partner, added new model Partner
|
2019-08-23 16:58:27 +03:00 |
|
Anatoly
|
ecb6349696
|
added CRUD endpoints for collection app
|
2019-08-21 12:09:21 +03:00 |
|
evgeniy-st
|
d87b9ca2d1
|
refactor urlpatterns
|
2019-08-19 16:56:28 +03:00 |
|
Anatoly
|
d5a14ef8c2
|
version 0.0.11: added new model and CRUD endpoints to them; refactored auth app
|
2019-08-15 11:59:10 +03:00 |
|
Anatoly
|
7fe903b01b
|
version 0.0.8: added CRUD endpoints for models Address, Region, Country and City; also refactored custom permission class
|
2019-08-14 14:00:12 +03:00 |
|
Dmitriy Kuzmenko
|
68f6e0bc9c
|
version 0.0.6 new models and api for News
|
2019-08-13 15:23:00 +03:00 |
|