Commit Graph

109 Commits

Author SHA1 Message Date
Anatoly
e0ef77a392 refactored role choices 2020-02-06 17:49:07 +03:00
Anatoly
061c96d198 refactored a little, added Gin indexes to account.User model. 2020-02-05 17:59:06 +03:00
Kuroshini
c9cf2672b6 establishment team role revoked email 2020-02-05 14:18:46 +03:00
Kuroshini
8e22119de9 team 2020-02-05 13:32:50 +03:00
Kuroshini
ec1caeced3 invite existing user email 2020-02-04 22:02:40 +03:00
Kuroshini
1c5976896b fix hardcode 2020-02-04 21:32:39 +03:00
Kuroshini
fd4b6a68b1 email on new user 2020-02-04 21:30:19 +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
Anatoly
15b8241213 refactored serializers that retrieving phone numbers 2020-02-03 13:11:13 +03:00
alex
c3cc87507e confirmed at for csv users 2020-01-31 09:03:15 +03:00
alex
40fa4c543b roles for user csv 2020-01-30 17:01:27 +03:00
alex
d6b8c6191d country name for csv users 2020-01-30 14:07:28 +03:00
Anatoly
ca5440d431 refactored roles 2020-01-30 12:50:14 +03:00
Anatoly
25c63b8097 Merge branch 'develop' into feature/roles
# Conflicts:
#	apps/account/models.py
#	apps/collection/views/back.py
#	apps/comment/views/back.py
#	apps/establishment/models.py
#	apps/establishment/views/back.py
#	apps/news/views.py
#	apps/partner/views/back.py
2020-01-30 10:56:46 +03:00
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
Kuroshini
a2e200b48d fix typing 2020-01-29 22:53:28 +03:00
Kuroshini
62c25ac737 simplify code 2020-01-29 22:49:36 +03:00
a.gorbunov
f3ca4a8de9 place method to user class 2020-01-29 18:20:21 +00:00
Anatoly
236b532d98 refactored permission classes 2020-01-28 14:54:14 +03:00
Anatoly
38a6508396 modified role model 2020-01-24 18:04:32 +03:00
Anatoly
6b819e2ed4 modified search filter for backoffice account view 2020-01-23 17:32:31 +03:00
Anatoly
587f6c0bad fix role counter, added additional field role choice id 2020-01-23 13:29:09 +03:00
Anatoly
b989762568 added endpoint to get role types, change endpoint URI ( from /account/role-tab/ to /account/role/tab/) 2020-01-22 14:50:10 +03:00
Anatoly
4ff3af61b3 extend full-text search 2020-01-22 09:41:22 +03:00
Anatoly
de78ee5d6e added field phone to User model, change establishment transfer, added filters (full-text search, role_country_code, country_code), change account serializers 2020-01-21 17:36:31 +03:00
Anatoly
a26109a8da added endpoint /api/back/account/role-tab/ 2020-01-17 17:40:21 +03:00
Anatoly
391df439c6 fix reset password token generator 2020-01-16 18:05:09 +03:00
alex
2aec0bdfb4 position filter for employee 2020-01-16 16:23:10 +03:00
alex
f15ac47102 subscription_type list for user 2020-01-15 17:06:09 +03:00
alex
63cc029ce3 subscriptions read only 2020-01-15 15:03:38 +03:00
Anatoly
5c95c4923f refactored roles, refactored response for User detail view 2020-01-14 18:40:30 +03:00
Dmitriy Kuzmenko
fb00c7c3a3 add chosen tag 2020-01-14 10:53:43 +03:00
alex
989e9f9465 last country 2020-01-10 15:57:36 +03:00
alex
6ad4e0d46f last_ip 2020-01-10 14:27:00 +03:00
Anatoly
963e0597dc set username as non-required field on registration stage
(https://dev-krd.atlassian.net/browse/GM-304)
2020-01-09 17:57:10 +03:00
Виктор Гладких
458370d4c9 Merge branch 'develop' into feature/permission_liquor 2019-12-17 14:24:15 +03:00
Dmitriy Kuzmenko
bd6f8a47a1 add api for establishment admin 2019-12-13 11:02:37 +03:00
Dmitriy Kuzmenko
86b2e708f0 add datamigrate and change for models 2019-12-11 18:12:26 +03:00
Виктор Гладких
c32d3e4827 permission 2019-12-10 18:54:49 +03:00
Виктор Гладких
d441e69b81 Merge branch 'develop' into feature/permission_liquor 2019-12-10 12:51:30 +03:00
Виктор Гладких
6b8fdf7eed Add migrate for product models 2019-12-10 10:45:35 +03:00
Kuroshini
a2395b807e User locale & city reading 2019-12-09 20:42:47 +03:00
Виктор Гладких
8c8acd3e19 Models 2019-12-06 11:13:07 +03:00
Виктор Гладких
88b190d76d winery choice 2019-12-06 09:45:38 +03:00
Виктор Гладких
e7deab5bbc Merge branch 'develop' into migrate/site-affilations 2019-12-04 12:25:32 +03:00
Виктор Гладких
96e08a0900 Migrate complete 2019-12-04 12:24:23 +03:00
Виктор Гладких
4797225beb model 2019-12-03 16:40:50 +03:00
Виктор Гладких
5ecb5d214b Old role migrate1 2019-12-03 15:24:02 +03:00
Виктор Гладких
6d9686b64a Fix error 2019-12-02 15:12:17 +03:00