Commit Graph

204 Commits

Author SHA1 Message Date
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
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
452c6f22ae fix role counter 2020-01-20 11:45:26 +03:00
Anatoly
765a66dc68 fix role counter 2020-01-20 11:43:35 +03:00
Anatoly
e6dfa6d74d fix SiteAffilation roles transfer 2020-01-20 11:21:51 +03:00
Dmitry Kuzmenko
f400ceed81 add filter backend for user 2020-01-17 18:15:21 +03:00
Anatoly
a26109a8da added endpoint /api/back/account/role-tab/ 2020-01-17 17:40:21 +03:00
Kuroshini
c3ed88339e order BO user by date they joined 2020-01-17 17:07:23 +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
Anatoly
6e61587b27 refactor admin panel, remove unused field from model NavBarPermission 2020-01-15 23:19:17 +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
alex
0cf62353be fix role field 2020-01-14 22:06:53 +03:00
alex
1c4e141383 fix import error for role serializer 2020-01-14 22:04:11 +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
a16e76e393 last_ip middleware 2020-01-10 14:34:52 +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
dormantman
ec00b3a24f Added correct creating subscribe 2019-12-30 22:44:58 +03:00
d.kuzmenko
6a68042178 Merge branch 'feature/permission_liquor' into 'develop'
Feature/permission liquor

See merge request gm/gm-backend!175
2019-12-23 13:40:13 +00:00
littlewolf
2b8e158954 Merge branch 'feature/add-accounts-csv' into develop 2019-12-20 13:04:04 +03:00
littlewolf
7a5897e0bb Add slash
Add docs
2019-12-20 13:02:28 +03:00
Виктор Гладких
41670729d5 Fix 2019-12-17 14:29:20 +03:00
Виктор Гладких
458370d4c9 Merge branch 'develop' into feature/permission_liquor 2019-12-17 14:24:15 +03:00
Dmitriy Kuzmenko
f6427e732a Merge remote-tracking branch 'origin/develop' into owner_list
# Conflicts:
#	apps/transfer/models.py
2019-12-13 11:08:18 +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
Dmitriy Kuzmenko
d2f011417a add datamigrate and change for models 2019-12-11 18:11:39 +03:00
littlewolf
a254160f43 Add account csv endpoint 2019-12-11 12:10:26 +03:00
Виктор Гладких
c32d3e4827 permission 2019-12-10 18:54:49 +03:00
littlewolf
47cb7f8e63 Tmp commit 2019-12-10 17:09:43 +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
alex
ed18d1c44d forgotten migrations 2019-12-10 09:24:32 +03:00
Kuroshini
a2395b807e User locale & city reading 2019-12-09 20:42:47 +03:00
Виктор Гладких
38839f75f9 Fix account test 2019-12-09 09:59:17 +03:00
Виктор Гладких
bd567200c8 Merge branch 'develop' into feature/permission_winery 2019-12-09 09:40:33 +03:00
Kuroshini
8451ccf17e add ordering & optimize serializer 2019-12-06 19:17:38 +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
Виктор Гладких
cc7754a9d7 Old role migrate1 2019-12-03 17:58:46 +03:00
Виктор Гладких
4797225beb model 2019-12-03 16:40:50 +03:00
Dmitriy Kuzmenko
ba61dbd0e5 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-12-03 15:54:30 +03:00