d.kuzmenko
|
9129d44708
|
Merge branch 'feature/country_name_in_site_settings' into 'develop'
Added country name to site settings
See merge request gm/gm-backend!74
|
2019-10-25 10:54:01 +00:00 |
|
Semyon Yekhmenin
|
91f6503a26
|
Added country name to site settings
|
2019-10-25 10:54:01 +00:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +03:00 |
|
Dmitriy Kuzmenko
|
66ddfb455b
|
fix tests
|
2019-10-24 22:19:59 +03:00 |
|
Anatoly
|
81cdaa5c89
|
added image_url & preview_image_url to NewsDocument
|
2019-10-24 19:53:09 +03:00 |
|
evgeniy-st
|
2864576c0c
|
fix TimeZoneChoiceField
|
2019-10-24 17:09:08 +03:00 |
|
Anatoly
|
84fb0aec70
|
change field parameter in model Guide (gm-241)
|
2019-10-24 16:42:08 +03:00 |
|
d.kuzmenko
|
f484219ec7
|
Merge branch 'feature/develop_ci' into 'develop'
Feature/develop ci
See merge request gm/gm-backend!70
|
2019-10-24 13:23:00 +00:00 |
|
evgeniy-st
|
8a8986246f
|
Merge branch 'bugfix/kuroshini' into develop
|
2019-10-24 16:19:10 +03:00 |
|
evgeniy-st
|
128488b5ee
|
some bugfixes
|
2019-10-24 16:17:37 +03:00 |
|
Виктор Гладких
|
2cf0a94ccb
|
Fix migr
|
2019-10-24 16:14:18 +03:00 |
|
Виктор Гладких
|
df52c8a582
|
Add merged migrations
|
2019-10-24 15:34:35 +03:00 |
|
Виктор Гладких
|
a93a2ccc6a
|
Fix
|
2019-10-24 15:28:53 +03:00 |
|
d.kuzmenko
|
d09ca51d48
|
Merge branch 'feature/international_news_stub' into 'develop'
Added temporary stub for international news logic (hardcoded news id's)
See merge request gm/gm-backend!64
|
2019-10-24 12:21:59 +00:00 |
|
Semyon Yekhmenin
|
2b9c9d14ef
|
Added temporary stub for international news logic (hardcoded news id's)
|
2019-10-24 12:21:59 +00:00 |
|
Kuroshini
|
8c5d59e6bf
|
Revert "return fields"
This reverts commit 55ea169
|
2019-10-24 15:16:51 +03:00 |
|
Виктор Гладких
|
0dde77a64b
|
Fix search_index news
|
2019-10-24 15:12:15 +03:00 |
|
Виктор Гладких
|
b121e0ef8a
|
Merge branch 'develop' into feature/develop_ci
|
2019-10-24 14:25:39 +03:00 |
|
d.kuzmenko
|
241453668c
|
Merge branch 'return_news_images_in_search_request' into 'develop'
Return news images in search request
See merge request gm/gm-backend!71
|
2019-10-24 11:23:11 +00:00 |
|
Виктор Гладких
|
2bbfbde879
|
Merge branch 'develop' into feature/develop_ci
|
2019-10-24 14:14:57 +03:00 |
|
Kuroshini
|
55ea169dce
|
return fields
|
2019-10-24 14:14:53 +03:00 |
|
d.kuzmenko
|
b6283863f4
|
Merge branch 'feature/establishment_currency' into 'develop'
Added currency to establishment model
See merge request gm/gm-backend!69
|
2019-10-24 11:06:58 +00:00 |
|
Semyon Yekhmenin
|
74b2b52ee1
|
Added currency to establishment model
|
2019-10-24 11:06:58 +00: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 |
|
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 |
|