Commit Graph

811 Commits

Author SHA1 Message Date
Виктор Гладких
adbc22f1f6 Fix comment test 2019-10-21 16:03:19 +03:00
Виктор Гладких
196d335213 Fix 2019-10-21 15:47:06 +03:00
Виктор Гладких
f65af6f7cf Merge branch 'feature/GM-176_standard_user' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/GM-176_standard_user 2019-10-21 15:44:54 +03:00
Виктор Гладких
4f02fef456 Fix migrate 2019-10-21 15:44:20 +03:00
Виктор Гладких
1ed48a43eb Fix url 2019-10-21 15:31:19 +03:00
Виктор Гладких
ee93cf9ff6 Fix migrate 2019-10-21 15:15:19 +03:00
Виктор Гладких
264e7bcb2a Fix conflict 2019-10-21 14:43:14 +03:00
Виктор Гладких
019c22a0c8 Fix test 2019-10-21 14:39:04 +03:00
Виктор Гладких
6dd66275ef Fix trash 2019-10-21 12:18:57 +03:00
Виктор Гладких
3720ac2b8e Fix collection test 2019-10-21 12:17:12 +03:00
Виктор Гладких
f338906736 Fix location tests 2019-10-21 11:44:47 +03:00
d.kuzmenko
e2cbecf9a9 Merge branch 'feature/error_translations_fix' into 'develop'
Login validation error message fix

See merge request gm/gm-backend!60
2019-10-21 08:10:32 +00:00
Semyon Yekhmenin
1332a8f65a Login validation error message fix 2019-10-21 08:10:32 +00:00
Виктор Гладких
c8b3f922e9 Fix location tests 2019-10-21 11:08:30 +03:00
evgeniy-st
a9f995adbb Merge branch 'feature/gm-192' into develop 2019-10-21 10:30:40 +03:00
evgeniy-st
1cd586662a fix tagcategory binding serializer 2019-10-21 10:12:30 +03:00
evgeniy-st
21e3f76f5a Backoffice Tag&TagCategory 2019-10-18 18:02:24 +03:00
Anatoly
7be7315cef added filters and endpoint to get winery list 2019-10-18 18:00:57 +03:00
Виктор Гладких
5772558c4b Fix 2019-10-18 16:04:21 +03:00
Виктор Гладких
7a4005ec21 Merge branch 'develop' into feature/GM-176_standard_user 2019-10-18 14:54:37 +03:00
Виктор Гладких
c44f8c39c1 Fix tests news 2019-10-18 13:05:42 +03:00
Виктор Гладких
2e2ed19118 Fix establishment tests 2019-10-18 12:14:10 +03:00
e.stoyushko
a553e459a1 Merge branch 'feature/mobile_features' into 'develop'
Feature/mobile features

See merge request gm/gm-backend!53
2019-10-17 13:29:29 +00:00
Semyon Yekhmenin
1ff571b767 Feature/mobile features 2019-10-17 13:29:29 +00:00
Виктор Гладких
64ac59ee99 Add permission to view ReviewRUDView 2019-10-17 16:20:25 +03:00
Виктор Гладких
c012f969af Add RestaurantReviewer role 2019-10-17 16:17:17 +03:00
Виктор Гладких
d6ffbf5332 Merge branch 'develop' into feature/GM-176_standard_user 2019-10-17 15:27:49 +03:00
Виктор Гладких
5a058c14f4 Add back for review 2019-10-17 15:26:26 +03:00
evgeniy-st
9661de4810 Establishment types 2019-10-17 15:17:29 +03:00
Виктор Гладких
c80b53a0fc reviewer manager 2019-10-17 15:04:08 +03:00
evgeniy-st
19b3502f58 revert auth backends 2019-10-17 14:34:31 +03:00
Anatoly
8a363498f5 change broker url 2019-10-17 14:28:39 +03:00
Anatoly
8066d5607b comment all rabbitmq dependencies added redis to docker compose file 2019-10-17 13:42:11 +03:00
Anatoly
e2c27bd2e1 switched broker storage from rabbtimq to redis 2019-10-17 13:42:11 +03:00
Виктор Гладких
094aa35e66 Merge branch 'develop' into feature/GM-176_standard_user 2019-10-17 10:25:50 +03:00
d.kuzmenko
6926fc350f Merge branch 'feature/location_by_ip' into 'develop'
Added method for getting coordinates and city by ip

See merge request gm/gm-backend!52
2019-10-17 07:03:48 +00:00
Semyon Yekhmenin
5176a455c1 Added method for getting coordinates and city by ip 2019-10-17 07:03:48 +00:00
Виктор Гладких
32de6f7705 Readme 2019-10-16 15:54:15 +03:00
Виктор Гладких
766fdcdad5 Add reviewer manager 2019-10-16 15:18:31 +03:00
Виктор Гладких
5ad3776fe3 establishment manager 2019-10-16 12:14:13 +03:00
Виктор Гладких
9fd89bf812 Add establishment manager role 2019-10-16 11:40:51 +03:00
Виктор Гладких
3271a6fed9 Establishment manager 2019-10-16 11:02:26 +03:00
Виктор Гладких
04a6bbea19 Add content page manager 2019-10-16 10:43:06 +03:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +03:00
evgeniy-st
ccf6e12e3f remove tag category from establishment type 2019-10-15 18:52:32 +03:00
evgeniy-st
3a54b70093 update tag on document index 2019-10-15 18:43:08 +03:00
evgeniy-st
bde81b3700 update ES documents 2019-10-15 18:32:16 +03:00
evgeniy-st
9d4c483f51 clean models (tags) 2019-10-15 18:25:09 +03:00
evgeniy-st
42ae1cbb87 fix tagcategory queryset 2019-10-15 18:13:37 +03:00
evgeniy-st
c94ad3f017 comment some code 2019-10-15 17:48:01 +03:00