Олег Хаятов
|
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 |
|
Kuroshini
|
bf0a0b42a9
|
some fixes & migrations
|
2020-02-03 17:56:05 +03:00 |
|
Anatoly
|
400b5ac402
|
change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random
|
2020-02-03 17:16:40 +03:00 |
|
alex
|
4d52ec57c4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-03 16:57:09 +03:00 |
|
alex
|
2a9ef2c704
|
refactor location transfer 1
|
2020-02-03 16:57:00 +03:00 |
|
Kuroshini
|
28253d74c4
|
remove currency code
|
2020-02-03 16:11:11 +03:00 |
|
Kuroshini
|
b062d0b729
|
refactor plates
|
2020-02-03 16:09:25 +03:00 |
|
Kuroshini
|
084db83c92
|
menu update/delete
|
2020-02-03 14:55:03 +03:00 |
|
Kuroshini
|
b1b3e923b7
|
create menu item for establishment
|
2020-02-03 14:37:17 +03:00 |
|
Anatoly
|
831b043a48
|
refactored serializers that retrieving phone numbers
|
2020-02-03 14:13:45 +03:00 |
|
Anatoly
|
6c7b7ff19e
|
fix permissions
|
2020-02-03 13:14:00 +03:00 |
|
Anatoly
|
a5bc5e98d1
|
refactored serializers that retrieving phone numbers
|
2020-02-03 13:11:13 +03:00 |
|
Anatoly
|
15b8241213
|
refactored serializers that retrieving phone numbers
|
2020-02-03 13:11:13 +03:00 |
|
alex
|
3c56b0c061
|
refactor account transfer
|
2020-02-03 12:32:53 +03:00 |
|
Олег Хаятов
|
33942b70b5
|
Merge branch 'bug-only_waiting_comments_v2' into 'develop'
bug-only_waiting_comments_v2
See merge request gm/gm-backend!256
|
2020-02-03 09:00:25 +00:00 |
|
Anatoly
|
227b3746ca
|
fix city transfer
|
2020-02-03 11:03:38 +03:00 |
|
Kirill
|
8d8a5f50fb
|
move comments filtration from model to view
|
2020-02-03 10:46:44 +03:00 |
|
Олег Хаятов
|
2dc1674f81
|
Merge branch 'bug-collections_sorting' into 'develop'
bug-collections_sorting
See merge request gm/gm-backend!255
|
2020-02-03 07:21:39 +00:00 |
|
Kuroshini
|
287c538294
|
dish update-delete
|
2020-02-01 16:01:40 +03:00 |
|
Kuroshini
|
662a1427cd
|
dish create view
|
2020-02-01 15:34:45 +03:00 |
|
Kuroshini
|
1876ca8c6d
|
backoffice wine for establishment
|
2020-02-01 14:53:35 +03:00 |
|
Kuroshini
|
804164833a
|
fix typo
|
2020-02-01 14:02:29 +03:00 |
|
Kuroshini
|
cbad99e3ac
|
read file name
|
2020-02-01 13:58:42 +03:00 |
|
Kuroshini
|
8488449cca
|
card and wines getter
|
2020-02-01 13:32:20 +03:00 |
|
Kuroshini
|
a9ad3ef7e7
|
card_and_wines get method
|
2020-01-31 21:19:32 +03:00 |
|
dormantman
|
f67c8b08a5
|
Alter comment validator
|
2020-01-31 20:50:08 +03:00 |
|
Kuroshini
|
2f4bda9a3a
|
fix comments mark transfer
|
2020-01-31 20:32:18 +03:00 |
|