Александр Пархомин
|
b859792b8c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-05 17:05:24 +03:00 |
|
Александр Пархомин
|
20096fee8d
|
add docstring for establishment by slug
|
2020-02-05 17:05:00 +03:00 |
|
Anatoly
|
16ed67f9b1
|
refactored doc-string
|
2020-02-05 16:58:41 +03:00 |
|
Anatoly
|
8eb07205e1
|
added report app
|
2020-02-05 16:46:30 +03:00 |
|
Kuroshini
|
ab3666b03d
|
fix news states
|
2020-02-05 16:29:13 +03:00 |
|
Kuroshini
|
ce9aa30074
|
change news states
|
2020-02-05 16:12:28 +03:00 |
|
Anton Gorbunov
|
2eeb67e10f
|
Merge branch 'feature/bind-award-for-establishment' into 'develop'
cleanup code
See merge request gm/gm-backend!263
|
2020-02-05 12:51:36 +00:00 |
|
a.gorbunov
|
bf3a88fe57
|
cleanup code
|
2020-02-05 12:50:42 +00:00 |
|
Олег Хаятов
|
3edf197b81
|
Merge branch 'feature/bind-award-for-establishment' into 'develop'
allow bind or remove award for establishment
See merge request gm/gm-backend!262
|
2020-02-05 12:49:58 +00:00 |
|
a.gorbunov
|
786dbfc739
|
check by content_type
|
2020-02-05 12:47:23 +00:00 |
|
Anton Gorbunov
|
b778661564
|
Merge branch 'develop' into 'feature/bind-award-for-establishment'
# Conflicts:
# apps/establishment/views/back.py
|
2020-02-05 12:44:28 +00:00 |
|
a.gorbunov
|
a3a66a88e6
|
allow bind or remove award for establishment
|
2020-02-05 12:31:02 +00:00 |
|
Kuroshini
|
96a88e2478
|
notification messages fix
|
2020-02-05 15:06:44 +03:00 |
|
Kuroshini
|
6d556665e0
|
apply user role
|
2020-02-05 14:23:37 +03:00 |
|
Kuroshini
|
c9cf2672b6
|
establishment team role revoked email
|
2020-02-05 14:18:46 +03:00 |
|
Anatoly
|
6d9852fc7b
|
added guide type filter to guide list view
|
2020-02-05 14:16:36 +03:00 |
|
Anatoly
|
34adf748ed
|
fix location integration with ruby script
|
2020-02-05 13:58:48 +03:00 |
|
Kuroshini
|
8e22119de9
|
team
|
2020-02-05 13:32:50 +03:00 |
|
Anatoly
|
b421b934c1
|
refactored guides
|
2020-02-05 12:16:07 +03:00 |
|
Kuroshini
|
ec1caeced3
|
invite existing user email
|
2020-02-04 22:02:40 +03:00 |
|
Kuroshini
|
1c5976896b
|
fix hardcode
|
2020-02-04 21:32:39 +03:00 |
|
Kuroshini
|
fd4b6a68b1
|
email on new user
|
2020-02-04 21:30:19 +03:00 |
|
Kuroshini
|
d2440f5bf1
|
clean unaccepted invites task
|
2020-02-04 20:26:39 +03:00 |
|
Kuroshini
|
eb8ee67f06
|
dismiss from team members method
|
2020-02-04 19:40:30 +03:00 |
|
Kuroshini
|
a302e1181c
|
team members list
|
2020-02-04 18:47:28 +03:00 |
|
Anatoly
|
68ceb44acf
|
fix guide
|
2020-02-04 18:42:03 +03:00 |
|
Kuroshini
|
49d6a983d9
|
new user for team w/ confirmed email
|
2020-02-04 18:26:00 +03:00 |
|
Kuroshini
|
fc0cf3e25b
|
invite team member route
|
2020-02-04 18:22:03 +03:00 |
|
Kuroshini
|
2db59131a8
|
migration for team
|
2020-02-04 18:20:23 +03:00 |
|
Anatoly
|
c68d6ec148
|
fix extend guide method
|
2020-02-04 18:10:48 +03:00 |
|
alex
|
e7759ada27
|
AwardType List filters
|
2020-02-04 17:40:07 +03:00 |
|
alex
|
6a0943b0de
|
years field in award type serializer
|
2020-02-04 17:22:37 +03:00 |
|
alex
|
0c87e3cd25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-04 17:19:18 +03:00 |
|
alex
|
8f899905ec
|
years for award types
|
2020-02-04 17:19:09 +03:00 |
|
Anatoly
|
37eef69ee2
|
fix view
|
2020-02-04 17:16:31 +03:00 |
|
Anatoly
|
b7a84a147c
|
small fix
|
2020-02-04 17:11:06 +03:00 |
|
Anatoly
|
1c6ec90fbf
|
added an endpoint that return an array of country calling codes /api/back/location/countries/calling-codes/
|
2020-02-04 17:02:02 +03:00 |
|
Kuroshini
|
28d4122840
|
establishment statuses method
|
2020-02-04 16:23:03 +03:00 |
|
a.gorbunov
|
b74590ce75
|
remove allow null for available_for_events
|
2020-02-04 13:12:51 +00:00 |
|
a.gorbunov
|
ee8dc65f0b
|
available_for_events allow null
|
2020-02-04 13:08:19 +00:00 |
|
Kuroshini
|
e633b4f5f5
|
subtypes to establishments list
|
2020-02-04 16:05:31 +03:00 |
|
alex
|
5687eff646
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-04 16:01:40 +03:00 |
|
alex
|
9177d41309
|
refactor location transfer
|
2020-02-04 16:01:31 +03:00 |
|
Олег Хаятов
|
6bf5b2a75b
|
Merge branch 'bug-published_comments_not_displayed_v2' into 'develop'
filtration only in moderation v2
See merge request gm/gm-backend!261
|
2020-02-04 12:53:50 +00:00 |
|
a.gorbunov
|
a23c50a130
|
available_for_events not required
|
2020-02-04 12:53:08 +00:00 |
|
Kirill
|
6030b438a0
|
filtration only in moderation v2
|
2020-02-04 15:50:57 +03:00 |
|
Kuroshini
|
5aa74ff7c9
|
fix positions by establishment type/subtype
|
2020-02-04 15:42:15 +03:00 |
|
Олег Хаятов
|
9982c2ca77
|
Merge branch 'bug-published_comments_not_displayed_v2' into 'develop'
published_comments_not_displayed
See merge request gm/gm-backend!260
|
2020-02-04 12:13:44 +00:00 |
|
Anatoly
|
b286bbb1fa
|
added migrations, refactored establishment serializers
|
2020-02-04 15:07:58 +03:00 |
|
Kirill
|
f3a5605111
|
filtration only in moderation
|
2020-02-04 15:05:59 +03:00 |
|