Commit Graph

191 Commits

Author SHA1 Message Date
Александр Пархомин
5273cd9d9f add docstring for ContentType 2020-02-10 12:39:18 +03:00
alex
e4547b9554 active to carousel serializer 2020-02-07 14:09:53 +03:00
alex
6feb67b0b5 GET carousel for BO 2020-02-07 13:43:20 +03:00
Anatoly
c866721c8d added a documentation for awards types 2020-02-07 12:58:38 +03:00
Anatoly
26b7ef8ad6 added a documentation for awards 2020-02-07 12:33:15 +03:00
alex
e7759ada27 AwardType List filters 2020-02-04 17:40:07 +03:00
alex
6a0943b0de years field in award type serializer 2020-02-04 17:22:37 +03:00
alex
8f899905ec years for award types 2020-02-04 17:19:09 +03:00
Anatoly
400b5ac402 change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random 2020-02-03 17:16:40 +03:00
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
dormantman
a82d6685a9 Fix news content-pages mixin 2020-01-24 15:08:42 +03:00
Ruslan Stepanov
a2f537a5ac Update content-pages 2020-01-24 11:59:13 +00:00
Kuroshini
0f053dff32 return employee after binding 2020-01-23 23:24:03 +03:00
Kuroshini
f52016bfee create award for employee and bind 2020-01-23 22:56:01 +03:00
Kuroshini
f70a3abb8c award types list view 2020-01-23 20:26:22 +03:00
Kuroshini
4002e684d5 fix god damned content-pages 2020-01-23 18:34:52 +03:00
Kuroshini
dd1b241c41 verbose award_type for API 2020-01-23 18:26:09 +03:00
dormantman
3ebd859686 Fix content-pages 2020-01-23 18:14:26 +03:00
Kuroshini
591fdc9d6a fix content-pages 2020-01-23 18:10:17 +03:00
dormantman
d98a6aeb00 Change structure 2020-01-23 17:45:59 +03:00
dormantman
0c40ed06e1 Changed to text/html response 2020-01-23 17:38:55 +03:00
dormantman
18978355bc Change method model 2020-01-23 13:56:17 +03:00
dormantman
3f44a76da9 Added retrieve id method 2020-01-22 16:32:51 +03:00
dormantman
40bfd479d2 Added access levels 2020-01-22 16:14:00 +03:00
dormantman
6a1fea76b6 Added content page method 2020-01-22 16:03:23 +03:00
Anatoly
6e61587b27 refactor admin panel, remove unused field from model NavBarPermission 2020-01-15 23:19:17 +03:00
Anatoly
fedf1400fd add M2M site feature relations to NavBarPermission model 2020-01-15 22:45:58 +03:00
Kuroshini
42885e8b4c International carousel 2020-01-15 13:45:22 +03:00
Anatoly
32ad122d9a set priority in Feature model as blank, and remove uniqueness constrait 2020-01-15 13:22:54 +03:00
alex
1c4e141383 fix import error for role serializer 2020-01-14 22:04:11 +03:00
Anatoly
6541070d1c Merge branch 'develop' into feature/navigation-bar
# Conflicts:
#	apps/main/serializers.py
2020-01-14 19:06:59 +03:00
Anatoly
5c95c4923f refactored roles, refactored response for User detail view 2020-01-14 18:40:30 +03:00
Dmitriy Kuzmenko
11b55e9f4c change chosen tag functional 2020-01-14 15:40:49 +03:00
alex
989e9f9465 last country 2020-01-10 15:57:36 +03:00
Dmitriy Kuzmenko
02d0112d8b add export for guides 2019-12-26 18:11:48 +03:00
alex
18d6c10120 footer links 2019-12-24 10:29:48 +03:00
Semyon Yekhmenin
28331e5274 Implemented filtering carousel entries by country code when country code specified and international carousel when not 2019-12-23 14:39:45 +00:00
Виктор Гладких
31fa1dacce Add qs to SiteFeatures views 2019-12-23 14:54:42 +03:00
Dmitriy Kuzmenko
f010c97433 add export for panel 2019-12-22 20:33:51 +03:00
Dmitriy Kuzmenko
71fb3249b0 add chenge to panel admin 2019-12-20 10:02:59 +03:00
Dmitriy Kuzmenko
93c9daf6c4 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-12-20 10:01:33 +03:00
Dmitriy Kuzmenko
f69d7d6e71 add chenge to panel admin 2019-12-20 10:01:22 +03:00
Kuroshini
2b117ba0f5 fix typo 2019-12-20 01:23:21 +03:00
Dmitriy Kuzmenko
847412bb2f Merge branch 'develop' into panels
# Conflicts:
#	apps/main/admin.py
2019-12-19 19:09:49 +03:00
Dmitriy Kuzmenko
a1f06fd0b9 panels executor 2019-12-19 19:07:23 +03:00
Kuroshini
bfd8044b47 remove must_of_the_week field 2019-12-19 16:48:50 +03:00
alex
4b563989a1 country_code in determine-location 2019-12-18 17:46:42 +03:00
Kuroshini
53387886cd must of the week 2019-12-17 23:13:57 +03:00
Kuroshini
f0585b3ebc fix carousel slugs 2019-12-17 18:37:51 +03:00
evgeniy-st
8a7b583154 added country_name to endpoint 'determine-location' 2019-12-17 16:49:56 +03:00