Виктор Гладких
|
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 |
|
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
|
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 |
|
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 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
Виктор Гладких
|
9fd89bf812
|
Add establishment manager role
|
2019-10-16 11:40:51 +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
|
228cb72c36
|
Merge branch 'develop' into feature/gm-148
|
2019-10-14 18:19:46 +03:00 |
|
Kuroshini
|
8eaf611d7e
|
Reverting migration
|
2019-10-14 16:02:02 +03:00 |
|
Виктор Гладких
|
b3eac3666b
|
Standart user, guest.
|
2019-10-14 14:48:13 +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 |
|
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
|
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 |
|
Виктор Гладких
|
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 |
|
Anatoly
|
d9635a8599
|
gm-148: refactored
|
2019-10-02 10:16:32 +03:00 |
|
Anatoly
|
1e650b9b1f
|
replace ImageFields to URLFields in User model, refactored serializers that included this fields
|
2019-09-12 18:10:52 +03:00 |
|
Anatoly
|
075298f6ec
|
refactored apps account, authorization, news, utils
|
2019-09-12 14:44:49 +03:00 |
|
Anatoly
|
e1d6455e81
|
added field cropped_image to User model
|
2019-09-06 13:47:37 +03:00 |
|
Anatoly
|
047803bf43
|
added endpoint to account app; added "email_confirmed" field to User model; refactored auth app;
|
2019-08-20 15:43:59 +03:00 |
|
Anatoly
|
cfc6e05595
|
version 0.0.5.7: added method to reset password (until without confirmation)
|
2019-08-11 19:53:36 +03:00 |
|
Anatoly
|
22f2de94f2
|
version 0.0.5.1: added integration with facebook, refactored a lot
|
2019-08-09 09:56:16 +03:00 |
|
Dmitriy Kuzmenko
|
fc2a689b6d
|
version 0.0.1: add project, model user and api
|
2019-08-07 16:10:23 +03:00 |
|