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 |
|
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 |
|
Kuroshini
|
90b8dafba9
|
News email #1
|
2019-10-04 20:24:48 +03:00 |
|
Anatoly
|
90ab1a2ab9
|
Revert "fix migrations"
This reverts commit 9a36b52e
|
2019-10-04 18:02:51 +03:00 |
|
Anatoly
|
d60d166031
|
added merge migration
|
2019-10-04 17:01:40 +03:00 |
|
Anatoly
|
059bcdb07d
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 15:55:58 +03:00 |
|
Kuroshini
|
4d55f80e6f
|
Added migration
|
2019-10-04 15:49:21 +03:00 |
|
d.kuzmenko
|
cc51e36457
|
Merge branch 'feature/news-rating' into 'develop'
Feature/news rating
See merge request gm/gm-backend!47
|
2019-10-04 12:43:34 +00:00 |
|
Виктор Гладких
|
aa9288d41c
|
Merge branch 'develop' into feature/news-rating
|
2019-10-04 15:41:25 +03:00 |
|
Виктор Гладких
|
f93d0095f4
|
Fix rating
|
2019-10-04 15:40:18 +03:00 |
|
Виктор Гладких
|
9f9c1064bd
|
Fix rating
|
2019-10-04 15:39:14 +03:00 |
|
Anatoly
|
9a36b52eec
|
fix migrations
|
2019-10-04 15:26:29 +03:00 |
|
Anatoly
|
ee93ad4a44
|
fix settings
|
2019-10-04 14:31:24 +03:00 |
|
Anatoly
|
c365711c05
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 14:31:03 +03:00 |
|
Anatoly
|
91790bbc39
|
refactored
|
2019-10-04 14:30:34 +03:00 |
|
evgeniy-st
|
175bd4f7b5
|
update establishment document
|
2019-10-04 14:07:50 +03:00 |
|
evgeniy-st
|
2b4638b1fa
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-04 14:04:20 +03:00 |
|
evgeniy-st
|
36922e1684
|
update settings
|
2019-10-04 14:04:08 +03: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
|
b2f900d15d
|
gm-148: refactored
|
2019-10-04 13:25:42 +03:00 |
|
evgeniy-st
|
9fb05f0407
|
Merge branch 'feature/es' into develop
|
2019-10-04 12:11:12 +03:00 |
|
evgeniy-st
|
a73cba4dcf
|
Merge branch 'develop' into feature/es
|
2019-10-04 12:06:53 +03:00 |
|
evgeniy-st
|
50a9622f78
|
News search
|
2019-10-04 12:05:13 +03:00 |
|
Anatoly
|
646eeb8972
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
|
2019-10-04 11:53:31 +03:00 |
|
Anatoly
|
4890e00b95
|
gm-148: refactored
|
2019-10-04 11:50:29 +03:00 |
|
d.kuzmenko
|
f9247477f9
|
Merge branch 'feature/news-rating' into 'develop'
Feature/news rating
See merge request gm/gm-backend!46
|
2019-10-04 08:33:13 +00:00 |
|
evgeniy-st
|
24f84ae8be
|
update tag filter
|
2019-10-04 11:16:01 +03:00 |
|
Виктор Гладких
|
b42e9781a1
|
Fix code
|
2019-10-04 10:20:36 +03:00 |
|
Виктор Гладких
|
2e0da3a15f
|
Merge branch 'develop' into feature/news-rating
|
2019-10-04 10:16:05 +03:00 |
|
Виктор Гладких
|
ca38f369f7
|
Fix
|
2019-10-04 10:15:07 +03:00 |
|
Kuroshini
|
3f6aa21005
|
Fix issue w/ Lastable service
|
2019-10-03 20:41:26 +03:00 |
|
Kuroshini
|
3da57b72fc
|
Lastable naive realization
|
2019-10-03 19:26:09 +03:00 |
|
evgeniy-st
|
8b9f6ed864
|
another fix migraztion
|
2019-10-03 18:21:04 +03:00 |
|
evgeniy-st
|
880c387759
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-03 18:12:12 +03:00 |
|
evgeniy-st
|
cb37b5733e
|
update migration
|
2019-10-03 18:10:29 +03:00 |
|
evgeniy-st
|
729a77866d
|
update elasticsearch index
|
2019-10-03 17:19:30 +03:00 |
|