Commit Graph

787 Commits

Author SHA1 Message Date
Виктор Гладких
78e1e448d9 News search 2019-09-30 10:09:46 +03:00
Kuroshini
d42bf43d19 Latest award for carousel 2019-09-27 22:56:44 +03:00
Kuroshini
9aafe0d69d new establishment attribute 2019-09-27 22:27:25 +03:00
Kuroshini
051ddb617d fix conflicts after rebase 2019-09-27 22:27:25 +03:00
Kuroshini
98b0a9af5d latest award && test fix 2019-09-27 22:27:25 +03:00
Kuroshini
4388fb7346 latest award for establishment 2019-09-27 22:27:25 +03:00
Kuroshini
4d113a6916 Fix all test 2019-09-27 22:06:46 +03:00
Kuroshini
1957ab6300 Pagination for ES results 2019-09-27 20:54:55 +03:00
Kuroshini
d71ed0c1de Fix lot/lat x/y mapping && address serialization 2019-09-27 19:44:00 +03:00
Kuroshini
ac8356c7d1 Fix some test && routes && add migration 2019-09-27 19:03:30 +03:00
Dmitriy Kuzmenko
2af401daa5 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-09-27 17:44:19 +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
d.kuzmenko
e698ae390a Merge branch 'feature/news_author_GM-149' into 'develop'
Author

See merge request gm/gm-backend!35
2019-09-27 14:41:57 +00:00
Виктор Гладких
4f3c804251 Fix 2019-09-27 17:34:13 +03:00
Виктор Гладких
49ab0a5843 Fix conflict 2019-09-27 17:31:33 +03:00
Dmitriy Kuzmenko
54c392762c Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-09-27 17:25:51 +03:00
Виктор Гладких
d25e4af488 Created by 2019-09-27 17:21:57 +03:00
evgeniy-st
03753f9059 News model, state 2019-09-27 17:16:40 +03: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
Виктор Гладких
ae87a51277 Author 2019-09-27 17:10:08 +03:00
evgeniy-st
785d2a2f09 update news serializer, RUD for backoffice 2019-09-27 16:56:26 +03:00
michail
755490c6cf done 2019-09-27 17:12:24 +05:00
littlewolf
b55a8ffda6 Add comments 2019-09-27 12:23:12 +03:00
evgeniy-st
941feb4233 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-09-27 12:22:03 +03:00
evgeniy-st
46ce25f0f7 fix migration 2019-09-27 12:21:50 +03:00
d.kuzmenko
0be257d305 Merge branch 'featue/gm-119-search_mobile' into 'develop'
Double api

See merge request gm/gm-backend!33
2019-09-27 09:10:14 +00:00
littlewolf
910322273e Add annotate to filter 2019-09-27 12:01:11 +03:00
evgeniy-st
cd951ddd75 remove custom slug field from serializer, small fix in migration 2019-09-27 11:57:42 +03:00
evgeniy-st
c9bf83fba7 News slug, disable null, remove editable 2019-09-27 11:53:40 +03:00
Виктор Гладких
fc5ec0920e fix 2019-09-27 11:43:14 +03:00
evgeniy-st
62fbded6de added todo 2019-09-27 11:41:13 +03:00
Виктор Гладких
c7974a7511 Refactor authorization test 2019-09-27 11:33:49 +03:00
evgeniy-st
993e58d215 fix views after merge 2019-09-27 11:20:43 +03:00
Виктор Гладких
d115d30e82 Fix test authorization 2019-09-27 11:19:49 +03:00
Виктор Гладких
aa037d27f5 Double api 2019-09-27 10:43:24 +03:00
evgeniy-st
6806d0b216 Merge branch 'develop' into feature/refactor-establishments 2019-09-27 10:20:30 +03:00
evgeniy-st
403a60623a Merge branch 'develop' into feature/refactor-establishments 2019-09-27 10:05:15 +03:00
michail
962dc2f480 maybe it is solution 2019-09-27 12:01:30 +05:00
michail
9608fdb92a property was added to news model 2019-09-27 11:30:58 +05:00
michail
b1b9ab5ab2 First commit 2019-09-27 11:14:18 +05:00
littlewolf
44f792db0c Switch sorting 2019-09-27 07:58:21 +03:00
littlewolf
4f2bca78f9 Update tests
Update view
2019-09-27 07:52:57 +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
d.kuzmenko
94bd07d31d Merge branch 'bugfix/format-web-and-search-api' into 'develop'
Bugfix/format web and search api

See merge request gm/gm-backend!32
2019-09-26 14:58:43 +00:00
Kuroshini
87999830d1 Remove description from search results 2019-09-26 17:53:21 +03:00
Kuroshini
ae00c30fac Fix test 2019-09-26 17:50:07 +03:00
Kuroshini
fec3a2f6bc Reformat establishment elastic location for api 2019-09-26 17:46:07 +03:00
Kuroshini
e0d09486c2 Revert "address coordinates in get api queries"
This reverts commit f21b400
2019-09-26 17:40:35 +03:00
Kuroshini
2fe0ce86d3 Refactor elastic serializer 2019-09-26 17:40:09 +03:00