Commit Graph

252 Commits

Author SHA1 Message Date
Kuroshini
be397a23e2 try to fix migrations 2020-02-10 16:58:04 +03:00
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
alex
590292919b Merge remote-tracking branch 'origin/develop' into develop 2020-02-05 17:32:45 +03:00
alex
10b9c36edb fix unconfirmed_email 2020-02-05 17:31:13 +03:00
Kuroshini
ce9aa30074 change news states 2020-02-05 16:12:28 +03:00
Kuroshini
96a88e2478 notification messages fix 2020-02-05 15:06:44 +03:00
Kuroshini
6d556665e0 apply user role 2020-02-05 14:23:37 +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
d2440f5bf1 clean unaccepted invites task 2020-02-04 20:26:39 +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
Kuroshini
2db59131a8 migration for team 2020-02-04 18:20:23 +03:00
Anatoly
831b043a48 refactored serializers that retrieving phone numbers 2020-02-03 14:13:45 +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
Anatoly
2544f8ef5b added flag is_superuser to UserDetailView 2020-01-31 13:06:03 +03:00
alex
d3bf68ab09 add_confirmed_at command 2020-01-31 11:25:38 +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
ce919b54d0 user roles for csv 2020-01-30 14:42:27 +03:00
alex
d6b8c6191d country name for csv users 2020-01-30 14:07:28 +03:00
alex
1b353c48da Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/account/views/back.py
2020-01-30 13:18:08 +03:00
alex
57dd5cb521 user list csv export 2020-01-30 13:15:39 +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
a.gorbunov
6a6d623ef3 update roles list 2020-01-29 09:03:45 +00:00
Anatoly
236b532d98 refactored permission classes 2020-01-28 14:54:14 +03:00
Kuroshini
4b0ef25baf roles for email changing #2 2020-01-27 21:53:18 +03:00
Kuroshini
4cfe613739 roles for email changing 2020-01-27 21:47:04 +03:00
Kuroshini
1fc0627ca9 email superuser 2020-01-27 21:10:26 +03:00
Kuroshini
bf60479c66 user short name serializer added username 2020-01-27 15:38:06 +03:00
Kuroshini
21006e77cb user id in self info 2020-01-27 15:16:29 +03:00
Anatoly
bcecb39ee2 disable checking on email field in UserDetailSerializer 2020-01-27 11:11:24 +03:00
Anatoly
0ad1408f18 added account removal action 2020-01-24 18:13:01 +03:00
Anatoly
38a6508396 modified role model 2020-01-24 18:04:32 +03:00
Kuroshini
3254573897 country name translated for roles 2020-01-24 16:50:49 +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
b4fe5dd4b0 fix role tab 2020-01-22 15:21:46 +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