Anatoly
|
03c75efece
|
gm-259, gm-260, gm-261
|
2019-10-29 17:16:39 +03:00 |
|
Anatoly
|
13eaa94261
|
added filter to FavoritesEstablishmentListView
|
2019-10-29 15:23:26 +03:00 |
|
evgeniy-st
|
251edda2ea
|
update Document ViewSet's pagination class
|
2019-10-29 15:19:07 +03:00 |
|
Anatoly
|
ed09ee78cc
|
small refactoring
|
2019-10-28 13:11:07 +03:00 |
|
Anatoly
|
65e7c965e4
|
added migrations
|
2019-10-28 12:46:10 +03:00 |
|
Anatoly
|
64b7d1469b
|
Merge branch 'develop' into feature/products
|
2019-10-28 12:36:36 +03:00 |
|
Anatoly
|
fe76fa64b5
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# celerybeat-schedule
|
2019-10-28 12:34:42 +03:00 |
|
Anatoly
|
2ebeffcf3e
|
Merge branch 'develop' of /home/a.feteleu/projects/gm-backend with conflicts.
|
2019-10-28 12:34:37 +03:00 |
|
Anatoly
|
d12df5c8e1
|
added WineAppellation model
|
2019-10-28 12:33:48 +03:00 |
|
Anatoly
|
e41b539ed7
|
added wine region
|
2019-10-27 18:42:51 +03:00 |
|
Anatoly
|
37d745eeaa
|
added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype
|
2019-10-26 18:54:22 +03:00 |
|
Anatoly
|
e3616ee7f8
|
change news_preview geometry string on 300x2260
|
2019-10-25 17:32:25 +03:00 |
|
d.kuzmenko
|
e0ada64f96
|
Merge branch 'feature/employee_position_index_name' into 'develop'
Added index_name in employee position
See merge request gm/gm-backend!72
|
2019-10-25 13:41:53 +00:00 |
|
Semyon Yekhmenin
|
e1e0f1e997
|
Added index_name in employee position
|
2019-10-25 13:41:53 +00:00 |
|
Anatoly
|
7d0acba51b
|
added to same_theme and should_read preview_image_url, added UniqueConstraint to NewsGallery model
|
2019-10-25 16:18:16 +03:00 |
|
evgeniy-st
|
174e580c20
|
Merge branch 'feature/search-by-type' into develop
|
2019-10-25 16:07:38 +03:00 |
|
evgeniy-st
|
d4fe5ebd2d
|
search by type & subtype
|
2019-10-25 16:06:52 +03:00 |
|
d.kuzmenko
|
e9683ed668
|
Merge branch 'feature/fix_role' into 'develop'
Feature/fix role
See merge request gm/gm-backend!76
|
2019-10-25 13:06:38 +00:00 |
|
Виктор Гладких
|
fb770f8e2a
|
Fix merge
|
2019-10-25 15:56:02 +03:00 |
|
Виктор Гладких
|
a38fed847a
|
Fix roles
|
2019-10-25 15:51:07 +03:00 |
|
Виктор Гладких
|
b7831b9739
|
Fix IsContentPageManager
|
2019-10-25 15:25:35 +03:00 |
|
d.kuzmenko
|
0015e16959
|
Merge branch 'feature/scheduled-establishment-reindexing' into 'develop'
Feature/scheduled establishment reindexing
See merge request gm/gm-backend!73
|
2019-10-25 12:16:00 +00:00 |
|
Kuroshini
|
4eaa600fc1
|
Fix all tests
|
2019-10-25 14:13:54 +03:00 |
|
Kuroshini
|
dd0b595132
|
Review fixes
|
2019-10-25 14:13:19 +03:00 |
|
Kuroshini
|
7f23f0e891
|
Establishment each hour reindexing
|
2019-10-25 14:13:19 +03:00 |
|
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 |
|
Виктор Гладких
|
7f4b46dbf8
|
Fix country admin
|
2019-10-25 12:42:01 +03:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +03:00 |
|
Виктор Гладких
|
046d0c5fe6
|
Fix country and comment role
|
2019-10-25 10:59:31 +03:00 |
|
Виктор Гладких
|
c33ea42b8e
|
Merge branch 'develop' into feature/fix_role
|
2019-10-25 10:15:38 +03:00 |
|
Виктор Гладких
|
851ba7f9dd
|
Test edit
|
2019-10-25 10:14:50 +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 |
|
Виктор Гладких
|
7ac7df9ea3
|
Fix test news
|
2019-10-24 16:48:29 +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 |
|