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 |
|
littlewolf
|
47cb7f8e63
|
Tmp commit
|
2019-12-10 17:09:43 +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 |
|
Dmitriy Kuzmenko
|
4940a4472d
|
add additional fields to UserBaseSerializer
|
2019-12-03 15:54:15 +03:00 |
|
Виктор Гладких
|
933f21cdaa
|
Merge branch 'develop' into fix/user-role-err
|
2019-12-03 15:36:41 +03:00 |
|
Виктор Гладких
|
5ecb5d214b
|
Old role migrate1
|
2019-12-03 15:24:02 +03:00 |
|
Виктор Гладких
|
f5d5ce922f
|
Old role migrate
|
2019-12-03 15:23:41 +03:00 |
|
Dmitriy Kuzmenko
|
637903e613
|
fix scheduler
|
2019-12-03 15:15:02 +03:00 |
|
Виктор Гладких
|
6d9686b64a
|
Fix error
|
2019-12-02 15:12:17 +03:00 |
|
Виктор Гладких
|
806a7d63e4
|
Migrate
|
2019-11-22 11:43:22 +03:00 |
|
Anatoly
|
617552841f
|
refactored product, fix transfer and etc., see changelist
|
2019-11-21 09:58:43 +03:00 |
|
alex
|
46d4898428
|
user back api test
|
2019-11-20 09:11:17 +03:00 |
|
Anatoly
|
9975f3f3b5
|
added bo endpoints for product notes
|
2019-11-19 18:28:53 +03:00 |
|
alex
|
a8cc734d20
|
back user api
|
2019-11-19 17:48:20 +03:00 |
|
alex
|
a1d5feb8dc
|
poroduct in_fav
|
2019-11-14 18:23:42 +03:00 |
|
alex
|
906ca921f5
|
in_favorites news
|
2019-11-13 19:33:09 +03:00 |
|
Виктор Гладких
|
7d9b6d1f30
|
Add category tag for products
|
2019-11-12 15:01:12 +03:00 |
|
Dmitriy Kuzmenko
|
7617981259
|
change command for migration of users
|
2019-11-11 15:29:31 +03:00 |
|
Виктор Гладких
|
b8d9a1344b
|
Add hash password
|
2019-11-08 16:31:43 +03:00 |
|
Виктор Гладких
|
be0412ffae
|
Fix url
|
2019-11-08 11:42:40 +03:00 |
|
Виктор Гладких
|
251d29c461
|
Add image url
|
2019-11-08 11:29:45 +03:00 |
|
Виктор Гладких
|
37ba1a1c39
|
Edit help message
|
2019-11-07 17:03:14 +03:00 |
|
Виктор Гладких
|
ba6d18d202
|
Fix account migration
|
2019-11-07 17:01:26 +03:00 |
|
alex
|
9b16f46215
|
migrate identities
|
2019-11-06 15:12:33 +03:00 |
|
alex
|
a372d29677
|
refactor comment migration
|
2019-11-06 14:24:14 +03:00 |
|
Kuroshini
|
19c7ce4c51
|
Send confirmation to new email #3
|
2019-11-05 21:49:57 +03:00 |
|
Kuroshini
|
70f86c792b
|
New email templates
|
2019-11-05 21:33:38 +03:00 |
|
Kuroshini
|
be48bff5ae
|
Send confirmation to new email
|
2019-11-05 18:56:11 +03:00 |
|
Dmitriy Kuzmenko
|
638bafe4a6
|
Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
# apps/establishment/admin.py
# project/settings/base.py
|
2019-10-30 19:12:59 +03:00 |
|
Anatoly
|
03c75efece
|
gm-259, gm-260, gm-261
|
2019-10-29 17:16:39 +03:00 |
|
Dmitriy Kuzmenko
|
e270131679
|
Merge branch 'develop' into origin/migration_fix
|
2019-10-29 15:27:40 +03:00 |
|
Dmitriy Kuzmenko
|
97f75dfc05
|
add filter accounts for existing users
|
2019-10-29 14:32:51 +03:00 |
|
littlewolf
|
338c4a4901
|
Add migration
|
2019-10-29 12:16:18 +03:00 |
|
littlewolf
|
72c6545a34
|
Add old_id to account_user
|
2019-10-29 11:30:33 +03:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +03:00 |
|