Kuroshini
|
6fa0051c93
|
Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
|
2019-10-14 15:53:40 +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 |
|
Виктор Гладких
|
1f44777a15
|
Fix
|
2019-10-11 17:04:55 +03:00 |
|
Виктор Гладких
|
e9ad418976
|
Revert migrate location
|
2019-10-11 16:57:59 +03:00 |
|
d.kuzmenko
|
35532a32f4
|
Merge branch 'bugfix/account-change' into 'develop'
Don't change email until user confirms it
See merge request gm/gm-backend!51
|
2019-10-11 13:20:13 +00:00 |
|
Виктор Гладких
|
f441896d6a
|
Migrate data
|
2019-10-11 16:00:23 +03:00 |
|
Kuroshini
|
700695cdcc
|
Change route for changed email confirmation
|
2019-10-11 15:57:59 +03:00 |
|
Виктор Гладких
|
d9fc88e7c6
|
Merge branch 'develop' into feature/roles
|
2019-10-11 14:50:18 +03:00 |
|
Виктор Гладких
|
a6c56a4bf1
|
Fix and refactor
|
2019-10-11 14:49:32 +03:00 |
|
Kuroshini
|
0816a847ac
|
Some booking fixes
|
2019-10-11 14:36:25 +03:00 |
|
Kuroshini
|
114d159449
|
fix tests
|
2019-10-11 13:46:08 +03:00 |
|
Anatoly
|
0b9fd8b1dc
|
Merge branch 'bugfix/gm-205' into develop
|
2019-10-11 13:20:45 +03:00 |
|
Anatoly
|
a25d846028
|
fixed bug with duplicated records in similar establishments
|
2019-10-10 21:02:56 +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 |
|
Виктор Гладких
|
caf11ed372
|
Merge branch 'develop' into feature/roles
|
2019-10-10 16:01:33 +03:00 |
|
Виктор Гладких
|
b390b1af26
|
Fix
|
2019-10-10 16:00:23 +03:00 |
|
Виктор Гладких
|
b83efb7cda
|
Fix migrations
|
2019-10-10 15:23:44 +03:00 |
|
Виктор Гладких
|
ab5a66afe2
|
Test change
|
2019-10-10 15:20:13 +03:00 |
|
Виктор Гладких
|
56c0927a52
|
Add country control
|
2019-10-10 14:58:19 +03:00 |
|
evgeniy-st
|
2aa51b93d3
|
hide es search
|
2019-10-10 14:43:24 +03:00 |
|
Kuroshini
|
74460b3060
|
Fix imports issue
|
2019-10-10 14:43:24 +03:00 |
|
evgeniy-st
|
bb41f00451
|
hide es search
|
2019-10-10 14:42:42 +03:00 |
|
Kuroshini
|
bd7ba611fc
|
Fix imports issue
|
2019-10-10 14:28:42 +03:00 |
|
Виктор Гладких
|
dd4c7fa3eb
|
Merge branch 'develop' into feature/roles
|
2019-10-10 14:28:40 +03:00 |
|
Kuroshini
|
365f39ce65
|
News email detail link fix
|
2019-10-09 17:23:58 +03:00 |
|
Виктор Гладких
|
01dd728323
|
Refactor
|
2019-10-09 16:44:29 +03:00 |
|
Виктор Гладких
|
77839c7e8c
|
Merge branch 'develop' into feature/roles
|
2019-10-09 16:29:11 +03:00 |
|
Виктор Гладких
|
7ed976dec0
|
Test
|
2019-10-09 16:28:14 +03:00 |
|
Anatoly
|
a77b7f9c10
|
Revert "remove duplicate migration"
This reverts commit 40570a07
|
2019-10-09 15:42:46 +03:00 |
|
Anatoly
|
495b0a7563
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-10-09 15:36:50 +03:00 |
|
Anatoly
|
40570a0746
|
Revert "remove duplicate migration"
This reverts commit 93894db7
|
2019-10-09 15:36:43 +03:00 |
|
evgeniy-st
|
3ccd94f0b5
|
Merge remote-tracking branch 'origin/feature/booking' into develop
|
2019-10-09 15:36:26 +03:00 |
|
Kuroshini
|
f5a45fccf1
|
Fix migration
|
2019-10-09 15:32:22 +03:00 |
|
evgeniy-st
|
e9c4d62b58
|
remove bin/manage
|
2019-10-09 15:26:31 +03:00 |
|
e.stoyushko
|
1969af044c
|
Merge branch 'feature/booking' into 'develop'
Feature/booking
See merge request gm/gm-backend!6
|
2019-10-09 12:00:32 +00:00 |
|
Виктор Гладких
|
48ca13803e
|
Pre test permission comment
|
2019-10-09 14:44:01 +03:00 |
|
e.stoyushko
|
f3eda60868
|
Update urls.py
|
2019-10-09 11:43:09 +00:00 |
|
e.stoyushko
|
0cfc48e537
|
Update admin.py
|
2019-10-09 11:34:14 +00:00 |
|
e.stoyushko
|
c6c0ba47c5
|
Merge branch 'feature/news-mail' into 'develop'
Feature/news mail
See merge request gm/gm-backend!48
|
2019-10-09 09:47:50 +00:00 |
|
e.stoyushko
|
b573038980
|
Update tasks.py
|
2019-10-09 09:46:23 +00:00 |
|
Виктор Гладких
|
eff7dfc452
|
Merge branch 'develop' into feature/roles
|
2019-10-09 10:44:04 +03:00 |
|
Виктор Гладких
|
eeba02c2ae
|
test role
|
2019-10-08 15:26:39 +03:00 |
|
evgeniy-st
|
861daf8871
|
update search fields
|
2019-10-08 14:39:42 +03:00 |
|
Виктор Гладких
|
e66a6bcbfa
|
Fix models
|
2019-10-08 10:18:51 +03:00 |
|
Виктор Гладких
|
7925febc77
|
Models role
|
2019-10-08 09:57:47 +03:00 |
|
evgeniy-st
|
3bf65472d9
|
Auto fuzziness with match query
|
2019-10-07 16:31:50 +03:00 |
|
Kuroshini
|
d3ac747d88
|
News email #3
|
2019-10-05 18:36:29 +03:00 |
|
Kuroshini
|
73646eb05f
|
News email #2
|
2019-10-05 18:08:58 +03:00 |
|
Kuroshini
|
90b8dafba9
|
News email #1
|
2019-10-04 20:24:48 +03:00 |
|