Виктор Гладких
|
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 |
|
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 |
|
d.kuzmenko
|
0234a74e06
|
Merge branch 'feature/json_serializator' into 'develop'
Feature/json serializator
See merge request gm/gm-backend!30
|
2019-09-26 10:51:08 +00: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 |
|