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
|
d1c9e649b7
|
Remove metadatacontent
|
2019-10-22 17:05:54 +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
|
9d4c483f51
|
clean models (tags)
|
2019-10-15 18:25:09 +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 |
|
michail
|
a223832241
|
Relational integers to ForeignKey
|
2019-10-14 15:48:26 +05:00 |
|
littlewolf
|
6142508421
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-11 10:46:00 +03:00 |
|
michail
|
b2b8798c6c
|
Edited transfer.py for news, partner, reviews, comment.
Added transfer.py for recipe.
|
2019-10-10 17:46:52 +05: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 |
|
e.stoyushko
|
b573038980
|
Update tasks.py
|
2019-10-09 09:46:23 +00:00 |
|
littlewolf
|
22d2396c6b
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# docker-compose.yml
# project/settings/base.py
|
2019-10-09 07:54:15 +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 |
|
michail
|
511312bb28
|
added transfer.py to partner
|
2019-10-04 16:20:04 +05: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 |
|
Виктор Гладких
|
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 |
|
Виктор Гладких
|
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 |
|
evgeniy-st
|
ca9475b182
|
refactor this feature
|
2019-10-02 12:35:01 +03:00 |
|
michail
|
5ec81f417a
|
fix bug
|
2019-10-02 13:37:46 +05:00 |
|
michail
|
393ecbb55c
|
Merge remote-tracking branch 'origin/feature/sending-news-email' into feature/sending-news-email
# Conflicts:
# apps/news/admin.py
# apps/news/tasks.py
|
2019-10-02 13:31:29 +05:00 |
|
michail
|
fb9e71cbdd
|
fix querysets
|
2019-10-02 13:27:33 +05:00 |
|
Виктор Гладких
|
e611e3154d
|
Push
|
2019-10-02 11:21:28 +03:00 |
|
evgeniy-st
|
8f66f5372d
|
Merge branch 'develop' into feature/will-also-like-news
|
2019-10-02 10:45:16 +03:00 |
|
michail
|
02638a26fe
|
added sending through celery
|
2019-10-02 12:09:45 +05:00 |
|
michail
|
c0149a0695
|
added country_code to news email template
|
2019-10-02 11:48:03 +05:00 |
|
michail
|
c28d1cf3a0
|
fix locale and country code in task
|
2019-10-02 11:48:03 +05:00 |
|
michail
|
5474c2ff69
|
added news mail template and task without celery delay
|
2019-10-02 11:48:03 +05:00 |
|
michail
|
6683d4a4ef
|
First commit
|
2019-10-02 11:48:03 +05:00 |
|
Виктор Гладких
|
266ace6912
|
Merge branch 'develop' into feature/sending-news-email
|
2019-10-01 17:52:28 +03:00 |
|