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 |
|
Anatoly
|
09450a1ae5
|
gm-80: complete
|
2019-09-19 14:30:32 +03:00 |
|
evgeniy-st
|
cace6a7d3b
|
Recipe list&detail api-endpoints
|
2019-09-19 14:22:40 +03:00 |
|
evgeniy-st
|
297f5daba8
|
Merge branch 'develop' into feature/recipe
|
2019-09-19 12:56:23 +03:00 |
|
evgeniy-st
|
140172a17d
|
merge migrations
|
2019-09-19 12:55:58 +03:00 |
|
evgeniy-st
|
4de2ca4ef1
|
Recipe app&model
|
2019-09-19 11:57: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
|
e2e7734bf2
|
Feature/advertisements update
|
2019-09-19 07:05:32 +00: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 |
|
evgeniy-st
|
06c518501d
|
fix migrations
|
2019-09-18 16:42:06 +03:00 |
|
evgeniy-st
|
8e0b19b8b0
|
ES. Establishment type & subtypes
|
2019-09-18 16:40:07 +03:00 |
|
evgeniy-st
|
4005fad64a
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-18 16:06:01 +03:00 |
|
evgeniy-st
|
4be007aade
|
ES: geo spatial filter
|
2019-09-18 16:05:42 +03:00 |
|
Semyon Yekhmenin
|
28e8bac84e
|
Added priority to site features
|
2019-09-18 12:51:39 +00:00 |
|
evgeniy-st
|
3f55e001cc
|
ES. Establishment. filter by collection_type
|
2019-09-18 15:05:28 +03:00 |
|
Anatoly
|
6e7a617a67
|
Added field - vintage_year, absolute image_url to Carousel ListAPIView
|
2019-09-18 13:14:57 +03:00 |
|
Anatoly
|
af0c134957
|
Fixed docs
|
2019-09-18 12:16:32 +03:00 |
|
Anatoly
|
4a3e028c3a
|
Fixed reset password
|
2019-09-18 11:50:39 +03:00 |
|
evgeniy-st
|
51d0ae0d60
|
Merge branch 'develop' into feature/elasticsearch-establishment-tags
|
2019-09-18 11:47:55 +03:00 |
|
evgeniy-st
|
39b2fc49b5
|
ES Establishment tags. indexing & search
|
2019-09-18 11:46:53 +03:00 |
|
Dmitriy Kuzmenko
|
20fe40010c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-18 11:41:43 +03:00 |
|
Dmitriy Kuzmenko
|
e9bf129f82
|
add api locations for back office
|
2019-09-18 11:39:46 +03:00 |
|
Anatoly
|
61fc78eeb9
|
fixed cookie settings for stage server
|
2019-09-18 11:28:00 +03:00 |
|
Anatoly
|
784728d155
|
Facebook auth return user email; fixed URL in templates
|
2019-09-18 11:21:27 +03:00 |
|
evgeniy-st
|
2908286e6c
|
price_level & toque_number settings
|
2019-09-18 10:50:00 +03:00 |
|
evgeniy-st
|
6e4e1b214d
|
Merge branch 'develop' into feature/elasticsearch-establishment-address
|
2019-09-17 17:34:22 +03:00 |
|
evgeniy-st
|
e67d7767a1
|
Elasticsearch: establishment address. Filter by country_id, country_code
|
2019-09-17 17:33:07 +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 |
|
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
|
7a021a1435
|
update establishment search view
|
2019-09-16 17:56:51 +03:00 |
|
evgeniy-st
|
db5ff7afcd
|
update settings, update establishment document
|
2019-09-16 11:21:14 +03:00 |
|
evgeniy-st
|
8e864d32b9
|
Merge branch 'develop' into feature/elasticsearch
|
2019-09-16 10:58:09 +03:00 |
|
Anatoly
|
0043b1a8c1
|
Merge branch 'feature/gm-25' into develop
|
2019-09-16 09:38:52 +03:00 |
|
Anatoly
|
306cb76e1c
|
GM-25: Added comments
|
2019-09-16 09:35:20 +03:00 |
|
Anatoly
|
555aa9a4e1
|
GM-25: Получение главной зоны
|
2019-09-13 18:08:36 +03:00 |
|
Anatoly
|
30875958ea
|
increase access token lifetime to 30 days and unregister unused models in admin page
|
2019-09-13 12:37:03 +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
|
1e650b9b1f
|
replace ImageFields to URLFields in User model, refactored serializers that included this fields
|
2019-09-12 18:10:52 +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
|
c768228bc9
|
Merge branch 'feature/gm-26' into develop
|
2019-09-12 16:18:57 +03:00 |
|
Anatoly
|
1ee21edb8e
|
added endpoint to retrieve establishment tags
|
2019-09-12 16:18:42 +03:00 |
|
Anatoly
|
075298f6ec
|
refactored apps account, authorization, news, utils
|
2019-09-12 14:44:49 +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 |
|
Anatoly
|
2c41e532c8
|
fixed ChangePasswordView
|
2019-09-12 09:33:09 +03:00 |
|
Anatoly
|
f8c795cd03
|
added redirect for ConfirmEmail and ResetPassword
|
2019-09-11 18:53:02 +03:00 |
|
Anatoly
|
cf884ed906
|
fixed UserSerializer, PasswordResetSerializer
|
2019-09-11 12:07:30 +03:00 |
|
Anatoly
|
434df203da
|
fixed account detail
|
2019-09-10 18:03:01 +03:00 |
|
Anatoly
|
530ce38527
|
fixed account detail
|
2019-09-10 17:53:50 +03:00 |
|
Anatoly
|
7e468c539a
|
change project settings
|
2019-09-10 15:35:24 +03:00 |
|
a.feteleu
|
cf1c10d6ec
|
Revert "small refactoring favorites"
This reverts commit a4d7430379
|
2019-09-10 12:19:00 +00:00 |
|
Anatoly
|
500e470b39
|
Added CORSMiddleware
|
2019-09-10 15:01:10 +03:00 |
|
evgeniy-st
|
c58d3bae36
|
Tags indexing and search (by id)
|
2019-09-10 12:58:39 +03:00 |
|
Anatoly
|
a4d7430379
|
small refactoring favorites
|
2019-09-10 12:19:21 +03:00 |
|
Anatoly
|
0647c46292
|
GM-68: Реализовать метод возвращения списка избранного для пользователя
|
2019-09-10 12:00:32 +03:00 |
|
Anatoly
|
96ecdc69ca
|
fixed UserSerializer
|
2019-09-10 09:45:48 +03:00 |
|
Anatoly
|
40605ff123
|
change flag is_active after authorization
|
2019-09-09 18:00:17 +03:00 |
|
Anatoly
|
89830ffdac
|
small fix
|
2019-09-09 17:12:03 +03:00 |
|
Anatoly
|
64b101516d
|
GM-81: Доарботать механизм авторизации при невалидированном email и изменении email
|
2019-09-09 15:45:51 +03:00 |
|
evgeniy-st
|
9fab4454a0
|
Establishment index
|
2019-09-09 15:39:31 +03:00 |
|
evgeniy-st
|
87efc50d94
|
translated field into serializer
|
2019-09-09 14:55:44 +03:00 |
|
Anatoly
|
efe1539dad
|
Refactored ImageSerializer
|
2019-09-09 13:14:43 +03:00 |
|
Anatoly
|
808178d56c
|
GM-70: Добавить пагинацию комментариев в карточке ресторанов
|
2019-09-09 13:12:48 +03:00 |
|
evgeniy-st
|
b326d7b8fd
|
Overrided searchfilterbackend
|
2019-09-09 12:00:53 +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 |
|
evgeniy-st
|
43804ae5ab
|
some fixes
|
2019-09-06 17:34:21 +03:00 |
|
evgeniy-st
|
b6a3aa4264
|
update subscriber serializer
|
2019-09-06 14:54:11 +03:00 |
|
evgeniy-st
|
99011ba15a
|
Initial search indexes app
|
2019-09-06 14:52:52 +03:00 |
|
Anatoly
|
e1d6455e81
|
added field cropped_image to User model
|
2019-09-06 13:47:37 +03:00 |
|
Anatoly
|
5449891394
|
added validation to UserSerializer
|
2019-09-06 11:55:56 +03:00 |
|
Anatoly
|
20921719d3
|
refactored account
|
2019-09-06 11:45:30 +03:00 |
|
Anatoly
|
742d700d3c
|
refactored comments
|
2019-09-06 11:06:02 +03:00 |
|
Anatoly
|
411207868f
|
added field newsletter to UserSerializer
|
2019-09-05 17:24:27 +03:00 |
|
Anatoly
|
defe6abf4c
|
refactored account and authorization endpoints
|
2019-09-05 17:19:10 +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 |
|
Anatoly
|
d085eb4abf
|
Merge branch 'feature/authorization' into develop
|
2019-09-04 12:42:45 +03:00 |
|
Anatoly
|
5403f0d325
|
refactored: login, logout, refresh token, change email, confirm email, reset password endpoints
|
2019-09-04 12:42:23 +03:00 |
|
evgeniy-st
|
d094f055d2
|
fix counties endpoint
|
2019-09-04 11:21:31 +03:00 |
|
evgeniy-st
|
537735d193
|
sites endpoint
|
2019-09-04 10:35:37 +03:00 |
|
evgeniy-st
|
aa88721800
|
sites endpoint
|
2019-09-04 10:14:11 +03:00 |
|
Anatoly
|
09cf0f1a06
|
(In progress) refactored logout and refresh token endpoints
|
2019-09-03 18:59:11 +03:00 |
|
Anatoly
|
06e563b77a
|
refactored authorization app
|
2019-09-03 16:48:06 +03:00 |
|
Anatoly
|
b20fe5e6fb
|
update setup cookie for tokens
|
2019-09-03 16:25:44 +03:00 |
|
Anatoly
|
1b3eececf2
|
refactored authorization and account app
|
2019-09-02 15:44:37 +03:00 |
|
Anatoly
|
892159ccb6
|
Merge remote-tracking branch 'origin/develop' into feature/authorization
|
2019-09-02 13:52:53 +03:00 |
|
Anatoly
|
2f0b8ab90d
|
added endpoint to change password
|
2019-09-02 13:47:42 +03:00 |
|
Anatoly
|
6d3b7b1921
|
fixed reset password view
|
2019-09-02 13:02:11 +03:00 |
|
evgeniy-st
|
a2ef5bbfd5
|
small refactor
|
2019-09-02 12:00:19 +03:00 |
|
Anatoly
|
3c7fc7a436
|
Merge remote-tracking branch 'origin/develop' into feature/authorization
|
2019-09-02 11:10:52 +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 |
|
Anatoly
|
ba317f77b8
|
finish review model
|
2019-09-01 11:50:52 +03:00 |
|
Anatoly
|
c39b5dbf1d
|
Merge branch 'develop' into feature/authorization
|
2019-08-30 17:57:13 +03:00 |
|
Anatoly
|
f8b87c4788
|
added endpoint to change an email
|
2019-08-30 17:56:35 +03:00 |
|
evgeniy-st
|
805bda3267
|
Extend establishment filterset
|
2019-08-30 17:25:07 +03:00 |
|
evgeniy-st
|
9e1bf5ba0e
|
update news endpoint
|
2019-08-30 16:08:01 +03:00 |
|
evgeniy-st
|
9373137a29
|
remove throttling
|
2019-08-30 15:43:15 +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
|
8fccd069ec
|
added additional fields to review model
|
2019-08-30 15:30:41 +03:00 |
|
Anatoly
|
693577a524
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
|
2019-08-30 12:03:19 +03:00 |
|
Anatoly
|
62ee83b1d4
|
refactored authorization
|
2019-08-30 11:53:19 +03:00 |
|
Anatoly
|
b7c1d6a48d
|
added application review
|
2019-08-30 10:48:44 +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
|
e7c0490a4f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-08-29 14:52:08 +03:00 |
|
Dmitriy Kuzmenko
|
9a7052026b
|
add metadata
|
2019-08-29 14:51:55 +03:00 |
|
Anatoly
|
8a234b6d8f
|
added query search by title in news list endpoint
|
2019-08-29 12:52:46 +03:00 |
|
Anatoly
|
79edd6c51d
|
fixed collection list and news list endpoints
|
2019-08-29 11:42:52 +03:00 |
|
Anatoly
|
1213b39e0d
|
Merge branch 'feature/authorization' into develop
|
2019-08-29 11:40:24 +03:00 |
|
Anatoly
|
5598290456
|
refactored refresh-token endpoint
|
2019-08-29 11:40:00 +03:00 |
|
Anatoly
|
39e833ec1d
|
added custom JWT authentication
|
2019-08-29 09:43:31 +03:00 |
|
evgeniy-st
|
e3ad562680
|
update news model
|
2019-08-28 18:30:35 +03:00 |
|
Dmitriy Kuzmenko
|
967c08864d
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-08-28 18:12:09 +03:00 |
|
Dmitriy Kuzmenko
|
b2a105198f
|
fix translation
|
2019-08-28 18:11:56 +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
|
4a8053b231
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-08-28 17:54:12 +03:00 |
|
Dmitriy Kuzmenko
|
cb1ff8e410
|
add configuration
|
2019-08-28 17:53:52 +03:00 |
|
Anatoly
|
7a1d5e269c
|
refactored ImageSerializer
|
2019-08-28 17:25:16 +03:00 |
|
Anatoly
|
dbb0cbc05e
|
refactored endpoint to upload an image
|
2019-08-28 17:18: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 |
|
Anatoly
|
4c448efc96
|
added field image_url to news list and collection list
|
2019-08-28 13:41:33 +03:00 |
|
Anatoly
|
6d95349a52
|
refactored logout endpoint
|
2019-08-28 13:14:57 +03:00 |
|
Anatoly
|
de0a1d6358
|
changed jwt login view (changed status code if user not found)
|
2019-08-28 12:58:33 +03:00 |
|
Anatoly
|
0db7b52df7
|
refactored remember flag in login
|
2019-08-28 12:54:17 +03:00 |
|
Anatoly
|
e22a54114b
|
refactored collection app
|
2019-08-28 12:22:13 +03:00 |
|
Anatoly
|
0f6147c1dc
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/collection/urls/common.py
|
2019-08-28 11:50:15 +03:00 |
|
Dmitriy Kuzmenko
|
253da87a99
|
URL refactoring
|
2019-08-28 11:35:38 +03:00 |
|
Dmitriy Kuzmenko
|
3d7727b4b4
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-08-28 10:15:29 +03:00 |
|
Dmitriy Kuzmenko
|
262e98b9e1
|
add awards
|
2019-08-28 10:15:17 +03:00 |
|
Anatoly
|
b5c50ff730
|
fixed serializers
|
2019-08-28 09:55:45 +03:00 |
|
evgeniy-st
|
f65b1caf9a
|
Fix redirect settings
|
2019-08-28 09:49:50 +03:00 |
|
Anatoly
|
a35fbc4456
|
added endpoint to upload an images
|
2019-08-27 19:03:52 +03:00 |
|
Anatoly
|
2172972216
|
refactored gallery app
|
2019-08-27 18:58:40 +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
|
df2e60254e
|
fixed migrations
|
2019-08-27 17:50:24 +03:00 |
|
Anatoly
|
ee619922fa
|
fixed looped import
|
2019-08-27 17:26:43 +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 |
|
Anatoly
|
0baeeef302
|
Merge branch 'develop' into feature/gallery
|
2019-08-27 17:12:24 +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 |
|
Anatoly
|
15c1950184
|
added application gallery
|
2019-08-27 13:02:54 +03:00 |
|