Commit Graph

719 Commits

Author SHA1 Message Date
Виктор Гладких
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
Виктор Гладких
c8b3f922e9 Fix location tests 2019-10-21 11:08:30 +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
Виктор Гладких
c80b53a0fc reviewer manager 2019-10-17 15:04:08 +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
Виктор Гладких
322cfcd89d Fix test 2019-10-15 15:33:28 +03:00
Виктор Гладких
9acef83894 Add country admin 2019-10-15 15:23:42 +03:00
Виктор Гладких
ff7df815f4 Fix country_id 2019-10-15 15:20:44 +03:00
Виктор Гладких
e8d0045cec Merge branch 'develop' into feature/GM-176_standard_user 2019-10-15 15:17:15 +03:00
Виктор Гладких
43531d88dc Country id 2019-10-15 10:05:31 +03:00
Anatoly
2b35d3473b fix settings 2019-10-14 18:23:03 +03:00
Виктор Гладких
275c5b467c fixa 2019-10-14 18:15:17 +03:00
Виктор Гладких
8d2d5b87ac Fix migrate SQL 2019-10-14 17:56:51 +03:00
Виктор Гладких
01a32f66e8 Fix location migrate sql 2019-10-14 17:38:37 +03:00
Виктор Гладких
1bd3cc9170 1 2019-10-14 17:32:34 +03:00
a.feteleu
1a70ea2e99 Merge branch 'bugfix/account-confirm-pass' into 'develop'
Реверт фичи с паролем

See merge request gm/gm-backend!56
2019-10-14 13:55:00 +00:00
Kuroshini
fb4cf25dce Fix empty email after creating account 2019-10-14 16:43:59 +03:00
Kuroshini
8eaf611d7e Reverting migration 2019-10-14 16:02:02 +03:00
Kuroshini
6fa0051c93 Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
2019-10-14 15:53:40 +03:00
Виктор Гладких
0656e2ae32 Confirmed email for user standard 2019-10-14 15:48:31 +03:00
Виктор Гладких
7b4553663c Fix 2019-10-14 15:45:41 +03:00
Виктор Гладких
b3eac3666b Standart user, guest. 2019-10-14 14:48:13 +03:00
d.kuzmenko
1f6bf819e8 Merge branch 'feature/roles' into 'develop'
Feature/roles

See merge request gm/gm-backend!50
2019-10-14 07:09:18 +00:00
Виктор Гладких
1f44777a15 Fix 2019-10-11 17:04:55 +03:00
Виктор Гладких
e9ad418976 Revert migrate location 2019-10-11 16:57:59 +03:00
d.kuzmenko
35532a32f4 Merge branch 'bugfix/account-change' into 'develop'
Don't change email until user confirms it

See merge request gm/gm-backend!51
2019-10-11 13:20:13 +00:00