Commit Graph

114 Commits

Author SHA1 Message Date
Kuroshini
798e58202c Return hardcode for chosen tags 2019-11-15 15:53:26 +03:00
a.feteleu
277fe8d17e fixed SiteFeatureSerializer 2019-11-15 13:43:32 +03:00
Anatoly
1dbd7a6451 refactored advertisements 2019-11-15 13:02:04 +03:00
Виктор Гладких
acd30fb457 Delete old awards, add new awards 2019-11-14 16:36:55 +03:00
Виктор Гладких
e08bd8508a Fix print 2019-11-14 16:35:12 +03:00
Виктор Гладких
2a9c7bf28d Fix award add 2019-11-14 16:13:44 +03:00
Виктор Гладких
78064481db Award migrate add tqdm 2019-11-14 10:53:19 +03:00
a.feteleu
0af5de9bd4 added merge migration 2019-11-12 15:18:46 +03:00
d.kuzmenko
995d55302a Merge branch 'feature/nested-published-features' into 'develop'
Feature/nested published features

See merge request gm/gm-backend!112
2019-11-12 11:57:20 +00:00
Dmitriy Kuzmenko
359deeeb39 fix model currency 2019-11-12 04:06:28 +03:00
Kuroshini
c1f89515c5 Nested sitefeatures for new design 2019-11-07 18:08:29 +03:00
Semyon Yekhmenin
475c29ee9e Added function for getting subdivision by ISO 3166-1 alpha-2 country code and ISO 3166-2 subdivision code without country prefix 2019-11-07 09:55:20 +00:00
d.kuzmenko
b5789a1a5e Merge branch 'feature/affilations/award_type' into 'develop'
Feature/affilations/award type

See merge request gm/gm-backend!104
2019-11-06 09:00:51 +00:00
Виктор Гладких
e04c621a3d Fix message 2019-11-06 11:50:42 +03:00
Виктор Гладких
390ff974d7 Fix message 2019-11-06 11:41:19 +03:00
Виктор Гладких
0ab60c1852 Add awards 2019-11-06 11:40:07 +03:00
Виктор Гладких
3e3d7a21db Add award types 2019-11-06 10:23:31 +03:00
Kuroshini
70f86c792b New email templates 2019-11-05 21:33:38 +03:00
Kuroshini
f52847a71a Remove all crunches from projects 2019-11-05 14:29:53 +03:00
Kuroshini
9d087b53ee Hardcode for presentation 2019-11-04 18:18:46 +03:00
Dmitriy Kuzmenko
2b3ded6858 fix carusel 2019-11-04 16:15:29 +03:00
Dmitriy Kuzmenko
db6c93a72f add trensfer menus 2019-11-04 00:41:34 +03:00
Dmitriy Kuzmenko
c50cd7c693 add migrations 2019-11-03 16:51:17 +03:00
Dmitriy Kuzmenko
689dca4ea1 add migrations 2019-11-03 16:45:22 +03:00
Dmitriy Kuzmenko
2e273e596d add migrations 2019-11-03 15:38:00 +03:00
Dmitriy Kuzmenko
c47f659657 add fix currency 2019-11-03 15:34:53 +03:00
evgeniy-st
4f67c295d1 Carousel link 2019-11-02 12:11:03 +03:00
evgeniy-st
dcea8b2a69 small fix 2019-11-02 12:05:18 +03:00
evgeniy-st
11d06b7b97 update Carousel model_name 2019-11-02 12:00:09 +03:00
Dmitriy Kuzmenko
0d7187e330 change get image in carusel 2019-11-01 18:20:48 +03:00
Dmitriy Kuzmenko
660eb347c5 add filter by country for carusel 2019-11-01 18:10:12 +03:00
alex
aab76d219f Merge remote-tracking branch 'origin/develop' into develop 2019-11-01 17:38:09 +03:00
alex
7acc8592a8 country for carousel 2019-11-01 17:37:53 +03:00
Dmitriy Kuzmenko
effe468777 add active to carusel 2019-11-01 16:56:37 +03:00
evgeniy-st
42cd311dc4 Carousel is parsed 2019-11-01 15:12:35 +03:00
e.stoyushko
7c530bb43b Merge branch 'feature/time-format-for-front' into 'develop'
Time format for country

See merge request gm/gm-backend!88
2019-11-01 07:23:49 +00:00
alex
68182e837c carousel fin 2019-11-01 08:41:56 +03:00
Kuroshini
a8861238ac Time format for country 2019-10-31 19:02:48 +03:00
alex
3c88d4f1f5 carousel serializer 2019-10-31 18:31:15 +03:00
alex
f237c37840 Merge remote-tracking branch 'origin/develop' into maigrate-carousel 2019-10-31 17:56:15 +03:00
alex
1946bddad2 start carousel 2019-10-31 17:55:19 +03:00
evgeniy-st
af0768b4cc Merge branch 'develop' into fix-subquery 2019-10-31 14:45:22 +03:00
e.stoyushko
2c9d579a54 Update models.py 2019-10-31 11:42:57 +00:00
Dmitriy Kuzmenko
e270131679 Merge branch 'develop' into origin/migration_fix 2019-10-29 15:27:40 +03:00
Kuroshini
37fb67cbb3 Fix subqueries 2019-10-28 14:40:39 +03:00
alex
4e0f3c9a4d with address 2019-10-28 10:59:28 +03:00
Semyon Yekhmenin
91f6503a26 Added country name to site settings 2019-10-25 10:54:01 +00: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
evgeniy-st
128488b5ee some bugfixes 2019-10-24 16:17:37 +03:00
Anatoly
1e3c80ad0c small fix 2019-10-23 17:40:42 +03:00