alex
|
3ce7e186f7
|
migrate from legacy news
|
2019-10-24 14:01:38 +03: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 |
|
Виктор Гладких
|
153a032853
|
Merge branch 'develop' into feature/develop_ci
|
2019-10-24 12:46:10 +03:00 |
|
evgeniy-st
|
636bc43a35
|
remove playlist from news model
|
2019-10-24 12:38:44 +03:00 |
|
alex
|
647147bf03
|
Merge branch 'develop' into feature/migrate-news
|
2019-10-24 12:28:51 +03:00 |
|
Anatoly
|
7b10a71cf6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-10-24 12:18:19 +03:00 |
|
Anatoly
|
7fa52d770e
|
added missing migration for app news
|
2019-10-24 12:17:58 +03:00 |
|
Виктор Гладких
|
947d19df68
|
Merge branch 'develop' into feature/develop_ci
|
2019-10-24 12:15:41 +03:00 |
|
evgeniy-st
|
6c4f1a2e40
|
Fix news serializer
|
2019-10-24 12:08:44 +03:00 |
|
evgeniy-st
|
0edc2fae38
|
Clean news serializer
|
2019-10-24 12:03:41 +03:00 |
|
Виктор Гладких
|
1bc2864479
|
Fix merge
|
2019-10-24 11:49:14 +03:00 |
|
a.feteleu
|
3d301cb931
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-24 11:34:12 +03:00 |
|
a.feteleu
|
2756529c7f
|
fix migrations in userroles
|
2019-10-24 11:34:00 +03:00 |
|
Sergey Melihov
|
02d26b052d
|
Merge branch 'feature/chosen_tags_view' into 'develop'
Added view for chosen tags
See merge request gm/gm-backend!68
|
2019-10-24 07:44:47 +00:00 |
|
Semyon Yekhmenin
|
890d1004e1
|
Added view for chosen tags
|
2019-10-24 07:44:47 +00:00 |
|
Виктор Гладких
|
f45f69e0e5
|
add deploy
|
2019-10-24 09:47:29 +03:00 |
|
Kuroshini
|
bc50f118b8
|
Merge branch 'feature/tag-name-indexing' into develop
|
2019-10-23 18:09:41 +03:00 |
|
Kuroshini
|
b2341194bc
|
fix serializer
|
2019-10-23 18:08:43 +03:00 |
|
Sergey Melihov
|
ab5b5801fd
|
Merge branch 'feature/tag-name-indexing' into 'develop'
tag category indexing name
See merge request gm/gm-backend!65
|
2019-10-23 15:00:39 +00:00 |
|
Sergey Melihov
|
f3caf16d2c
|
Merge branch 'changes-from-gm-148' into 'develop'
Changes from gm 148
See merge request gm/gm-backend!63
|
2019-10-23 14:57:34 +00:00 |
|
Anatoly
|
a8001c44b1
|
added validation rule to NewsBackOfficeGallerySerializer
|
2019-10-23 17:50:08 +03:00 |
|
Anatoly
|
1e3c80ad0c
|
small fix
|
2019-10-23 17:40:42 +03:00 |
|
Виктор Гладких
|
18062e60a5
|
elastic
|
2019-10-23 17:36:13 +03:00 |
|
Виктор Гладких
|
5a0ea251ca
|
elastic
|
2019-10-23 17:35:33 +03:00 |
|
Kuroshini
|
07ac06f405
|
Update migration
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
711d536c98
|
Update migration
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
ce5987de95
|
Attach establishment timestamps as command
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
d5609e4cb8
|
Works now filter first part
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
47da9929cb
|
Some fixes
|
2019-10-23 17:28:06 +03:00 |
|
Kuroshini
|
40357c20b6
|
Changes from gm-148
|
2019-10-23 17:28:06 +03:00 |
|
Виктор Гладких
|
2e99431bdd
|
elastic
|
2019-10-23 17:25:28 +03:00 |
|
Виктор Гладких
|
1092ec1884
|
delete celery, redis
|
2019-10-23 17:24:21 +03:00 |
|
a.feteleu
|
b78c4f82fe
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-23 17:13:13 +03:00 |
|
Виктор Гладких
|
40e64eafe7
|
delete celery, redis
|
2019-10-23 17:08:44 +03:00 |
|
Kuroshini
|
125c438f19
|
Review fix #2
|
2019-10-23 17:08:40 +03:00 |
|
a.feteleu
|
7e93aafc3f
|
added merge migrations
|
2019-10-23 17:05:37 +03:00 |
|
evgeniy-st
|
a7a83a8755
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-23 17:03:52 +03:00 |
|
evgeniy-st
|
b1169675a8
|
fix CurrencySerializer
|
2019-10-23 17:03:24 +03:00 |
|
Виктор Гладких
|
d1e40101b4
|
delete celery, redis
|
2019-10-23 16:59:11 +03:00 |
|
Виктор Гладких
|
1f44f21ede
|
delete celery, redis
|
2019-10-23 16:52:12 +03:00 |
|
Anatoly
|
bd3a809d85
|
fix migrations
|
2019-10-23 16:48:45 +03:00 |
|
evgeniy-st
|
d8c99062ca
|
fix singals
|
2019-10-23 16:28:42 +03:00 |
|
Виктор Гладких
|
649fcc6793
|
delete celery, redis
|
2019-10-23 16:25:57 +03:00 |
|
a.feteleu
|
2058ad09c6
|
Merge branch 'feature/gm-148' into 'develop'
Feature/gm 148
See merge request gm/gm-backend!67
|
2019-10-23 13:08:00 +00:00 |
|
alex
|
72a84d39db
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-23 16:07:05 +03:00 |
|
alex
|
938279bd7a
|
mysql to docker-compose.mysql
|
2019-10-23 16:06:54 +03:00 |
|
Виктор Гладких
|
5668da8e79
|
delete celery, redis
|
2019-10-23 16:03:50 +03:00 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
Виктор Гладких
|
052ff07ac7
|
delete celery, redis
|
2019-10-23 15:47:51 +03:00 |
|
Виктор Гладких
|
7613f67f91
|
delete celery, redis
|
2019-10-23 15:44:58 +03:00 |
|