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 |
|
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 |
|
Kuroshini
|
700695cdcc
|
Change route for changed email confirmation
|
2019-10-11 15:57:59 +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
|
bdb9348916
|
Merge branch 'bugfix/gm-205' into feature/gm-148
# Conflicts:
# apps/establishment/models.py
|
2019-10-11 13:31:33 +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 |
|
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 |
|
Kuroshini
|
365f39ce65
|
News email detail link fix
|
2019-10-09 17:23:58 +03:00 |
|
Anatoly
|
2d375a51cf
|
change Celery state for dev settings
|
2019-10-09 16:00:06 +03:00 |
|
Anatoly
|
091491e19f
|
small fix
|
2019-10-09 15:57:35 +03:00 |
|
Anatoly
|
3f9dea30ff
|
Revert "remove duplicate migration"
This reverts commit 93894db7
|
2019-10-09 15:54:04 +03:00 |
|
Anatoly
|
2445e9f111
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:49:29 +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 |
|
evgeniy-st
|
a763bb8a3a
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:36:44 +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 |
|
Anatoly
|
f5d84d433e
|
Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148
|
2019-10-09 15:33:16 +03:00 |
|
Anatoly
|
05d3e3ff60
|
fix migrations
|
2019-10-09 15:33:05 +03:00 |
|
Kuroshini
|
f5a45fccf1
|
Fix migration
|
2019-10-09 15:32:22 +03:00 |
|
evgeniy-st
|
f3db0ffe22
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:27:11 +03:00 |
|
evgeniy-st
|
e9c4d62b58
|
remove bin/manage
|
2019-10-09 15:26:31 +03:00 |
|
evgeniy-st
|
4dfceff02d
|
Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148
|
2019-10-09 15:21:11 +03:00 |
|
evgeniy-st
|
93894db7aa
|
remove duplicate migration
|
2019-10-09 15:20:51 +03:00 |
|
Anatoly
|
41db19b167
|
Merge branch 'feature/fix-auth-refactored-email' into feature/gm-148
|
2019-10-09 15:20:34 +03:00 |
|
Anatoly
|
31f8b5abd1
|
refactored base settings
|
2019-10-09 15:19:46 +03:00 |
|
evgeniy-st
|
095b4a4bd7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:11:26 +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 |
|
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 |
|
evgeniy-st
|
3c3969bf64
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 14:00:16 +03: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 |
|
Anatoly
|
69d02e7a07
|
fix auth
|
2019-10-09 10:05:19 +03:00 |
|
evgeniy-st
|
e2e5faa3f9
|
Merge branch 'develop' into feature/gm-148
|
2019-10-08 14:41:52 +03:00 |
|
evgeniy-st
|
861daf8871
|
update search fields
|
2019-10-08 14:39:42 +03:00 |
|
evgeniy-st
|
97dc881200
|
Merge branch 'develop' into feature/gm-148
|
2019-10-07 18:03:07 +03:00 |
|
evgeniy-st
|
3bf65472d9
|
Auto fuzziness with match query
|
2019-10-07 16:31:50 +03:00 |
|
Anatoly
|
8ac5a1970f
|
fixed carousel
|
2019-10-07 10:51:08 +03:00 |
|
Anatoly
|
15ef2295ca
|
migration fix
|
2019-10-07 09:55:24 +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 |
|