Виктор Гладких
|
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 |
|
alex
|
cd294961e0
|
Merge remote-tracking branch 'origin/develop' into feature/migration
|
2019-10-25 10:00:25 +03:00 |
|
Виктор Гладких
|
df52c8a582
|
Add merged migrations
|
2019-10-24 15:34:35 +03:00 |
|
Semyon Yekhmenin
|
74b2b52ee1
|
Added currency to establishment model
|
2019-10-24 11:06:58 +00:00 |
|
alex
|
0adac058c5
|
Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-24 13:11:05 +03:00 |
|
a.feteleu
|
2756529c7f
|
fix migrations in userroles
|
2019-10-24 11:34:00 +03:00 |
|
a.feteleu
|
7e93aafc3f
|
added merge migrations
|
2019-10-23 17:05:37 +03:00 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
Anatoly
|
fd2c1e0ca6
|
Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/production.py
|
2019-10-23 15:37:14 +03:00 |
|
Anatoly
|
6a9f11e989
|
merge from develop
|
2019-10-23 15:31:04 +03:00 |
|
Sergey Melihov
|
883f94c80a
|
Merge branch 'feature/password-changed-notification' into 'develop'
Feature/password changed notification
See merge request gm/gm-backend!58
|
2019-10-23 11:51:15 +00:00 |
|
Anatoly
|
90e53d738d
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/main/models.py
# apps/news/admin.py
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/base.py
# project/settings/production.py
# requirements/base.txt
|
2019-10-23 12:00:58 +03:00 |
|
michail
|
6dd4e1af33
|
Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects
|
2019-10-23 12:18:39 +05:00 |
|
michail
|
9e6d01b1bd
|
prototype for transfer account
|
2019-10-23 12:18:25 +05:00 |
|
littlewolf
|
f09bd5996a
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# project/settings/base.py
# requirements/base.txt
|
2019-10-23 09:27:42 +03:00 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
Виктор Гладких
|
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 |
|
Kuroshini
|
9c09f000fb
|
Password changed notification email
|
2019-10-15 16:32:47 +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
|
f86b7d489f
|
fix merge
|
2019-10-15 12:23:13 +03:00 |
|
Anatoly
|
2d830b2821
|
Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
|
2019-10-15 12:08:23 +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 |
|
michail
|
54cfccbcbe
|
the fix of types fields in all apps
|
2019-10-15 13:23:31 +05:00 |
|
Anatoly
|
228cb72c36
|
Merge branch 'develop' into feature/gm-148
|
2019-10-14 18:19:46 +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 |
|
Anatoly
|
868a3c1b78
|
added merge migration
|
2019-10-11 16:36:34 +03:00 |
|
Anatoly
|
32d56ffe83
|
Merge branch 'develop' into feature/gm-148
|
2019-10-11 16:34:06 +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 |
|
littlewolf
|
0e474a16ea
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-10 09:04:01 +03:00 |
|
Виктор Гладких
|
7ed976dec0
|
Test
|
2019-10-09 16:28:14 +03:00 |
|
michail
|
4cc9fabd73
|
edited transfer.py for notification, account, establishment
|
2019-10-09 17:43:48 +05:00 |
|
Виктор Гладких
|
48ca13803e
|
Pre test permission comment
|
2019-10-09 14:44:01 +03:00 |
|
littlewolf
|
22d2396c6b
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# docker-compose.yml
# project/settings/base.py
|
2019-10-09 07:54:15 +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 |
|
michail
|
4e96d09513
|
added transfer.py to account, comment and review
|
2019-10-07 14:34:24 +05:00 |
|
Anatoly
|
eaa1795f0c
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/authorization/tasks.py
|
2019-10-04 14:00:06 +03:00 |
|
Anatoly
|
af0e6af5c4
|
refactored email reconfirm view
|
2019-10-04 13:48:48 +03:00 |
|
Anatoly
|
4890e00b95
|
gm-148: refactored
|
2019-10-04 11:50:29 +03:00 |
|
Anatoly
|
ae4d6c3ccd
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
|
2019-10-02 15:46:35 +03:00 |
|
evgeniy-st
|
ca9475b182
|
refactor this feature
|
2019-10-02 12:35:01 +03:00 |
|
Anatoly
|
d9635a8599
|
gm-148: refactored
|
2019-10-02 10:16:32 +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 |
|