Commit Graph

2778 Commits

Author SHA1 Message Date
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
Kuroshini
11cd688851 merge migrations 2020-02-04 14:36:33 +03:00
Олег Хаятов
d5b5149fb0 Merge branch 'feature/establishment_fields' into 'develop'
added new fields

See merge request gm/gm-backend!259
2020-02-04 11:34:44 +00:00
a.gorbunov
26b76c0b8c Optimize query 2020-02-04 11:31:13 +00:00
a.gorbunov
990b15f1d7 added new fields 2020-02-04 11:11:52 +00:00
Anatoly
d0311ec974 fix field name in serializer 2020-02-04 13:28:11 +03:00
Kuroshini
8820988196 fix establishment slugification 2020-02-04 13:27:35 +03:00
Kuroshini
056fbb4eed fix issue w/ transliterated name 2020-02-04 12:54:14 +03:00
Kuroshini
6811a5b6c0 establishment slug from index_name 2020-02-04 12:41:53 +03:00
Anatoly
25e829e629 added filtering by establishment id in /api/back/collections/guides/all/ 2020-02-04 12:11:56 +03:00
Anatoly
04c6948539 added endpoint /api/back/collections/guides/all/,
revert pagination in /api/back/collections/guides/
2020-02-04 11:36:46 +03:00
Anatoly
9bfba9af70 refactored a little guide list view 2020-02-04 10:50:52 +03:00
Anatoly
7cbfeb9845 added filtering by country code 2020-02-04 10:40:22 +03:00
Anatoly
87686abbb7 disable counter for guide elements 2020-02-04 10:40:22 +03:00
Kuroshini
223f5217a2 sort positions 2020-02-03 21:23:02 +03:00
Kuroshini
94272609bf show correct positions for establishment 2020-02-03 20:57:04 +03:00
Kuroshini
b1cf952679 positions by establishment type/subtype list 2020-02-03 20:00:24 +03:00
Олег Хаятов
122680af0b Merge branch 'bug-country_code_filtration' into 'develop'
bug-country_code_filtration

See merge request gm/gm-backend!258
2020-02-03 16:33:09 +00:00
dormantman
65ace7fb88 Added nullable 2020-02-03 19:18:50 +03:00
Kirill
fd6aced51e filtration by country code 2020-02-03 19:18:23 +03:00
Kuroshini
b4cdb2dc5b positions are binded to est type/subtype 2020-02-03 19:16:33 +03:00
Kuroshini
ab2affe305 fix transliterated name 2020-02-03 18:04:27 +03:00