Commit Graph

92 Commits

Author SHA1 Message Date
Виктор Гладких
264e7bcb2a Fix conflict 2019-10-21 14:43:14 +03:00
Виктор Гладких
c012f969af Add RestaurantReviewer role 2019-10-17 16:17:17 +03:00
Виктор Гладких
766fdcdad5 Add reviewer manager 2019-10-16 15:18:31 +03:00
Виктор Гладких
9fd89bf812 Add establishment manager role 2019-10-16 11:40:51 +03:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +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
Anatoly
6f6717efdc Merge branch 'develop' into feature/gm-192
# Conflicts:
#	apps/account/views/common.py
#	project/urls/back.py
2019-10-15 11:47:14 +03:00
Виктор Гладких
1bd3cc9170 1 2019-10-14 17:32:34 +03: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
Виктор Гладких
7b4553663c Fix 2019-10-14 15:45:41 +03:00
Виктор Гладких
b3eac3666b Standart user, guest. 2019-10-14 14:48:13 +03:00
Anatoly
9e237d4657 removed endpoint to display a list of tags by establishment id, added instead filter to filter tags by establishment id 2019-10-14 11:40:03 +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
evgeniy-st
0d7104eace Merge branch 'develop' into feature/gm-192 2019-10-11 16:44:54 +03:00
Виктор Гладких
a6c56a4bf1 Fix and refactor 2019-10-11 14:49:32 +03:00
Kuroshini
114d159449 fix tests 2019-10-11 13:46:08 +03:00
Kuroshini
71528d8a28 Password reset confirmation mechanics 2019-10-10 20:49:35 +03:00
Kuroshini
c920628574 Don't change email until user confirms it 2019-10-10 17:42:29 +03:00
Виктор Гладких
7ed976dec0 Test 2019-10-09 16:28:14 +03:00
Виктор Гладких
48ca13803e Pre test permission comment 2019-10-09 14:44:01 +03:00
Anatoly
d321866dc2 gm-192: in progress 2019-10-08 15:38:35 +03:00
Виктор Гладких
eeba02c2ae test role 2019-10-08 15:26:39 +03:00
Виктор Гладких
e66a6bcbfa Fix models 2019-10-08 10:18:51 +03:00
Виктор Гладких
7925febc77 Models role 2019-10-08 09:57:47 +03:00
Anatoly
af0e6af5c4 refactored email reconfirm view 2019-10-04 13:48:48 +03:00
evgeniy-st
ca9475b182 refactor this feature 2019-10-02 12:35:01 +03:00
Виктор Гладких
7e5844a24f Fix test auth 2019-09-24 16:06:31 +03:00
Виктор Гладких
67a5f8b2f0 Test web account 2019-09-24 15:07:00 +03:00
Виктор Гладких
28ae1ab8d1 Test reset password 2019-09-24 14:03:55 +03:00
Виктор Гладких
2ad2b3b56d Refactor 2019-09-24 12:13:39 +03:00
Виктор Гладких
b091da3f56 Fix 2019-09-24 11:07:07 +03:00
Виктор Гладких
199ca1fa77 Refactor test code 2019-09-24 10:25:44 +03:00
Виктор Гладких
7f630e9e94 Test web email confirm 2019-09-24 09:23:57 +03:00
Виктор Гладких
22c237c3d7 add test confirm email 2019-09-23 18:01:06 +03:00
Виктор Гладких
70f9100813 Add test for change-password 2019-09-23 17:31:51 +03:00
Виктор Гладких
77b9d3f4a7 Test account 2019-09-23 16:38:57 +03:00
Виктор Гладких
b57eb29b1c Merge branch 'develop' into account_test 2019-09-23 16:20:00 +03:00
Виктор Гладких
6e4d2f738f Test for /api/web/account/user/ 2019-09-23 16:18:36 +03:00
Виктор Гладких
23759974d9 Add account/user/ test for GET 2019-09-23 15:34:40 +03:00
Виктор Гладких
b69822444a Refactor tests for authorization 2019-09-23 15:06:55 +03:00
Anatoly
277c7ba2eb added field old_password to endpoint for change user password 2019-09-20 16:08:23 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Anatoly
4a3e028c3a Fixed reset password 2019-09-18 11:50:39 +03:00
Anatoly
784728d155 Facebook auth return user email; fixed URL in templates 2019-09-18 11:21:27 +03:00
Anatoly
1e650b9b1f replace ImageFields to URLFields in User model, refactored serializers that included this fields 2019-09-12 18:10:52 +03:00
Anatoly
075298f6ec refactored apps account, authorization, news, utils 2019-09-12 14:44:49 +03:00