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 |
|
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 |
|
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 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +03:00 |
|
Виктор Гладких
|
019c22a0c8
|
Fix test
|
2019-10-21 14:39:04 +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 |
|
Anatoly
|
e435d71e00
|
Merge branch 'feature/gm-192' of https://gl.id-east.ru/gm/gm-backend into feature/gm-192
|
2019-10-10 15:09:45 +03:00 |
|
evgeniy-st
|
074a5ec5ea
|
refactor news tags
|
2019-10-09 18:25:40 +03:00 |
|
evgeniy-st
|
3c3969bf64
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 14:00:16 +03:00 |
|
e.stoyushko
|
b573038980
|
Update tasks.py
|
2019-10-09 09:46:23 +00: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
|
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
|
9a36b52eec
|
fix migrations
|
2019-10-04 15:26:29 +03:00 |
|
Anatoly
|
eaa1795f0c
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/authorization/tasks.py
|
2019-10-04 14:00:06 +03:00 |
|
evgeniy-st
|
9fb05f0407
|
Merge branch 'feature/es' into develop
|
2019-10-04 12:11:12 +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 |
|
Виктор Гладких
|
b42e9781a1
|
Fix code
|
2019-10-04 10:20:36 +03:00 |
|
Виктор Гладких
|
9fd064fdec
|
Add rating unique value
|
2019-10-03 14:51:17 +03:00 |
|
Виктор Гладких
|
14cf7d7b1b
|
Add rating value in news
|
2019-10-03 14:46:34 +03:00 |
|
Виктор Гладких
|
38be14b5ba
|
Merge branch 'develop' into feature/news-rating
|
2019-10-03 11:39:24 +03:00 |
|
Виктор Гладких
|
f90e1ceded
|
Add raiting
|
2019-10-03 11:37:59 +03:00 |
|
Anatoly
|
4796fce784
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/admin.py
|
2019-10-02 18:11:47 +03:00 |
|
Виктор Гладких
|
f0001eef93
|
Add get method in view
|
2019-10-02 17:58:22 +03:00 |
|
d.kuzmenko
|
750f141017
|
Merge branch 'feature/sending-news-email' into 'develop'
Feature/sending news email
See merge request gm/gm-backend!45
|
2019-10-02 14:17:29 +00:00 |
|