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 |
|
Dmitriy Kuzmenko
|
9f280857ef
|
change docker-compose for working celery
|
2019-10-01 17:42:37 +03:00 |
|
evgeniy-st
|
f034377405
|
fix establishment serializer
|
2019-10-01 15:11:14 +03:00 |
|
evgeniy-st
|
530333666a
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-01 13:04:16 +03:00 |
|
evgeniy-st
|
051957c7cf
|
Refactor JSON Validation
|
2019-10-01 13:03:59 +03:00 |
|
d.kuzmenko
|
2106a2aee0
|
Merge branch 'feature/test_search_establishment' into 'develop'
Fix tests
See merge request gm/gm-backend!41
|
2019-10-01 09:09:13 +00:00 |
|
Виктор Гладких
|
693d895aa4
|
Fix tests
|
2019-10-01 11:52:46 +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 |
|
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 |
|
d.kuzmenko
|
f1d60cc976
|
Merge branch 'feature/gm-135-elastic-for-news' into 'develop'
News search
See merge request gm/gm-backend!39
|
2019-09-30 07:43:53 +00:00 |
|
Виктор Гладких
|
5ef33c0d19
|
News search url
|
2019-09-30 10:19:09 +03: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 |
|
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 |
|