alex
|
0dbb2c64cd
|
fix new in_fav detail
|
2019-11-15 10:46:21 +03:00 |
|
Dmitriy Kuzmenko
|
956467e999
|
add view count to news serializer
|
2019-11-15 00:26:14 +03:00 |
|
d.kuzmenko
|
c644cbfd64
|
Merge branch 'feature/transfer-page-counters' into 'develop'
Add rating.views_count transfer
See merge request gm/gm-backend!134
|
2019-11-14 21:09:26 +00:00 |
|
littlewolf
|
726610d147
|
Update to onetoone
Update rating annotation
Add migrations
|
2019-11-14 23:44:49 +03:00 |
|
littlewolf
|
4e72487558
|
Add rating.views_count transfer
|
2019-11-14 20:54:14 +03:00 |
|
Kuroshini
|
843230b641
|
Filters for news favorites
|
2019-11-14 20:02:09 +03:00 |
|
alex
|
322af9efef
|
fix news in_fav
|
2019-11-14 17:07:31 +03:00 |
|
alex
|
906ca921f5
|
in_favorites news
|
2019-11-13 19:33:09 +03:00 |
|
Kuroshini
|
ebf31f8492
|
Order news in search results
|
2019-11-13 17:11:47 +03:00 |
|
Anatoly
|
8cf50ff2cd
|
added endpoints for back office and refactored a little
|
2019-11-13 12:07:02 +03:00 |
|
Semyon Yekhmenin
|
fe6f9953d8
|
Added mobile news endpoints
|
2019-11-12 13:12:10 +00:00 |
|
Kuroshini
|
d3ab910fba
|
Filter recipes news
|
2019-11-12 15:10:50 +03:00 |
|
alex
|
0b157244e0
|
Merge remote-tracking branch 'origin/feature/favorite-news' into develop
|
2019-11-12 08:51:55 +03:00 |
|
Dmitriy Kuzmenko
|
ec96c32453
|
fix product type
|
2019-11-12 02:28:33 +03:00 |
|
alex
|
d853960d2e
|
create, delete, get favorite news
|
2019-11-05 17:52:36 +03:00 |
|
evgeniy-st
|
83bab7f383
|
remove hardcoded news
|
2019-11-05 15:59:28 +03:00 |
|
Dmitriy Kuzmenko
|
c5e96a7ad8
|
fix retrieve
|
2019-11-04 20:33:35 +03:00 |
|
Kuroshini
|
9d087b53ee
|
Hardcode for presentation
|
2019-11-04 18:18:46 +03:00 |
|
Kuroshini
|
4dd06f772f
|
Use old ids for demonstration
|
2019-11-04 15:30:59 +03:00 |
|
Dmitriy Kuzmenko
|
55c24c400b
|
change news tag command
|
2019-11-04 11:49:57 +03:00 |
|
Dmitriy Kuzmenko
|
888e18b9b1
|
change news tag command
|
2019-11-04 11:35:13 +03:00 |
|
Dmitriy Kuzmenko
|
b37b634f59
|
change news tag command
|
2019-11-04 11:09:15 +03:00 |
|
Dmitriy Kuzmenko
|
8e61071759
|
add news tag command
|
2019-11-03 20:33:45 +03:00 |
|
Anatoly
|
4f89d7603e
|
change translation mechanics
|
2019-11-03 17:00:47 +03:00 |
|
Anatoly
|
10fb4ee0dd
|
small fix
|
2019-11-03 01:40:45 +03:00 |
|
Anatoly
|
201dd40193
|
fixed related news, but in future need refactoring
|
2019-11-03 01:32:46 +03:00 |
|
Anatoly
|
c14ab722a1
|
change field parameter in model Guide (gm-241)
|
2019-11-03 00:25:03 +03:00 |
|
alex
|
7e503f617e
|
merge migrations
|
2019-10-30 20:15:19 +03:00 |
|
alex
|
962d24f737
|
Merge branch 'migration_fix' into develop
# Conflicts:
# apps/establishment/admin.py
# apps/transfer/models.py
|
2019-10-30 20:04:02 +03:00 |
|
Anatoly
|
414ad72ed3
|
Revert "modified NewsImageSerializer, in future needs refactoring"
This reverts commit 776b500d
|
2019-10-30 20:01:19 +03:00 |
|
Anatoly
|
776b500d19
|
modified NewsImageSerializer, in future needs refactoring
|
2019-10-30 19:59:12 +03:00 |
|
a.feteleu
|
d31bb9b495
|
merge migrations
|
2019-10-30 19:19:40 +03:00 |
|
Dmitriy Kuzmenko
|
638bafe4a6
|
Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
# apps/establishment/admin.py
# project/settings/base.py
|
2019-10-30 19:12:59 +03:00 |
|
Dmitriy Kuzmenko
|
03ee9c1279
|
Merge remote-tracking branch 'origin/origin/migration_fix' into origin/migration_fix
# Conflicts:
# apps/transfer/serializers/news.py
|
2019-10-30 18:52:56 +03:00 |
|
Dmitriy Kuzmenko
|
58be2491a5
|
create command for establishment tags
|
2019-10-30 18:47:13 +03:00 |
|
alex
|
4343060c74
|
Merge branch 'migration_fix' into HEAD
|
2019-10-30 15:49:32 +03:00 |
|
alex
|
8c3306628e
|
news transfer
|
2019-10-30 15:48:32 +03:00 |
|
alex
|
c521839389
|
news refactor
|
2019-10-30 13:53:12 +03:00 |
|
evgeniy-st
|
00bcd6c205
|
added merge migrations
|
2019-10-30 11:59:19 +03:00 |
|
evgeniy-st
|
e371fdceea
|
Merge branch 'develop' into migration_fix
|
2019-10-30 11:50:30 +03:00 |
|
Anatoly
|
5675f23fae
|
fixed BaseModelAdminMixin
|
2019-10-29 18:12:52 +03:00 |
|
Dmitriy Kuzmenko
|
8fd14f2f44
|
Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/migration_fix
|
2019-10-29 15:27:19 +03:00 |
|
Anatoly
|
8cf2cebe85
|
added BaseModelAdminMixin
|
2019-10-29 14:01:27 +03:00 |
|
alex
|
dc11fb055f
|
fix news and paris establishments
|
2019-10-29 12:34:08 +03:00 |
|
Dmitriy Kuzmenko
|
411bef5272
|
change admin for news
|
2019-10-29 10:30:08 +03:00 |
|
alex
|
4e0f3c9a4d
|
with address
|
2019-10-28 10:59:28 +03:00 |
|
alex
|
49dbc9c72e
|
Merge remote-tracking branch 'origin/migrate-location-app' into origin/feature/migrate-etablishment
|
2019-10-28 10:22:33 +03:00 |
|
alex
|
16f06ce2f1
|
fix news slug
|
2019-10-26 22:02:38 +03:00 |
|
littlewolf
|
7e757aa63f
|
Merge branch 'origin/feature/migration' into migrate-location-app
# Conflicts:
# apps/gallery/models.py
# apps/location/transfer_data.py
# apps/transfer/management/commands/transfer.py
# project/settings/base.py
# requirements/base.txt
|
2019-10-26 08:45:12 +03: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 |
|
Виктор Гладких
|
b7831b9739
|
Fix IsContentPageManager
|
2019-10-25 15:25:35 +03:00 |
|
alex
|
0f595ee40b
|
merge migrations
|
2019-10-25 12:07:02 +03:00 |
|
alex
|
cd294961e0
|
Merge remote-tracking branch 'origin/develop' into feature/migration
|
2019-10-25 10:00:25 +03:00 |
|
littlewolf
|
95b5d4ad99
|
Merge branch 'develop' into migrate-location-app
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-25 09:54:03 +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 |
|
Anatoly
|
84fb0aec70
|
change field parameter in model Guide (gm-241)
|
2019-10-24 16:42:08 +03:00 |
|
alex
|
a667655c09
|
pprint
|
2019-10-24 15:32:47 +03:00 |
|
Semyon Yekhmenin
|
2b9c9d14ef
|
Added temporary stub for international news logic (hardcoded news id's)
|
2019-10-24 12:21:59 +00:00 |
|
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 |
|
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 |
|
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 |
|
Anatoly
|
a8001c44b1
|
added validation rule to NewsBackOfficeGallerySerializer
|
2019-10-23 17:50:08 +03:00 |
|
a.feteleu
|
7e93aafc3f
|
added merge migrations
|
2019-10-23 17:05:37 +03:00 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
Anatoly
|
fd2c1e0ca6
|
Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/production.py
|
2019-10-23 15:37:14 +03:00 |
|
Anatoly
|
6a9f11e989
|
merge from develop
|
2019-10-23 15:31:04 +03:00 |
|
evgeniy-st
|
64692ae4b3
|
max length of slug is 255
|
2019-10-23 12:03:50 +03:00 |
|
Anatoly
|
90e53d738d
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/main/models.py
# apps/news/admin.py
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/base.py
# project/settings/production.py
# requirements/base.txt
|
2019-10-23 12:00:58 +03:00 |
|
littlewolf
|
f09bd5996a
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# project/settings/base.py
# requirements/base.txt
|
2019-10-23 09:27:42 +03:00 |
|
littlewolf
|
915683fa7b
|
Remove comments
|
2019-10-23 09:16:39 +03:00 |
|
evgeniy-st
|
0c8959f4e7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-22 17:11:22 +03:00 |
|
evgeniy-st
|
d1c9e649b7
|
Remove metadatacontent
|
2019-10-22 17:05:54 +03:00 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
d.kuzmenko
|
18a2517fde
|
Merge branch 'feature/GM-176_standard_user' into 'develop'
Feature/gm 176 standard user
See merge request gm/gm-backend!54
|
2019-10-21 14:50:47 +00:00 |
|
Semyon Yekhmenin
|
afc2127646
|
Updated news model with agenda and banner
|
2019-10-21 14:45:34 +00:00 |
|
Виктор Гладких
|
d1d092e49d
|
Fix news tests
|
2019-10-21 16:21:14 +03:00 |
|
michail
|
4d3ecb65f2
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-21 17:32:02 +05:00 |
|
michail
|
e7107cfd04
|
fixes of news
|
2019-10-21 17:31:44 +05:00 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +03:00 |
|
Виктор Гладких
|
019c22a0c8
|
Fix test
|
2019-10-21 14:39:04 +03:00 |
|
littlewolf
|
3f85aa84cc
|
Remove tmp code
|
2019-10-21 14:19:01 +03:00 |
|
littlewolf
|
0a24b80917
|
Add title method
|
2019-10-20 19:08:14 +03:00 |
|
littlewolf
|
8965cf0460
|
Add news serializer
|
2019-10-20 17:59:18 +03:00 |
|
Виктор Гладких
|
c44f8c39c1
|
Fix tests news
|
2019-10-18 13:05:42 +03:00 |
|
Виктор Гладких
|
04a6bbea19
|
Add content page manager
|
2019-10-16 10:43:06 +03:00 |
|
Виктор Гладких
|
86692019d1
|
Add Country admin to views
|
2019-10-16 10:14:23 +03:00 |
|
evgeniy-st
|
c268575a04
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:33:44 +03:00 |
|
evgeniy-st
|
9d4c483f51
|
clean models (tags)
|
2019-10-15 18:25:09 +03:00 |
|
Anatoly
|
f86b7d489f
|
fix merge
|
2019-10-15 12:23:13 +03:00 |
|
Anatoly
|
2d830b2821
|
Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
|
2019-10-15 12:08:23 +03:00 |
|
littlewolf
|
47a4d28cf0
|
Add fields map for simple field
Add fields map for tuple field
Refactoring code
|
2019-10-15 12:05:49 +03:00 |
|
michail
|
dc12a184a1
|
the fix types of news fields
|
2019-10-15 12:46:06 +05:00 |
|