Commit Graph

116 Commits

Author SHA1 Message Date
Виктор Гладких
c80b53a0fc reviewer manager 2019-10-17 15:04:08 +03:00
Виктор Гладких
766fdcdad5 Add reviewer manager 2019-10-16 15:18:31 +03:00
Виктор Гладких
9fd89bf812 Add establishment manager role 2019-10-16 11:40:51 +03:00
Виктор Гладких
3271a6fed9 Establishment manager 2019-10-16 11:02:26 +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
Виктор Гладких
322cfcd89d Fix test 2019-10-15 15:33:28 +03:00
Виктор Гладких
9acef83894 Add country admin 2019-10-15 15:23:42 +03:00
Виктор Гладких
ff7df815f4 Fix country_id 2019-10-15 15:20:44 +03:00
Виктор Гладких
e8d0045cec Merge branch 'develop' into feature/GM-176_standard_user 2019-10-15 15:17:15 +03:00
Виктор Гладких
43531d88dc Country id 2019-10-15 10:05:31 +03:00
Виктор Гладких
1bd3cc9170 1 2019-10-14 17:32:34 +03:00
Kuroshini
6fa0051c93 Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
2019-10-14 15:53:40 +03:00
Виктор Гладких
0656e2ae32 Confirmed email for user standard 2019-10-14 15:48:31 +03:00
Виктор Гладких
b3eac3666b Standart user, guest. 2019-10-14 14:48:13 +03:00
Kuroshini
71528d8a28 Password reset confirmation mechanics 2019-10-10 20:49:35 +03:00
Anatoly
f693c36382 switched host email account, changed exception error 2019-10-02 17:16:19 +03:00
evgeniy-st
051957c7cf Refactor JSON Validation 2019-10-01 13:03:59 +03:00
Kuroshini
4d113a6916 Fix all test 2019-09-27 22:06:46 +03:00
Kuroshini
ac8356c7d1 Fix some test && routes && add migration 2019-09-27 19:03:30 +03:00
d.kuzmenko
8957a52fe7 Merge branch 'feature/collections-update-recomendations' into 'develop'
Feature/collections update recomendations

See merge request gm/gm-backend!36
2019-09-27 14:43:43 +00:00
littlewolf
7a0999a520 Add new filter 2019-09-27 17:12:12 +03:00
littlewolf
a0a6578ae8 Add new filter 2019-09-27 17:11:42 +03:00
littlewolf
b55a8ffda6 Add comments 2019-09-27 12:23:12 +03:00
littlewolf
910322273e Add annotate to filter 2019-09-27 12:01:11 +03:00
evgeniy-st
62fbded6de added todo 2019-09-27 11:41:13 +03:00
littlewolf
5793eaad32 Add queryset mixin
Switch view in urls/common
Add homepage view
Switch test
2019-09-26 20:17:50 +03:00
Kuroshini
ae00c30fac Fix test 2019-09-26 17:50:07 +03:00
Kuroshini
441c16281d format api elastic results 2019-09-26 17:23:55 +03:00
Anatoly
f1eec96ce8 Merge branch 'develop' into feature/gm-127
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/urls/common.py
2019-09-26 14:29:39 +03:00
Anatoly
0e0d6e318e GM-127: finished 2019-09-26 14:12:49 +03:00
Виктор Гладких
7c0e505798 commit changes 2019-09-26 11:48:05 +03:00
Виктор Гладких
40d9f2f2ed check 2019-09-26 11:45:26 +03:00
Виктор Гладких
86d754f4bb validate json translated field 2019-09-26 11:38:37 +03:00
Anatoly
207e35feb1 GM-127: in progress 2019-09-25 19:39:37 +03:00
littlewolf
617beb652f Add test to modified item 2019-09-25 11:12:17 +03:00
littlewolf
6bbbd1d6fe Switch decorator to validate 2019-09-25 11:11:12 +03:00
littlewolf
d006184b14 Fix update 2019-09-24 20:22:27 +03:00
littlewolf
a55695b120 Switch to decorator
Add update test
2019-09-24 20:12:09 +03:00
littlewolf
82d29d2795 Add signal 2019-09-24 15:17:08 +03:00
littlewolf
eebd66fa27 Add tests to created_by and modified_by 2019-09-24 13:35:05 +03:00
d.kuzmenko
fb93231650 Merge branch 'feature/translation-tests' into 'develop'
Add translation tests to model and API

See merge request gm/gm-backend!19
2019-09-24 06:52:32 +00:00
littlewolf
80701f27a9 Add translation tests to model and API 2019-09-23 18:02:25 +03:00
evgeniy-st
dc4b63d8b2 Refactor news 2019-09-23 15:35:37 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Semyon Yekhmenin
e2e7734bf2 Feature/advertisements update 2019-09-19 07:05:32 +00:00
Anatoly
61fc78eeb9 fixed cookie settings for stage server 2019-09-18 11:28:00 +03:00
evgeniy-st
e67d7767a1 Elasticsearch: establishment address. Filter by country_id, country_code 2019-09-17 17:33:07 +03:00
Anatoly
555aa9a4e1 GM-25: Получение главной зоны 2019-09-13 18:08:36 +03:00