Commit Graph

501 Commits

Author SHA1 Message Date
michail
9608fdb92a property was added to news model 2019-09-27 11:30:58 +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
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
Kuroshini
441c16281d format api elastic results 2019-09-26 17:23:55 +03:00
Kuroshini
f21b4005aa address coordinates in get api queries 2019-09-26 16:39:30 +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
c4d8b89a8d gm-127: finished 2019-09-26 14:19:01 +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
Dmitriy Kuzmenko
0fc89e7053 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-09-26 11:39:58 +03:00
Dmitriy Kuzmenko
6ea876cdc6 test small fix 2019-09-26 11:39:48 +03:00
Виктор Гладких
86d754f4bb validate json translated field 2019-09-26 11:38:37 +03:00
d.kuzmenko
9f83f42742 Merge branch 'notification-tests' into 'develop'
Add notification tests

See merge request gm/gm-backend!23
2019-09-26 08:35:03 +00:00
d.kuzmenko
e0f71d2646 Merge branch 'feature/add-base-attributes-autouse' into 'develop'
Feature/add base attributes autouse

See merge request gm/gm-backend!24
2019-09-26 08:34:38 +00:00
d.kuzmenko
169f0db834 Merge branch 'feature/location-tests' into 'develop'
Feature/location tests

See merge request gm/gm-backend!25
2019-09-26 08:33:57 +00:00
d.kuzmenko
2721071e4a Merge branch 'feature/fix-news-urls' into 'develop'
Fixed urls and tests for news

See merge request gm/gm-backend!26
2019-09-26 08:33:14 +00:00
d.kuzmenko
0e4b714d2f Merge branch 'feature/update-establishment-slug-urls' into 'develop'
Feature/update establishment slug urls

See merge request gm/gm-backend!29
2019-09-26 08:32:27 +00:00
d.kuzmenko
218787bec1 Merge branch 'hotfix/favorites-create' into 'develop'
Fix favorites creation by slug

See merge request gm/gm-backend!27
2019-09-26 08:31:52 +00:00
littlewolf
3279fce339 Update tests 2019-09-26 11:19:06 +03:00
Kuroshini
c2bd4b7da8 add slug && preview_image_url to search results 2019-09-25 19:58:25 +03:00
littlewolf
877d3d9e6a Fix test
Add todo to fix error
2019-09-25 19:44:33 +03:00
Anatoly
207e35feb1 GM-127: in progress 2019-09-25 19:39:37 +03:00
Kuroshini
d8dd1fd7d6 Fix carousel field types 2019-09-25 19:00:10 +03:00
littlewolf
cabee12fab Add comment tests
Add favorite tests
2019-09-25 18:58:52 +03:00
littlewolf
07a0f8e295 Temp commit 2019-09-25 17:34:11 +03:00
evgeniy-st
f18c18110c Refactor some establishment serializer 2019-09-25 15:32:45 +03:00
Kuroshini
f38924db42 Fix favorites creation by slug 2019-09-25 14:09:24 +03:00
littlewolf
a2ade761b4 Update web urls 2019-09-25 14:04:52 +03:00
Anatoly
8766388256 fixed similar establishments 2019-09-25 13:16:02 +03:00
Anatoly
90c9e321f7 fixed similar establishments 2019-09-25 13:05:07 +03:00
Anatoly
0e643a1dfa Merge branch 'develop' of /home/a.feteleu/projects/gm-backend with conflicts. 2019-09-25 12:23:25 +03:00
michail
cf19904349 Fixed urls and tests for news 2019-09-25 13:17:24 +05: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
2261875d3c Fix tests 2019-09-24 21:36:59 +03:00
littlewolf
c50bdc8637 Add city tests 2019-09-24 21:34:21 +03:00
littlewolf
7455d2c856 Add region tests 2019-09-24 21:30:59 +03:00
littlewolf
6b3558e3ac Add country tests 2019-09-24 21:28:11 +03:00
littlewolf
d62cee341c Add address tests 2019-09-24 21:03:50 +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
Anatoly
77d39954c3 added ordering to list of favorites 2019-09-24 17:54:22 +03:00
Kuroshini
ecdf2fcaa0 Change slugs and str url order 2019-09-24 16:45:36 +03:00
littlewolf
2f61df2c65 Add address CRUD tests 2019-09-24 16:20:04 +03:00
Виктор Гладких
7e5844a24f Fix test auth 2019-09-24 16:06:31 +03:00
michail
a83a62b26b Add notification tests 2019-09-24 17:32:18 +05:00
littlewolf
82d29d2795 Add signal 2019-09-24 15:17:08 +03:00
Виктор Гладких
9e47945f40 Merge branch 'develop' into account_test 2019-09-24 15:08:12 +03:00
Виктор Гладких
67a5f8b2f0 Test web account 2019-09-24 15:07:00 +03:00
Kuroshini
1534c9b09c Remove unique
(cherry picked from commit f793c20)
2019-09-24 14:51:51 +03:00
d.kuzmenko
d627df41c0 Merge branch 'feature/slugs-in-path' into 'develop'
Feature/slugs in path

See merge request gm/gm-backend!20
2019-09-24 11:05:37 +00:00
Виктор Гладких
28ae1ab8d1 Test reset password 2019-09-24 14:03:55 +03:00
littlewolf
eebd66fa27 Add tests to created_by and modified_by 2019-09-24 13:35:05 +03:00
Kuroshini
f49ea12108 Remove unnecessary field 2019-09-24 12:39:08 +03:00
Kuroshini
0b5e40640c Remove test url 2019-09-24 12:36:52 +03:00
evgeniy-st
33055df2ae GeoIP: update logger level 2019-09-24 12:31:52 +03:00
Kuroshini
65914659e5 Slugs serializers 2019-09-24 12:31:35 +03:00
Виктор Гладких
2ad2b3b56d Refactor 2019-09-24 12:13:39 +03:00
Kuroshini
d224c77a01 Fix issues with test && recreate migrations 2019-09-24 12:06:11 +03:00
d.kuzmenko
94f028ce68 Merge branch 'account_test' into 'develop'
Account test

See merge request gm/gm-backend!21
2019-09-24 08:28:54 +00:00
Виктор Гладких
b091da3f56 Fix 2019-09-24 11:07:07 +03:00
Kuroshini
2cc0d01d79 Fix issues after rebase 2019-09-24 10:38:04 +03:00
Kuroshini
73a858cc8c Slugs feature migrations 2019-09-24 10:38:04 +03:00
Kuroshini
6420a676df create slugs manually 2019-09-24 10:38:04 +03:00
Kuroshini
1ce71fdcdc slugs for news & establishments 2019-09-24 10:38:04 +03:00
Виктор Гладких
199ca1fa77 Refactor test code 2019-09-24 10:25:44 +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
d.kuzmenko
160bc9e0ff Merge branch 'feature/favorites-tests' into 'develop'
Add favorites tests

See merge request gm/gm-backend!18
2019-09-24 06:49:57 +00:00
Виктор Гладких
7f630e9e94 Test web email confirm 2019-09-24 09:23:57 +03:00
Виктор Гладких
afce9493e9 Merge branch 'develop' into account_test 2019-09-24 09:09:53 +03:00
littlewolf
80701f27a9 Add translation tests to model and API 2019-09-23 18:02:25 +03:00
Виктор Гладких
22c237c3d7 add test confirm email 2019-09-23 18:01:06 +03:00
Виктор Гладких
70f9100813 Add test for change-password 2019-09-23 17:31:51 +03:00
evgeniy-st
b4320ab4a6 End of news may be None 2019-09-23 17:17:42 +03:00
evgeniy-st
fd265a397b Update NewsBaseSerializer 2019-09-23 16:53:33 +03:00
Виктор Гладких
31f6c2c53a Merge branch 'develop' into account_test 2019-09-23 16:47:25 +03:00
evgeniy-st
8f60937e4b Fix migration collection 2019-09-23 16:44:28 +03:00
evgeniy-st
83fddd63c3 fix migration establishment 2019-09-23 16:41:20 +03:00
Виктор Гладких
77b9d3f4a7 Test account 2019-09-23 16:38:57 +03:00
michail
b75ac46c88 Add favorites tests 2019-09-23 18:38:39 +05:00
Виктор Гладких
b57eb29b1c Merge branch 'develop' into account_test 2019-09-23 16:20:00 +03:00
Виктор Гладких
6e4d2f738f Test for /api/web/account/user/ 2019-09-23 16:18:36 +03:00
evgeniy-st
d424704cec fix migration 2019-09-23 16:13:48 +03:00
evgeniy-st
fdf2974ee5 Merge branch 'feature/refactor-news' into develop 2019-09-23 16:11:20 +03:00
evgeniy-st
009533d764 Tags & disable elasticsearch indexing 2019-09-23 16:06:40 +03:00
d.kuzmenko
524a2d814d Merge branch 'feature/collection-tests-api-status' into 'develop'
Feature/collection tests api status

See merge request gm/gm-backend!17
2019-09-23 12:51:28 +00:00
evgeniy-st
dc4b63d8b2 Refactor news 2019-09-23 15:35:37 +03:00
Виктор Гладких
23759974d9 Add account/user/ test for GET 2019-09-23 15:34:40 +03:00
littlewolf
eca921592d Fix guide parent 2019-09-23 15:28:59 +03:00
littlewolf
b4a2893fcd Add tests to guide 2019-09-23 15:27:38 +03:00
d.kuzmenko
a0ff8eae56 Merge branch 'feature/establishment-tests-api-status' into 'develop'
Feature/establishment tests api status

See merge request gm/gm-backend!13
2019-09-23 12:20:13 +00:00
d.kuzmenko
0a96464f78 Merge branch 'feature/news-tests' into 'develop'
Add news tests

See merge request gm/gm-backend!14
2019-09-23 12:19:07 +00:00
d.kuzmenko
83f75a361e Merge branch 'feature/partner-tests' into 'develop'
Add partner tests

See merge request gm/gm-backend!15
2019-09-23 12:18:00 +00:00