Commit Graph

692 Commits

Author SHA1 Message Date
Виктор Гладких
295bda4b4f Add hours 2019-10-03 11:41:52 +03:00
Виктор Гладких
38be14b5ba Merge branch 'develop' into feature/news-rating 2019-10-03 11:39:24 +03:00
Виктор Гладких
f90e1ceded Add raiting 2019-10-03 11:37:59 +03:00
Виктор Гладких
f0001eef93 Add get method in view 2019-10-02 17:58:22 +03:00
d.kuzmenko
750f141017 Merge branch 'feature/sending-news-email' into 'develop'
Feature/sending news email

See merge request gm/gm-backend!45
2019-10-02 14:17:29 +00:00
Anatoly
f693c36382 switched host email account, changed exception error 2019-10-02 17:16:19 +03:00
Anatoly
fec3e703ce refactored collection views 2019-10-02 16:21:38 +03:00
Anatoly
8e3bb54508 added endpoint for retrieving collection detail information 2019-10-02 15:09:19 +03:00
Виктор Гладких
7b18d7e430 Model and admin 2019-10-02 14:50:30 +03:00
Виктор Гладких
753471544e Add app Rating 2019-10-02 14:17:06 +03:00
evgeniy-st
ca9475b182 refactor this feature 2019-10-02 12:35:01 +03:00
michail
5ec81f417a fix bug 2019-10-02 13:37:46 +05:00
michail
393ecbb55c Merge remote-tracking branch 'origin/feature/sending-news-email' into feature/sending-news-email
# Conflicts:
#	apps/news/admin.py
#	apps/news/tasks.py
2019-10-02 13:31:29 +05:00
michail
fb9e71cbdd fix querysets 2019-10-02 13:27:33 +05:00
Виктор Гладких
e611e3154d Push 2019-10-02 11:21:28 +03:00
michail
0578768ebd Merge remote-tracking branch 'origin/develop' into feature/sending-news-email
# Conflicts:
#	docker-compose.yml
2019-10-02 13:17:24 +05:00
evgeniy-st
8f66f5372d Merge branch 'develop' into feature/will-also-like-news 2019-10-02 10:45:16 +03:00
michail
02638a26fe added sending through celery 2019-10-02 12:09:45 +05:00
michail
c0149a0695 added country_code to news email template 2019-10-02 11:48:03 +05:00
michail
c28d1cf3a0 fix locale and country code in task 2019-10-02 11:48:03 +05:00
michail
5474c2ff69 added news mail template and task without celery delay 2019-10-02 11:48:03 +05:00
michail
6683d4a4ef First commit 2019-10-02 11:48:03 +05:00
Kuroshini
df6b221029 Review fixes 2019-10-01 21:32:24 +03:00
Kuroshini
4cf0ce831b Raise error whether field's absent 2019-10-01 20:12:47 +03:00
Kuroshini
393aa9ef28 Merge migrations after rebase 2019-10-01 18:30:49 +03:00
Kuroshini
4c960c8abf Booking (squashed commit) 2019-10-01 18:25:57 +03:00
evgeniy-st
1247cefa3b Merge branch 'develop' into feature/refactor-address 2019-10-01 18:07:59 +03:00
evgeniy-st
7ca6e49161 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-10-01 18:07:20 +03:00
evgeniy-st
e42f4d061c refactor address 2019-10-01 18:07:04 +03:00
Виктор Гладких
266ace6912 Merge branch 'develop' into feature/sending-news-email 2019-10-01 17:52:28 +03:00
Виктор Гладких
0c79548027 Fix 2019-10-01 17:51:27 +03:00
Виктор Гладких
1f85f63d20 Fix celery 2019-10-01 17:45:57 +03:00
Kuroshini
9793c0a49f Resend confirmation email method 2019-10-01 17:42:37 +03:00
Dmitriy Kuzmenko
9f280857ef change docker-compose for working celery 2019-10-01 17:42:37 +03:00
Виктор Гладких
ee221d0938 Fix celery 2019-10-01 17:33:21 +03:00
Kuroshini
516c4458ac Make model name translated 2019-10-01 17:11:24 +03:00
michail
a497230883 fix names of methods and fields of serializer 2019-10-01 17:42:14 +05:00
evgeniy-st
f034377405 fix establishment serializer 2019-10-01 15:11:14 +03:00
evgeniy-st
051957c7cf Refactor JSON Validation 2019-10-01 13:03:59 +03:00
e.stoyushko
1798978cf7 Merge branch 'feature/establishment-award' into 'develop'
Feature/establishment award

See merge request gm/gm-backend!40
2019-09-30 13:53:59 +00:00
Kuroshini
33478580aa Review fixes 2019-09-30 16:40:46 +03:00
Kuroshini
beb031d0b6 Add slug to carousel serializer 2019-09-30 14:05:38 +03:00
Kuroshini
b1e09d806a Add ordering to timetable object 2019-09-30 14:00:34 +03:00
Kuroshini
019ac97d19 Add vintage year to detail 2019-09-30 13:50:17 +03:00
Kuroshini
310928d95c Fix import package issue 2019-09-30 12:46:58 +03:00
michail
055e99dba2 added "on the same theme" news list and "you should read" news list 2019-09-30 13:17:38 +05:00
d.kuzmenko
b724e2eeb9 Merge branch 'feature/will-also-like-news' into 'develop'
Feature/will also like news

See merge request gm/gm-backend!34
2019-09-30 07:58:49 +00:00
d.kuzmenko
8745c57f84 Merge branch 'bugfix/bunch-of-fixes' into 'develop'
Bugfix/bunch of fixes

See merge request gm/gm-backend!38
2019-09-30 07:57:12 +00:00
michail
88df92a7a5 added country_code to news email template 2019-09-30 12:42:49 +05:00
Виктор Гладких
5ef33c0d19 News search url 2019-09-30 10:19:09 +03:00
michail
6d72c1abfd fix locale and country code in task 2019-09-30 12:18:18 +05:00
michail
90ae87a14e added news mail template and task without celery delay 2019-09-30 12:09:53 +05:00
Виктор Гладких
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
Виктор Гладких
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
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
Виктор Гладких
b69822444a Refactor tests for authorization 2019-09-23 15:06:55 +03:00
michail
06764d05e8 Add recipe tests 2019-09-23 16:21:48 +05:00
littlewolf
aedcd795a9 Fix establishment model 2019-09-23 14:21:05 +03:00
littlewolf
466c0f80d7 Add list read test
Add detail read test
2019-09-23 14:17:19 +03:00
Anatoly
2c43a37108 GM-125: Доработать авторизацию через FB 2019-09-23 12:49:14 +03:00
Anatoly
202aabf15e GM-124: added establishment migration 2019-09-23 12:40:27 +03:00
Anatoly
217c11b970 GM-124: Доработать модель establishment-а 2019-09-23 12:29:08 +03:00
littlewolf
9f89deb23b Fix establishment RUD serializer 2019-09-23 11:16:22 +03:00
Anatoly
20766768d8 fixed establishment filter by geo 2019-09-23 10:12:14 +03:00