littlewolf
|
180daeca0c
|
Add ruby data getter
Add ruby files write
Add models migrations
REMOVE UNIQUE FROM location.country.code
Add function to save correct original objects from old database
|
2019-11-18 06:37:30 +03:00 |
|
Kuroshini
|
f4ebd58e09
|
Tune products ES
|
2019-11-18 01:37:41 +03:00 |
|
Kuroshini
|
83153b14c1
|
Add wine_region and wine_sub_region to ES
|
2019-11-18 01:26:01 +03:00 |
|
Kuroshini
|
f8c9a5c830
|
Wine regions route
|
2019-11-18 01:20:35 +03:00 |
|
Anatoly
|
cb1366b57b
|
added grape variety attr to es
|
2019-11-18 00:01:30 +03:00 |
|
Kuroshini
|
d9e46fdfad
|
Wine color for wine tags only
|
2019-11-17 23:57:08 +03:00 |
|
Kuroshini
|
a305c6ba83
|
try to fix tag categories
(cherry picked from commit 376d22c)
|
2019-11-17 23:44:15 +03:00 |
|
Kuroshini
|
7d26d4a0cf
|
Tags for artisans. Chosen & Category
|
2019-11-17 23:27:58 +03:00 |
|
Anatoly
|
1159dfca65
|
added assemblage to detail view of product, and fix verbose name in ProductType
|
2019-11-17 22:55:03 +03:00 |
|
Kuroshini
|
8641188c45
|
Chosen tags for artisans
|
2019-11-17 22:16:20 +03:00 |
|
Anatoly
|
0d2f961ad5
|
added temporary potential bug (change auto_crop_images dict names for News)
|
2019-11-17 21:52:07 +03:00 |
|
Anatoly
|
62c4ab8d74
|
added temporary potential bug (change auto_crop_images dict names for News)
|
2019-11-17 20:39:03 +03:00 |
|
Anatoly
|
c2c182e992
|
remove duplicated migration
|
2019-11-17 14:51:48 +03:00 |
|
Anatoly
|
dce951c4f9
|
Merge branch 'develop' into feature/establishment-gallery
# Conflicts:
# apps/product/serializers/common.py
|
2019-11-17 14:25:41 +03:00 |
|
Anatoly
|
a8b3c9aa63
|
refactored galleries, added transfer script
|
2019-11-17 14:22:30 +03:00 |
|
Dmitriy Kuzmenko
|
09db5c9540
|
minor changes for tags translation command
|
2019-11-16 23:26:50 +03:00 |
|
Dmitriy Kuzmenko
|
82c79091a3
|
add some change for add translations for tags
|
2019-11-16 23:24:22 +03:00 |
|
Dmitriy Kuzmenko
|
9f03da9bef
|
fix for tag migration
|
2019-11-16 23:03:17 +03:00 |
|
Dmitriy Kuzmenko
|
b1d176c583
|
enable elastic
|
2019-11-16 23:01:22 +03:00 |
|
Dmitriy Kuzmenko
|
ca9843482e
|
Merge branch 'develop' into fix_tags
|
2019-11-16 22:57:43 +03:00 |
|
Dmitriy Kuzmenko
|
ad3966b2aa
|
add method for label
|
2019-11-16 22:56:32 +03:00 |
|
Dmitriy Kuzmenko
|
45b0b93068
|
add new migrations for tags
|
2019-11-16 22:49:38 +03:00 |
|
Kuroshini
|
70b2110744
|
Fix booking slots order
|
2019-11-16 20:51:40 +03:00 |
|
Kuroshini
|
9d4a672d67
|
Multilingual textfield products analyzers
|
2019-11-16 20:14:25 +03:00 |
|
Kuroshini
|
be0d63cf07
|
Fix products search
|
2019-11-16 19:59:10 +03:00 |
|
Kuroshini
|
8a86018a5e
|
Fix wines db queries #2
|
2019-11-16 18:42:26 +03:00 |
|
Kuroshini
|
cc67499601
|
Fix wines db queries
|
2019-11-16 18:32:38 +03:00 |
|
alex
|
94d20469f6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-16 16:57:38 +03:00 |
|
alex
|
78e42550c1
|
add address to establishment similar and collection establishment
|
2019-11-16 16:57:26 +03:00 |
|
Kuroshini
|
2e463feb8d
|
Sort countries by name accordingly to locale
|
2019-11-16 16:23:31 +03:00 |
|
alex
|
4e005a7a4d
|
migrate subscribers
|
2019-11-16 15:56:23 +03:00 |
|
Kuroshini
|
144b5abdbf
|
Fix issue w/ product display name
|
2019-11-16 14:58:59 +03:00 |
|
littlewolf
|
6bac3fc9c2
|
Add fields
|
2019-11-16 14:58:22 +03:00 |
|
Kuroshini
|
94797c354a
|
Fix search results produt name
|
2019-11-16 14:48:32 +03:00 |
|
Kuroshini
|
5a014ca7fe
|
Fix some product search issues
|
2019-11-16 14:38:35 +03:00 |
|
Kuroshini
|
bff533e7d5
|
Tag types
|
2019-11-16 14:13:00 +03:00 |
|
Kuroshini
|
ca61359a81
|
Fix product type serializer
|
2019-11-16 13:35:21 +03:00 |
|
Dmitriy Kuzmenko
|
36d16625ea
|
change filter for Establishment
|
2019-11-16 13:28:03 +03:00 |
|
Semyon Yekhmenin
|
8b656b9bb6
|
Fixed problem with no required period in guest online service response
|
2019-11-16 09:38:33 +00:00 |
|
a.feteleu
|
c725da6a9b
|
refactored transfer ads
|
2019-11-16 01:08:31 +03:00 |
|
Anatoly
|
6c82af1940
|
Merge branch 'feature/transfer-ad' into develop
# Conflicts:
# apps/advertisement/transfer_data.py
# apps/transfer/serializers/advertisement.py
|
2019-11-16 00:19:23 +03:00 |
|
Anatoly
|
31399cea83
|
added advertisement image import
|
2019-11-16 00:18:07 +03:00 |
|
Anatoly
|
671a92912e
|
remove debug tracer
|
2019-11-15 21:06:18 +03:00 |
|
Anatoly
|
6f2d41c1ad
|
added method to transfer advertisement
|
2019-11-15 21:06:18 +03:00 |
|
Anatoly
|
c293ae4b9c
|
remove debug tracer
|
2019-11-15 21:04:37 +03:00 |
|
Kuroshini
|
9c635cd60d
|
Define search boosts
|
2019-11-15 20:29:55 +03:00 |
|
Kuroshini
|
c71e7f10dd
|
Search in all locales
|
2019-11-15 19:59:16 +03:00 |
|
Олег Хаятов
|
ae53a18e08
|
Merge branch 'feature/filter-favs-by-tag' into 'develop'
Filters for news favorites
See merge request gm/gm-backend!133
|
2019-11-15 15:51:09 +00:00 |
|
Kuroshini
|
153ccd7bd9
|
International news
|
2019-11-15 18:25:40 +03:00 |
|
littlewolf
|
cf7cc9bd0c
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/transfer/management/commands/transfer.py
# apps/transfer/serializers/location.py
|
2019-11-15 17:08:51 +03:00 |
|
littlewolf
|
c2649324e9
|
Tmp
|
2019-11-15 17:05:30 +03:00 |
|
alex
|
422b89ede9
|
fix comment transfer
|
2019-11-15 16:10:01 +03:00 |
|
Semyon Yekhmenin
|
73f20bd2e8
|
Added type and subtypes fields with index names in establishment list view
|
2019-11-15 13:06:17 +00:00 |
|
Dmitriy Kuzmenko
|
8f6cf792e7
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-15 16:05:01 +03:00 |
|
Dmitriy Kuzmenko
|
2cd7755d7e
|
add CRUD collections for back
|
2019-11-15 16:04:54 +03:00 |
|
Anatoly
|
4b4dc27a49
|
added method to transfer advertisement
|
2019-11-15 15:59:02 +03:00 |
|
Kuroshini
|
798e58202c
|
Return hardcode for chosen tags
|
2019-11-15 15:53:26 +03:00 |
|
alex
|
71dd52c194
|
news in_favs nested fix
|
2019-11-15 15:28:27 +03:00 |
|
a.feteleu
|
277fe8d17e
|
fixed SiteFeatureSerializer
|
2019-11-15 13:43:32 +03:00 |
|
Semyon
|
49335c3bc4
|
Added establishment type and subtypes to search results
|
2019-11-15 13:04:48 +03:00 |
|
Anatoly
|
1dbd7a6451
|
refactored advertisements
|
2019-11-15 13:02:04 +03:00 |
|
Dmitriy Kuzmenko
|
12d44c0a0d
|
enable elastic
|
2019-11-15 12:18:04 +03:00 |
|
Dmitriy Kuzmenko
|
b52a5dc890
|
add migration
|
2019-11-15 12:15:39 +03:00 |
|
Dmitriy Kuzmenko
|
4a53cca6c0
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-15 12:15:03 +03:00 |
|
Dmitriy Kuzmenko
|
41c842e224
|
change review transfer
|
2019-11-15 12:14:53 +03:00 |
|
Semyon Yekhmenin
|
36b47a6cba
|
Added establishment subtype to product view
|
2019-11-15 09:13:28 +00:00 |
|
evgeniy-st
|
43963f3020
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-15 11:57:16 +03:00 |
|
evgeniy-st
|
ff006eb6fb
|
Try this style of update tasks of the establishments
|
2019-11-15 11:56:16 +03:00 |
|
alex
|
1bcf4ca112
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-15 10:53:37 +03:00 |
|
alex
|
4d302395a9
|
fix product in_fav
|
2019-11-15 10:53:28 +03:00 |
|
Виктор Гладких
|
0f142d3870
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-15 10:48:18 +03:00 |
|
Виктор Гладких
|
b590a762c1
|
Fix update
|
2019-11-15 10:48:04 +03:00 |
|
alex
|
0dbb2c64cd
|
fix new in_fav detail
|
2019-11-15 10:46:21 +03:00 |
|
alex
|
5f52806d97
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-15 10:36:33 +03:00 |
|
alex
|
1348a1def6
|
notification serializer start
|
2019-11-15 10:36:23 +03:00 |
|
evgeniy-st
|
8951de7399
|
updated requirements, updated ES task
|
2019-11-15 10:23:16 +03:00 |
|
alex
|
4ebece45d3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-15 10:21:37 +03:00 |
|
alex
|
418ef27694
|
transfer newsletter_subscriber
|
2019-11-15 10:21:28 +03:00 |
|
Виктор Гладких
|
2931381126
|
Fix update employee
|
2019-11-15 10:12:19 +03:00 |
|
alex
|
e922117c61
|
refactor subscriber model
|
2019-11-15 10:09:26 +03:00 |
|
Dmitriy Kuzmenko
|
6b83003eac
|
add product review loader
|
2019-11-15 02:44:09 +03:00 |
|
Kuroshini
|
2367fec098
|
Use establishment type product serializer w/ index name
|
2019-11-15 00:28:00 +03:00 |
|
Dmitriy Kuzmenko
|
956467e999
|
add view count to news serializer
|
2019-11-15 00:26:14 +03:00 |
|
d.kuzmenko
|
c644cbfd64
|
Merge branch 'feature/transfer-page-counters' into 'develop'
Add rating.views_count transfer
See merge request gm/gm-backend!134
|
2019-11-14 21:09:26 +00:00 |
|
Kuroshini
|
3bf029616f
|
Try to fix indexing
|
2019-11-14 23:58:12 +03:00 |
|
littlewolf
|
726610d147
|
Update to onetoone
Update rating annotation
Add migrations
|
2019-11-14 23:44:49 +03:00 |
|
littlewolf
|
75307dbf73
|
Fix view_count transfer
|
2019-11-14 23:31:24 +03:00 |
|
Dmitriy Kuzmenko
|
141bddc0db
|
add active flag for languages and Countries
|
2019-11-14 22:54:27 +03:00 |
|
Kuroshini
|
5718955ba8
|
Index name for products establishment
|
2019-11-14 22:31:21 +03:00 |
|
Kuroshini
|
afbe8a59f2
|
Product type as object
|
2019-11-14 21:41:47 +03:00 |
|
littlewolf
|
4e72487558
|
Add rating.views_count transfer
|
2019-11-14 20:54:14 +03:00 |
|
Kuroshini
|
843230b641
|
Filters for news favorites
|
2019-11-14 20:02:09 +03:00 |
|
alex
|
97f40c7ea7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-14 18:23:50 +03:00 |
|
alex
|
a1d5feb8dc
|
poroduct in_fav
|
2019-11-14 18:23:42 +03:00 |
|
Kuroshini
|
e455c5e750
|
Use only existing locales to index
|
2019-11-14 18:17:19 +03:00 |
|
Kuroshini
|
a06a7cef7f
|
Remove weird indexing locales
|
2019-11-14 18:01:58 +03:00 |
|
Semyon Yekhmenin
|
b60ed7c7d5
|
Added establishment type to product view
|
2019-11-14 14:33:49 +00:00 |
|
Kuroshini
|
aa0e95d677
|
Product index replicas number
|
2019-11-14 17:30:30 +03:00 |
|
Kuroshini
|
2be15a9448
|
Fix Wine Region country serializer
|
2019-11-14 17:20:25 +03:00 |
|
alex
|
322af9efef
|
fix news in_fav
|
2019-11-14 17:07:31 +03:00 |
|
Kuroshini
|
f4e762bb80
|
Increase product shards number
|
2019-11-14 17:05:56 +03:00 |
|
Виктор Гладких
|
76f570caa9
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-14 16:37:13 +03:00 |
|
Виктор Гладких
|
acd30fb457
|
Delete old awards, add new awards
|
2019-11-14 16:36:55 +03:00 |
|
Anatoly
|
a6d064daba
|
changed representation of product name in ProductBaseSerializer
|
2019-11-14 16:35:41 +03:00 |
|
Виктор Гладких
|
e08bd8508a
|
Fix print
|
2019-11-14 16:35:12 +03:00 |
|
Виктор Гладких
|
bd3f7ac8ab
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-14 16:34:23 +03:00 |
|
alex
|
68aa9e3914
|
fix api
|
2019-11-14 16:26:47 +03:00 |
|
Виктор Гладких
|
2a9c7bf28d
|
Fix award add
|
2019-11-14 16:13:44 +03:00 |
|
Kuroshini
|
322318a4f9
|
Fix fuzziness for product documents
|
2019-11-14 16:04:21 +03:00 |
|
alex
|
bf8afab0fb
|
refactor refactor reviews
|
2019-11-14 15:33:46 +03:00 |
|
Kuroshini
|
32e29b19e6
|
Fix approximate search
|
2019-11-14 15:32:14 +03:00 |
|
littlewolf
|
c872cdd4bc
|
Add child_region updater
|
2019-11-14 15:21:53 +03:00 |
|
Kuroshini
|
8ef31fa560
|
Tune fuzzy search
|
2019-11-14 14:54:06 +03:00 |
|
Kuroshini
|
873e757389
|
News fav images to serializer
|
2019-11-14 14:48:34 +03:00 |
|
Kuroshini
|
f59d30f5aa
|
Added images to fav news
|
2019-11-14 14:45:58 +03:00 |
|
Kuroshini
|
36f4ab1dd9
|
Fix ES product relations & swagger
|
2019-11-14 14:09:37 +03:00 |
|
Anatoly
|
2ca4ab6bb5
|
fixed product related tags
|
2019-11-14 14:05:51 +03:00 |
|
Anatoly
|
688bc851bb
|
fixed product related tags
|
2019-11-14 12:39:09 +03:00 |
|
e.stoyushko
|
cf04f55bd3
|
Merge branch 'feature/products_search' into 'develop'
Feature/products search
See merge request gm/gm-backend!126
|
2019-11-14 09:16:15 +00:00 |
|
Виктор Гладких
|
78064481db
|
Award migrate add tqdm
|
2019-11-14 10:53:19 +03:00 |
|
Anatoly
|
92ee7537a3
|
fixed assemblage tags
|
2019-11-14 10:23:18 +03:00 |
|
alex
|
e49d62de5d
|
social choice api and test
|
2019-11-14 09:53:36 +03:00 |
|
alex
|
b94a6dfd62
|
social choices model
|
2019-11-14 09:14:36 +03:00 |
|
Kuroshini
|
46df31cbed
|
Products search signals & filters
|
2019-11-13 22:35:07 +03:00 |
|
Kuroshini
|
81ebd5764c
|
Serializers for product document
|
2019-11-13 21:20:19 +03:00 |
|
alex
|
906ca921f5
|
in_favorites news
|
2019-11-13 19:33:09 +03:00 |
|
Kuroshini
|
9dae8832cd
|
Optimize indexing request
|
2019-11-13 18:43:30 +03:00 |
|
Kuroshini
|
a91ba7e6f3
|
Indexing products is ready
|
2019-11-13 18:43:30 +03:00 |
|
Kuroshini
|
692f4ba3ab
|
Product ES index #2
|
2019-11-13 18:43:30 +03:00 |
|
Semyon
|
93d32c7ae0
|
Products search draft
|
2019-11-13 18:43:30 +03:00 |
|
Anatoly
|
2ec40ff8fe
|
removed choices from index names for models ProductType, ProductSubType, EstablishmentType, EstablishmentSubType
|
2019-11-13 18:22:26 +03:00 |
|
Semyon Yekhmenin
|
9b3d42147a
|
Feature/cook news search
|
2019-11-13 15:01:06 +00:00 |
|
Anatoly
|
3641d88a05
|
fixed admin pages for product
|
2019-11-13 17:33:19 +03:00 |
|
Kuroshini
|
ebf31f8492
|
Order news in search results
|
2019-11-13 17:11:47 +03:00 |
|
Anatoly
|
b56829accc
|
added command add_cepage_tag_category to link cepage tag category with wine region
|
2019-11-13 16:30:30 +03:00 |
|
Виктор Гладких
|
2abb474221
|
Fix
|
2019-11-13 15:15:39 +03:00 |
|
Виктор Гладких
|
4f6cbe9297
|
Fix
|
2019-11-13 15:13:47 +03:00 |
|
Виктор Гладких
|
903db06f0e
|
Fix tag add product
|
2019-11-13 15:12:48 +03:00 |
|
Anatoly
|
23a1af1870
|
Merge branch 'develop' into feature/bo-endpoints
# Conflicts:
# apps/product/serializers/common.py
|
2019-11-13 14:48:44 +03:00 |
|
Anatoly
|
58155025c5
|
added back-office endpoints for products
|
2019-11-13 14:46:30 +03:00 |
|
alex
|
e9bfdf5f82
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-13 12:41:15 +03:00 |
|
alex
|
97cd3b7ae0
|
newsletter_subscriber legacy model
|
2019-11-13 12:40:55 +03:00 |
|
Виктор Гладких
|
00d7e410ba
|
Elastic on
|
2019-11-13 12:37:54 +03:00 |
|
alex
|
d6126856b5
|
some tag migrations
|
2019-11-13 12:31:19 +03:00 |
|
alex
|
51268522f0
|
Merge branch 'inquiries-api' into develop
|
2019-11-13 12:30:11 +03:00 |
|
Виктор Гладких
|
9dde868828
|
Fix
|
2019-11-13 12:29:27 +03:00 |
|
alex
|
9626a946b1
|
inquiries test
|
2019-11-13 12:29:25 +03:00 |
|
Виктор Гладких
|
f915657124
|
Fix
|
2019-11-13 12:27:03 +03:00 |
|
Виктор Гладких
|
2cf845eedb
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-13 12:23:21 +03:00 |
|
Виктор Гладких
|
ed1ee3705f
|
Fix
|
2019-11-13 12:23:05 +03:00 |
|
Anatoly
|
d19e75e50e
|
added wine region and wine colors to product list view
|
2019-11-13 12:14:29 +03:00 |
|
Виктор Гладких
|
cb127ef879
|
Fix off elastic
|
2019-11-13 12:12:16 +03:00 |
|
Anatoly
|
8cf50ff2cd
|
added endpoints for back office and refactored a little
|
2019-11-13 12:07:02 +03:00 |
|
Виктор Гладких
|
9fcaa6747a
|
Fix tag category add
|
2019-11-13 11:41:58 +03:00 |
|
alex
|
b20baa5bcd
|
inquiries and grid crud
|
2019-11-13 09:28:27 +03:00 |
|
littlewolf
|
cf226974c8
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/collection/models.py
# apps/location/serializers/common.py
# apps/location/transfer_data.py
# apps/transfer/management/commands/transfer.py
# apps/transfer/serializers/location.py
# project/settings/base.py
|
2019-11-13 00:28:49 +03:00 |
|
littlewolf
|
07499c7b3f
|
Tmp fix
|
2019-11-13 00:19:47 +03:00 |
|
a.feteleu
|
94f7bda03a
|
added merge migrations
|
2019-11-12 18:53:01 +03:00 |
|
Anatoly
|
83a3444c95
|
added product RUD-endpoints for back-office
|
2019-11-12 18:50:59 +03:00 |
|
Виктор Гладких
|
c5ac47953c
|
Merge branch 'develop' into feature/add_tag_product
|
2019-11-12 18:38:25 +03:00 |
|
Виктор Гладких
|
89fa7c5d56
|
Fix for merge
|
2019-11-12 18:37:43 +03:00 |
|
alex
|
cab171e306
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-12 18:29:34 +03:00 |
|
alex
|
3a5c34fd4f
|
comment command
|
2019-11-12 18:29:24 +03:00 |
|
evgeniy-st
|
b13cb6916e
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-12 18:16:19 +03:00 |
|
evgeniy-st
|
0dfa1c85d5
|
Recalculate toque number fallback
|
2019-11-12 18:15:53 +03:00 |
|
Kuroshini
|
fef5008d35
|
Revert "Change images search fields sources"
This reverts commit 0833d40
|
2019-11-12 18:13:52 +03:00 |
|
alex
|
3ace542deb
|
comment created date
|
2019-11-12 18:12:14 +03:00 |
|
Kuroshini
|
0833d4057f
|
Change images search fields sources
|
2019-11-12 18:08:50 +03:00 |
|
Виктор Гладких
|
01d6403ad3
|
Merge branch 'develop' into feature/add_tag_product
|
2019-11-12 17:54:52 +03:00 |
|
Виктор Гладких
|
ced49965f9
|
Fix employee name
|
2019-11-12 17:54:07 +03:00 |
|
Виктор Гладких
|
e702be2691
|
Fix employee name
|
2019-11-12 17:51:57 +03:00 |
|
Виктор Гладких
|
8659ce0a92
|
Fix merge
|
2019-11-12 17:44:02 +03:00 |
|
Anatoly
|
70614abc03
|
- renamed fix_wine_color_tag to fix_wine_color_tag
- added command add_assemblage_tag
- added transfer commands: cepage, assemblage (execute in this order)
|
2019-11-12 17:40:15 +03:00 |
|
Виктор Гладких
|
097bab4bb1
|
Merge branch 'develop' into feature/add_tag_product
|
2019-11-12 17:37:51 +03:00 |
|
Виктор Гладких
|
13db34237b
|
Add tag for product
|
2019-11-12 17:36:48 +03:00 |
|
Kuroshini
|
896da284a9
|
Merge branch 'feature/last_fallback_translation_fix' into develop
|
2019-11-12 17:09:45 +03:00 |
|
Semyon
|
621918af4a
|
Fixed last fallback translation case
|
2019-11-12 17:07:58 +03:00 |
|
Dmitriy Kuzmenko
|
1d2440ff7b
|
fix TagCategory label migrator
|
2019-11-12 17:02:05 +03:00 |
|
alex
|
3f2de46420
|
fix filter comment by establishment and user
|
2019-11-12 16:38:06 +03:00 |
|
alex
|
0db7972b5a
|
fix comment country
|
2019-11-12 16:19:03 +03:00 |
|
Semyon Yekhmenin
|
fe6f9953d8
|
Added mobile news endpoints
|
2019-11-12 13:12:10 +00:00 |
|
Semyon Yekhmenin
|
a7f9bfd161
|
Feature/news search translation fix
|
2019-11-12 13:10:12 +00:00 |
|
d.kuzmenko
|
16b78f0bea
|
Merge branch 'bugfix/label_translated' into 'develop'
Label translated field is translated again
See merge request gm/gm-backend!114
|
2019-11-12 13:02:00 +00:00 |
|
d.kuzmenko
|
dd35319e5c
|
Merge branch 'feature/fill-closed-at' into 'develop'
Closed_at fill command
See merge request gm/gm-backend!121
|
2019-11-12 12:58:24 +00:00 |
|
d.kuzmenko
|
feb1b8c6ea
|
Merge branch 'feature/bring-back-address' into 'develop'
Add city name field to establishment api representations
See merge request gm/gm-backend!118
|
2019-11-12 12:57:05 +00:00 |
|
d.kuzmenko
|
59f1313891
|
Merge branch 'feature/news-recipes' into 'develop'
Filter recipes news
See merge request gm/gm-backend!116
|
2019-11-12 12:35:33 +00:00 |
|
d.kuzmenko
|
cd1967ee51
|
Merge branch 'feature/works-whole-day-es-filter' into 'develop'
Feature/works whole day es filter
See merge request gm/gm-backend!113
|
2019-11-12 12:33:45 +00:00 |
|
a.feteleu
|
0af5de9bd4
|
added merge migration
|
2019-11-12 15:18:46 +03:00 |
|
Anatoly
|
d2af496b17
|
Merge branch 'develop' into feature/notes
|
2019-11-12 15:16:23 +03:00 |
|
Anatoly
|
8eac730d9f
|
added transfer for notes
|
2019-11-12 15:14:35 +03:00 |
|
Kuroshini
|
7bba5237dc
|
Closed_at fill command
|
2019-11-12 15:12:47 +03:00 |
|
Kuroshini
|
7d4d555eee
|
Label translated field is translated again
|
2019-11-12 15:12:12 +03:00 |
|
Kuroshini
|
57a4498ba1
|
Add schedule to establishment list serializer
|
2019-11-12 15:11:32 +03:00 |
|
Kuroshini
|
521d7f19f3
|
Add city name field to establishment api representations
|
2019-11-12 15:11:32 +03:00 |
|
Kuroshini
|
d3ab910fba
|
Filter recipes news
|
2019-11-12 15:10:50 +03:00 |
|
Kuroshini
|
e065f1c9b4
|
Works at weekday fiter
|
2019-11-12 15:10:16 +03:00 |
|
Виктор Гладких
|
27bef66398
|
Add old_id for category
|
2019-11-12 15:02:20 +03:00 |
|
Виктор Гладких
|
7d9b6d1f30
|
Add category tag for products
|
2019-11-12 15:01:12 +03:00 |
|
d.kuzmenko
|
995d55302a
|
Merge branch 'feature/nested-published-features' into 'develop'
Feature/nested published features
See merge request gm/gm-backend!112
|
2019-11-12 11:57:20 +00:00 |
|
Anatoly
|
7064790606
|
added transfer for product notes
|
2019-11-12 12:41:27 +03:00 |
|
a.feteleu
|
22521f76fc
|
Change serializer field in ProductSerializer
|
2019-11-12 12:22:59 +03:00 |
|
Dmitriy Kuzmenko
|
9d208610df
|
fix tag humanization
|
2019-11-12 12:21:19 +03:00 |
|
Anatoly
|
cf8abf27ae
|
added transfer commands
|
2019-11-12 12:04:29 +03:00 |
|
Anatoly
|
f0c65a20cb
|
fix AdvertisementSerializer
|
2019-11-12 11:07:36 +03:00 |
|
Anatoly
|
811f9defc4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-12 11:06:21 +03:00 |
|
Anatoly
|
d07fd9282e
|
added command fix_sugar_content_tag in products
|
2019-11-12 11:05:52 +03:00 |
|
Виктор Гладких
|
429cc705a1
|
Fix add_empl_position
|
2019-11-12 10:42:15 +03:00 |
|
alex
|
0b157244e0
|
Merge remote-tracking branch 'origin/feature/favorite-news' into develop
|
2019-11-12 08:51:55 +03:00 |
|
alex
|
b5c255f7fb
|
migrate inquiry photos
|
2019-11-12 08:40:42 +03:00 |
|
alex
|
60c62eb84a
|
Merge remote-tracking branch 'origin/develop' into feature/migrate-inquiries
|
2019-11-12 08:03:09 +03:00 |
|
Dmitriy Kuzmenko
|
2fe56d713d
|
enabled elastic
|
2019-11-12 04:12:27 +03:00 |
|
Dmitriy Kuzmenko
|
e4061996a8
|
fix model currency
|
2019-11-12 04:09:57 +03:00 |
|
Dmitriy Kuzmenko
|
359deeeb39
|
fix model currency
|
2019-11-12 04:06:28 +03:00 |
|
Dmitriy Kuzmenko
|
858f64a26a
|
fix product serializer
|
2019-11-12 03:42:18 +03:00 |
|
Dmitriy Kuzmenko
|
6a5cedc8b9
|
fix product serializer
|
2019-11-12 03:41:24 +03:00 |
|
Dmitriy Kuzmenko
|
362070656e
|
fix product serializer
|
2019-11-12 03:40:09 +03:00 |
|
Dmitriy Kuzmenko
|
352e1bba8a
|
fix product type
|
2019-11-12 02:31:08 +03:00 |
|
Dmitriy Kuzmenko
|
ec96c32453
|
fix product type
|
2019-11-12 02:28:33 +03:00 |
|
Dmitriy Kuzmenko
|
c433c18c60
|
add blank TZ as UTC
|
2019-11-12 01:02:35 +03:00 |
|
Dmitriy Kuzmenko
|
db84d87eb1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-11 23:16:49 +03:00 |
|
Dmitriy Kuzmenko
|
1cd71ad830
|
disabled elastic
|
2019-11-11 23:16:32 +03:00 |
|
Anatoly
|
eefbec20b1
|
fix swagger
|
2019-11-11 22:25:05 +03:00 |
|
Anatoly
|
f4b411e73d
|
added tags, image urls to product serializers
|
2019-11-11 21:29:34 +03:00 |
|
Anatoly
|
46662398e4
|
refactored detail and list view of products
|
2019-11-11 19:19:18 +03:00 |
|
Anatoly
|
7fcba802c1
|
fixed tags
|
2019-11-11 18:52:09 +03:00 |
|
alex
|
d5799ca768
|
migrate inquiries grid
|
2019-11-11 17:45:34 +03:00 |
|
alex
|
7106249d1e
|
Merge remote-tracking branch 'origin/develop' into feature/migrate-inquiries
# Conflicts:
# apps/transfer/management/commands/transfer.py
# apps/transfer/models.py
|
2019-11-11 17:02:24 +03:00 |
|
Dmitriy Kuzmenko
|
04f3823047
|
fix product queryset
|
2019-11-11 15:55:11 +03:00 |
|
Dmitriy Kuzmenko
|
a7dca6cd78
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/establishment/transfer_data.py
|
2019-11-11 15:32:42 +03:00 |
|
Dmitriy Kuzmenko
|
7617981259
|
change command for migration of users
|
2019-11-11 15:29:31 +03:00 |
|
Anatoly
|
df38afa36b
|
refactored a little model Product
|
2019-11-11 15:27:58 +03:00 |
|
alex
|
b0177dfe13
|
refactor inquiries
|
2019-11-11 14:45:33 +03:00 |
|
Anatoly
|
0610075706
|
fixed transfer product with sub type plates
|
2019-11-11 13:15:37 +03:00 |
|
Anatoly
|
3a1f57e195
|
refactored product admin page
|
2019-11-11 12:29:10 +03:00 |
|
Anatoly
|
c67109d9f8
|
Merge branch 'develop' into features/migrate-wine
# Conflicts:
# apps/transfer/management/commands/transfer.py
# apps/transfer/models.py
# project/settings/base.py
|
2019-11-11 11:35:03 +03:00 |
|
Anatoly
|
13228ec85a
|
finalizing
|
2019-11-11 11:33:20 +03:00 |
|
alex
|
2512400885
|
fix serializer
|
2019-11-11 09:43:27 +03:00 |
|
littlewolf
|
6d27ac533a
|
Add transfer to city_photos
Add migrations
|
2019-11-10 16:34:31 +03:00 |
|
Anatoly
|
8a49a5ee72
|
added gallery to model product
|
2019-11-10 16:08:27 +03:00 |
|
alex
|
d8995ab754
|
inquiries serializer
|
2019-11-10 10:14:16 +03:00 |
|
alex
|
5267e24f05
|
Merge remote-tracking branch 'origin/develop' into feature/migrate-inquiries
# Conflicts:
# requirements/development.txt
|
2019-11-10 09:07:51 +03:00 |
|
Anatoly
|
efb468f00d
|
added migrator, refactored migrators
|
2019-11-09 22:58:34 +03:00 |
|
Anatoly
|
0f2d1ca071
|
need checks
|
2019-11-08 19:46:16 +03:00 |
|
Dmitriy Kuzmenko
|
3d83c2a3aa
|
Merge branch 'feature/account_migrate' into develop
|
2019-11-08 17:04:11 +03:00 |
|
Виктор Гладких
|
b8d9a1344b
|
Add hash password
|
2019-11-08 16:31:43 +03:00 |
|
littlewolf
|
48d9ce37f7
|
Merge branch 'feature/add-city-endpoints' into feature/migrate-city-photos
|
2019-11-08 14:15:34 +03:00 |
|
Semyon Yekhmenin
|
d9e14194c3
|
Removed pagination from back regions list view
|
2019-11-08 10:54:50 +00:00 |
|
alex
|
c7537079d4
|
mark to float
|
2019-11-08 12:28:18 +03:00 |
|
alex
|
79a65ab179
|
fix ads
|
2019-11-08 12:26:51 +03:00 |
|
Виктор Гладких
|
be0412ffae
|
Fix url
|
2019-11-08 11:42:40 +03:00 |
|
Виктор Гладких
|
251d29c461
|
Add image url
|
2019-11-08 11:29:45 +03:00 |
|
littlewolf
|
6a66867cb8
|
Fix country serializer in city
|
2019-11-08 10:49:45 +03:00 |
|
littlewolf
|
4cbb8ed291
|
Add city info migration
|
2019-11-08 10:25:21 +03:00 |
|
littlewolf
|
ec07ba74da
|
Add migrations
|
2019-11-08 09:51:30 +03:00 |
|
littlewolf
|
1c8e08fab1
|
Fix location city gallery
|
2019-11-08 01:50:55 +03:00 |
|
Anatoly
|
9bdeabe352
|
added tags
|
2019-11-07 19:03:12 +03:00 |
|
alex
|
117604f060
|
models
|
2019-11-07 18:35:01 +03:00 |
|
Kuroshini
|
bf301d21bb
|
Fix tests
|
2019-11-07 18:25:04 +03:00 |
|
Kuroshini
|
c1f89515c5
|
Nested sitefeatures for new design
|
2019-11-07 18:08:29 +03:00 |
|
Виктор Гладких
|
1c8737a798
|
Merge branch 'develop' into feature/account_migrate
|
2019-11-07 17:05:06 +03:00 |
|
evgeniy-st
|
4573233e45
|
fix
|
2019-11-07 17:04:26 +03:00 |
|
Виктор Гладких
|
37ba1a1c39
|
Edit help message
|
2019-11-07 17:03:14 +03:00 |
|
evgeniy-st
|
497451cb3e
|
Added tags to Establishment back-office serializers
|
2019-11-07 17:01:27 +03:00 |
|
Виктор Гладких
|
ba6d18d202
|
Fix account migration
|
2019-11-07 17:01:26 +03:00 |
|
littlewolf
|
086b26e6d9
|
Add endpoints to gallery
|
2019-11-07 15:35:06 +03:00 |
|
littlewolf
|
03fc4a6c56
|
Add city gallery list view
|
2019-11-07 14:07:19 +03:00 |
|
Semyon Yekhmenin
|
475c29ee9e
|
Added function for getting subdivision by ISO 3166-1 alpha-2 country code and ISO 3166-2 subdivision code without country prefix
|
2019-11-07 09:55:20 +00:00 |
|
e.stoyushko
|
d8ccf0f567
|
Merge branch 'bugfix/fix-signup-validators' into 'develop'
Bugfix/fix signup validators
See merge request gm/gm-backend!107
|
2019-11-07 08:58:33 +00:00 |
|
littlewolf
|
22ac3d3046
|
add gallery relation
|
2019-11-07 11:49:59 +03:00 |
|
littlewolf
|
0b68cb3420
|
Add gallery relation to location.city
|
2019-11-07 11:49:10 +03:00 |
|
littlewolf
|
99e2f30499
|
Merge branch 'develop' into feature/add-city-endpoints
|
2019-11-07 10:44:54 +03:00 |
|
littlewolf
|
0463afdecb
|
Add fields and migration to location.city
|
2019-11-07 10:43:08 +03:00 |
|
Anatoly
|
ba2b3303bb
|
delete unused attributes (social auth)
|
2019-11-07 10:17:36 +03:00 |
|
littlewolf
|
0058a3bdd4
|
Add skip_signal to utils
|
2019-11-06 23:13:57 +03:00 |
|
littlewolf
|
57d22bedcb
|
Add gallery
Add name_translated
Add migrations
|
2019-11-06 22:56:41 +03:00 |
|
Kuroshini
|
952e259fa9
|
Fix validators #2
|
2019-11-06 19:51:53 +03:00 |
|
Anatoly
|
442e4fb2ce
|
refactored social auth
|
2019-11-06 18:50:42 +03:00 |
|
Anatoly
|
3b7bef463f
|
refactored social auth
|
2019-11-06 16:11:26 +03:00 |
|
evgeniy-st
|
164f860cc0
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-06 16:02:37 +03:00 |
|
evgeniy-st
|
e21a8bb550
|
Added country serializer to AddressDetailSerializer
|
2019-11-06 16:02:12 +03:00 |
|
Anatoly
|
0aa0378ae0
|
intermediate commit
|
2019-11-06 15:35:47 +03:00 |
|
alex
|
9b16f46215
|
migrate identities
|
2019-11-06 15:12:33 +03:00 |
|
e.stoyushko
|
a466168d61
|
Merge branch 'bugfix/fix-signup-validators' into 'develop'
Fix validators
See merge request gm/gm-backend!105
|
2019-11-06 11:37:56 +00:00 |
|
Semyon Yekhmenin
|
d717b09153
|
Fixed nearest establishments search
|
2019-11-06 11:35:43 +00:00 |
|
alex
|
a372d29677
|
refactor comment migration
|
2019-11-06 14:24:14 +03:00 |
|
evgeniy-st
|
c17f9ce820
|
Remove name_translated from establishment. Added AddressDetailSerializer
to EstablishmentRUDView
|
2019-11-06 14:16:10 +03:00 |
|
Kuroshini
|
e8dcaeaa9a
|
Fix validators
|
2019-11-06 13:41:37 +03:00 |
|
Dmitriy Kuzmenko
|
edaf9f8fdb
|
add migrations
|
2019-11-06 12:22:16 +03:00 |
|
d.kuzmenko
|
b5789a1a5e
|
Merge branch 'feature/affilations/award_type' into 'develop'
Feature/affilations/award type
See merge request gm/gm-backend!104
|
2019-11-06 09:00:51 +00:00 |
|
Виктор Гладких
|
e04c621a3d
|
Fix message
|
2019-11-06 11:50:42 +03:00 |
|
d.kuzmenko
|
8fca3916f9
|
Merge branch 'feature/affiliations' into 'develop'
Feature/affiliations
See merge request gm/gm-backend!102
|
2019-11-06 08:46:43 +00:00 |
|
Виктор Гладких
|
390ff974d7
|
Fix message
|
2019-11-06 11:41:19 +03:00 |
|
Виктор Гладких
|
0ab60c1852
|
Add awards
|
2019-11-06 11:40:07 +03:00 |
|
evgeniy-st
|
3299bf9891
|
updated establishment search fields
|
2019-11-06 11:32:55 +03:00 |
|
evgeniy-st
|
eb2b727d0d
|
Merge branch 'develop' into feature/establishmen-index-name
|
2019-11-06 11:27:05 +03:00 |
|
evgeniy-st
|
661f6fb395
|
Added fields to Establishment model: index_name, tranliterated_name
|
2019-11-06 11:25:38 +03:00 |
|
Виктор Гладких
|
3e3d7a21db
|
Add award types
|
2019-11-06 10:23:31 +03:00 |
|
littlewolf
|
e6094b7961
|
Fix RUD
Remove Create Serializer
|
2019-11-06 09:03:48 +03:00 |
|
Kuroshini
|
19c7ce4c51
|
Send confirmation to new email #3
|
2019-11-05 21:49:57 +03:00 |
|
Kuroshini
|
3fc14ac0d6
|
New email templates #2
|
2019-11-05 21:39:17 +03:00 |
|
Kuroshini
|
70f86c792b
|
New email templates
|
2019-11-05 21:33:38 +03:00 |
|
Kuroshini
|
be48bff5ae
|
Send confirmation to new email
|
2019-11-05 18:56:11 +03:00 |
|
Anatoly
|
87dacfec7f
|
refactored product app, see changes
|
2019-11-05 18:04:34 +03:00 |
|
alex
|
d853960d2e
|
create, delete, get favorite news
|
2019-11-05 17:52:36 +03:00 |
|
Виктор Гладких
|
545e9a249b
|
Fix help
|
2019-11-05 17:32:18 +03:00 |
|
Виктор Гладких
|
6f4cd56fcd
|
Add establishment employee
|
2019-11-05 17:28:13 +03:00 |
|
d.kuzmenko
|
28471686be
|
Merge branch 'feature/fix-open-noon-afternoon' into 'develop'
Feature/fix open noon afternoon
See merge request gm/gm-backend!101
|
2019-11-05 14:26:24 +00:00 |
|
d.kuzmenko
|
19fb746356
|
Merge branch 'feature/remove-presentation-crunches' into 'develop'
Remove all crunches from projects
See merge request gm/gm-backend!100
|
2019-11-05 14:21:16 +00:00 |
|
Kuroshini
|
a60fb84bcb
|
Use not only closed_at / opening_at
|
2019-11-05 17:07:48 +03:00 |
|
evgeniy-st
|
273478a7cb
|
add address to establishmentRUDSerializer
|
2019-11-05 16:57:07 +03:00 |
|
Виктор Гладких
|
22982f3332
|
Add employee fix
|
2019-11-05 16:33:38 +03:00 |
|
Виктор Гладких
|
ea1ddfa320
|
Add employee
|
2019-11-05 16:29:27 +03:00 |
|
evgeniy-st
|
568ec84da0
|
Added filter class to EstalibshmentListCreateView
|
2019-11-05 16:20:24 +03:00 |
|
evgeniy-st
|
83bab7f383
|
remove hardcoded news
|
2019-11-05 15:59:28 +03:00 |
|
Виктор Гладких
|
e7143f73c3
|
Add positions
|
2019-11-05 14:59:32 +03:00 |
|
Anatoly
|
d46ba31654
|
Merge branch 'develop' into features/migrate-wine
# Conflicts:
# apps/product/models.py
# apps/transfer/management/commands/transfer.py
# apps/transfer/models.py
|
2019-11-05 14:56:26 +03:00 |
|
evgeniy-st
|
346f126dbb
|
Added news filter (by country).
|
2019-11-05 14:48:25 +03:00 |
|
michail
|
06f5a551b8
|
additions for migration of comments
|
2019-11-05 16:45:43 +05:00 |
|
littlewolf
|
a5b8b0cdb1
|
Fix fields
|
2019-11-05 14:35:11 +03:00 |
|
Kuroshini
|
f52847a71a
|
Remove all crunches from projects
|
2019-11-05 14:29:53 +03:00 |
|
littlewolf
|
f8669ad3ca
|
Add city create
|
2019-11-05 14:14:38 +03:00 |
|
Dmitriy Kuzmenko
|
c5e96a7ad8
|
fix retrieve
|
2019-11-04 20:33:35 +03:00 |
|
Kuroshini
|
9d087b53ee
|
Hardcode for presentation
|
2019-11-04 18:18:46 +03:00 |
|
Dmitriy Kuzmenko
|
2b3ded6858
|
fix carusel
|
2019-11-04 16:15:29 +03:00 |
|
d.kuzmenko
|
6c0327f1a2
|
Merge branch 'hotfix/news-ids' into 'develop'
Use old ids for demonstration
See merge request gm/gm-backend!99
|
2019-11-04 12:38:17 +00:00 |
|
Kuroshini
|
4dd06f772f
|
Use old ids for demonstration
|
2019-11-04 15:30:59 +03:00 |
|
d.kuzmenko
|
6f0122fe35
|
Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Remove doubles
See merge request gm/gm-backend!98
|
2019-11-04 11:37:17 +00:00 |
|
Kuroshini
|
cf1bb0a88c
|
Remove doubles
|
2019-11-04 14:30:03 +03:00 |
|
d.kuzmenko
|
3abb74d19e
|
Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Temp crunch for chosen tags
See merge request gm/gm-backend!96
|
2019-11-04 08:58:41 +00:00 |
|
Dmitriy Kuzmenko
|
55c24c400b
|
change news tag command
|
2019-11-04 11:49:57 +03:00 |
|
Dmitriy Kuzmenko
|
623a90e6a7
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-04 11:35:25 +03:00 |
|
Dmitriy Kuzmenko
|
888e18b9b1
|
change news tag command
|
2019-11-04 11:35:13 +03:00 |
|
a.feteleu
|
9dc12b36bb
|
added exception detail
|
2019-11-04 11:18:16 +03:00 |
|
Dmitriy Kuzmenko
|
b37b634f59
|
change news tag command
|
2019-11-04 11:09:15 +03:00 |
|
Dmitriy Kuzmenko
|
fb3e5e5c93
|
change add_tags
|
2019-11-04 10:53:16 +03:00 |
|
Dmitriy Kuzmenko
|
b3345d612a
|
renge_menu and carte
|
2019-11-04 02:25:04 +03:00 |
|
Dmitriy Kuzmenko
|
3462c74a65
|
modify add_menus
|
2019-11-04 00:50:37 +03:00 |
|
Dmitriy Kuzmenko
|
db6c93a72f
|
add trensfer menus
|
2019-11-04 00:41:34 +03:00 |
|
Kuroshini
|
b8fe50f806
|
Temp crunch for chosen tags
|
2019-11-03 22:45:44 +03:00 |
|
Dmitriy Kuzmenko
|
9d3e278763
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 20:33:58 +03:00 |
|
Dmitriy Kuzmenko
|
8e61071759
|
add news tag command
|
2019-11-03 20:33:45 +03:00 |
|
a.feteleu
|
d0165df987
|
fix translation
|
2019-11-03 20:31:50 +03:00 |
|
alex
|
8eee337d34
|
fix last published establishment description
|
2019-11-03 19:12:47 +03:00 |
|
Dmitriy Kuzmenko
|
a30f863155
|
fix currency
|
2019-11-03 17:39:10 +03:00 |
|
Dmitriy Kuzmenko
|
f47e2996f4
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 17:13:39 +03:00 |
|
Dmitriy Kuzmenko
|
924b4e68e9
|
fix currency
|
2019-11-03 17:13:27 +03:00 |
|
Anatoly
|
4f89d7603e
|
change translation mechanics
|
2019-11-03 17:00:47 +03:00 |
|
Dmitriy Kuzmenko
|
c50cd7c693
|
add migrations
|
2019-11-03 16:51:17 +03:00 |
|
Dmitriy Kuzmenko
|
02e45593ce
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 16:45:39 +03:00 |
|
Dmitriy Kuzmenko
|
689dca4ea1
|
add migrations
|
2019-11-03 16:45:22 +03:00 |
|
d.kuzmenko
|
902382a82a
|
Merge branch 'feature/chosen_tags-logic' into 'develop'
Feature/chosen tags logic
See merge request gm/gm-backend!93
|
2019-11-03 13:20:51 +00:00 |
|
Dmitriy Kuzmenko
|
2e273e596d
|
add migrations
|
2019-11-03 15:38:00 +03:00 |
|
Dmitriy Kuzmenko
|
c47f659657
|
add fix currency
|
2019-11-03 15:34:53 +03:00 |
|
Dmitriy Kuzmenko
|
b88c0d5213
|
modify script add_currency
|
2019-11-03 15:24:03 +03:00 |
|
Dmitriy Kuzmenko
|
1856589427
|
disabled inline in est, and change currency creator
|
2019-11-03 14:55:08 +03:00 |
|
Dmitriy Kuzmenko
|
398a982c82
|
add fix currency
|
2019-11-03 14:09:07 +03:00 |
|
Dmitriy Kuzmenko
|
791ff3f1c3
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 14:04:03 +03:00 |
|
Dmitriy Kuzmenko
|
1ac3cf95ca
|
add currency
|
2019-11-03 14:03:47 +03:00 |
|
Anatoly
|
10fb4ee0dd
|
small fix
|
2019-11-03 01:40:45 +03:00 |
|
Anatoly
|
201dd40193
|
fixed related news, but in future need refactoring
|
2019-11-03 01:32:46 +03:00 |
|
Dmitriy Kuzmenko
|
248ab103a1
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 00:36:31 +03:00 |
|
Dmitriy Kuzmenko
|
c69ef65d79
|
add filter for description
|
2019-11-03 00:36:19 +03:00 |
|
Anatoly
|
c14ab722a1
|
change field parameter in model Guide (gm-241)
|
2019-11-03 00:25:03 +03:00 |
|
Dmitriy Kuzmenko
|
22b4b94f1b
|
add filter for description
|
2019-11-03 00:11:08 +03:00 |
|
alex
|
9da10acd8e
|
fix none value establishment description
|
2019-11-02 22:52:20 +03:00 |
|
alex
|
cc2c475b4e
|
add_establishment_description with elastic error
|
2019-11-02 22:45:57 +03:00 |
|
Dmitriy Kuzmenko
|
f3899f5cb8
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-02 19:19:10 +03:00 |
|
Dmitriy Kuzmenko
|
914450e8c2
|
add translation fix for tag
|
2019-11-02 19:18:58 +03:00 |
|
GladkihViktor
|
9acf2f5c5f
|
Code style
|
2019-11-02 17:58:00 +03:00 |
|
GladkihViktor
|
4d310515ab
|
Merge branch 'develop' into feature/est_transporation
|
2019-11-02 17:55:08 +03:00 |
|
GladkihViktor
|
56b3d0dcc2
|
Update transportation
|
2019-11-02 17:54:24 +03:00 |
|
Dmitriy Kuzmenko
|
7de6043861
|
filter for tag
|
2019-11-02 17:19:59 +03:00 |
|
Dmitriy Kuzmenko
|
f3f06fcf09
|
filter for tag
|
2019-11-02 17:06:13 +03:00 |
|
Kuroshini
|
0f8425f363
|
Tags by category
|
2019-11-02 16:19:48 +03:00 |
|
Kuroshini
|
e69f272a63
|
Fix time format for frontend
|
2019-11-02 15:42:33 +03:00 |
|
GladkihViktor
|
ea830379fc
|
Fix image url
|
2019-11-02 14:31:12 +03:00 |
|
evgeniy-st
|
4f67c295d1
|
Carousel link
|
2019-11-02 12:11:03 +03:00 |
|
evgeniy-st
|
dcea8b2a69
|
small fix
|
2019-11-02 12:05:18 +03:00 |
|
evgeniy-st
|
11d06b7b97
|
update Carousel model_name
|
2019-11-02 12:00:09 +03:00 |
|
Dmitriy Kuzmenko
|
1747f6e95c
|
fix filter old_estab
|
2019-11-02 10:24:24 +03:00 |
|
Dmitriy Kuzmenko
|
20b9b9affd
|
fix filter old_estab
|
2019-11-02 10:11:47 +03:00 |
|
Dmitriy Kuzmenko
|
4059446a3c
|
add filter by exist Establishments
|
2019-11-02 10:04:32 +03:00 |
|
Dmitriy Kuzmenko
|
4108de5931
|
add filter for transfer establishment by fr
|
2019-11-02 09:17:18 +03:00 |
|
Anatoly
|
4e76fc966e
|
added fix link for establishment preview_image
|
2019-11-01 18:43:48 +03:00 |
|
Dmitriy Kuzmenko
|
5928ee1884
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-01 18:21:03 +03:00 |
|
Dmitriy Kuzmenko
|
0d7187e330
|
change get image in carusel
|
2019-11-01 18:20:48 +03:00 |
|
Anatoly
|
fdd5c0bace
|
added fix link for establishment preview_image, run - ./manage.py transfer --fix_establishment_preview_image
|
2019-11-01 18:10:53 +03:00 |
|
Dmitriy Kuzmenko
|
660eb347c5
|
add filter by country for carusel
|
2019-11-01 18:10:12 +03:00 |
|
alex
|
aab76d219f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-01 17:38:09 +03:00 |
|
alex
|
7acc8592a8
|
country for carousel
|
2019-11-01 17:37:53 +03:00 |
|
Dmitriy Kuzmenko
|
effe468777
|
add active to carusel
|
2019-11-01 16:56:37 +03:00 |
|
Anatoly
|
4a38bec2a7
|
added migrations and added migration wine colors
|
2019-11-01 16:48:49 +03:00 |
|
Виктор Гладких
|
8787a6b944
|
Fix
|
2019-11-01 16:27:09 +03:00 |
|
Виктор Гладких
|
afdc0154c6
|
Fix
|
2019-11-01 16:24:17 +03:00 |
|
Виктор Гладких
|
c51cfc1aa4
|
Fix publish collect
|
2019-11-01 16:18:33 +03:00 |
|
Semyon Yekhmenin
|
d17790dc34
|
Added filtering chosen tags by country
|
2019-11-01 12:54:24 +00:00 |
|
e.stoyushko
|
74aaab0e93
|
Merge branch 'bugfix/booking-subsscriver-fix' into 'develop'
Bugfix/booking subsscriver fix
See merge request gm/gm-backend!92
|
2019-11-01 12:46:44 +00:00 |
|
Kuroshini
|
e3670c051e
|
Fix note mandatory && subscriber creation
|
2019-11-01 15:32:33 +03:00 |
|
Kuroshini
|
2cd69e02cb
|
Fix note mandatory && subscriber creation
|
2019-11-01 15:31:30 +03:00 |
|
d.kuzmenko
|
975063b3f8
|
Merge branch 'feature/collect' into 'develop'
Fix
See merge request gm/gm-backend!91
|
2019-11-01 12:27:19 +00:00 |
|
Виктор Гладких
|
5e65bff2ba
|
Fix
|
2019-11-01 15:19:42 +03:00 |
|
michail
|
f5a9763edf
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-01 17:15:16 +05:00 |
|
evgeniy-st
|
42cd311dc4
|
Carousel is parsed
|
2019-11-01 15:12:35 +03:00 |
|
michail
|
09e0a36313
|
added image url to partner model
|
2019-11-01 17:08:53 +05:00 |
|
evgeniy-st
|
445d76df75
|
boost name and name_translated in es search
|
2019-11-01 14:56:07 +03:00 |
|
Anatoly
|
e6f9e388aa
|
intermediate commit
|
2019-11-01 14:38:29 +03:00 |
|
Виктор Гладких
|
1df89b6c48
|
Merge branch 'develop' into feature/collect
|
2019-11-01 14:31:30 +03:00 |
|
Виктор Гладких
|
96aad4ff42
|
Fix country code
|
2019-11-01 14:28:01 +03:00 |
|
alex
|
84cefefa0b
|
fix add_establishment_description
|
2019-11-01 14:14:16 +03:00 |
|
Anatoly
|
d1113364a9
|
intermediate commit
|
2019-11-01 14:09:54 +03:00 |
|
evgeniy-st
|
0fc951696c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-01 12:58:15 +03:00 |
|
evgeniy-st
|
0e04b9d044
|
update toque calculating
|
2019-11-01 12:57:57 +03:00 |
|
littlewolf
|
41e48cb0e9
|
Merge branch 'feature/fix-country-transfer' into develop
|
2019-11-01 12:13:11 +03:00 |
|
littlewolf
|
0352615200
|
Fix country_code svg
|
2019-11-01 12:12:51 +03:00 |
|
Anatoly
|
623934438f
|
fixed svg path
|
2019-11-01 12:00:51 +03:00 |
|
Anatoly
|
78a8a5d699
|
intermediate commit
|
2019-11-01 11:53:32 +03:00 |
|
evgeniy-st
|
04afd4d913
|
update country time_format and __str__ method
|
2019-11-01 11:34:48 +03:00 |
|
Anatoly
|
6f8361cb83
|
Merge branch 'develop' into features/migrate-wine
|
2019-11-01 11:16:06 +03:00 |
|
alex
|
383032b2af
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-01 10:48:56 +03:00 |
|
alex
|
b3bd2a7141
|
add_establishment_social command
|
2019-11-01 10:48:46 +03:00 |
|
d.kuzmenko
|
03feb13166
|
Merge branch 'feature/collect' into 'develop'
Feature/collect
See merge request gm/gm-backend!89
|
2019-11-01 07:36:40 +00:00 |
|
e.stoyushko
|
b7b2e7fb25
|
Merge branch 'feature/booking-prepayment' into 'develop'
Booking pre-payment
See merge request gm/gm-backend!80
|
2019-11-01 07:30:14 +00:00 |
|
e.stoyushko
|
7c530bb43b
|
Merge branch 'feature/time-format-for-front' into 'develop'
Time format for country
See merge request gm/gm-backend!88
|
2019-11-01 07:23:49 +00:00 |
|
Виктор Гладких
|
954d515a5a
|
Merge branch 'develop' into feature/collect
|
2019-11-01 10:18:36 +03:00 |
|
Виктор Гладких
|
dbee524a31
|
Add
|
2019-11-01 10:17:12 +03:00 |
|
Виктор Гладких
|
54f2290bbd
|
exit
|
2019-11-01 10:16:05 +03:00 |
|
alex
|
4be8582e7c
|
Merge branch 'maigrate-carousel' into develop
|
2019-11-01 08:44:46 +03:00 |
|
alex
|
68182e837c
|
carousel fin
|
2019-11-01 08:41:56 +03:00 |
|
littlewolf
|
e2e95256d8
|
Merge branch 'feature/fix-country-transfer' into develop
|
2019-11-01 08:11:30 +03:00 |
|
alex
|
4cdcc8988b
|
Merge remote-tracking branch 'origin/develop' into maigrate-carousel
|
2019-11-01 07:39:11 +03:00 |
|
evgeniy-st
|
972e456f20
|
recalculate toque_number for other countries
|
2019-10-31 19:21:06 +03:00 |
|
evgeniy-st
|
47b7a7bde1
|
Merge branch 'feature/recalculate-toque-number' into develop
|
2019-10-31 19:10:25 +03:00 |
|
evgeniy-st
|
6d34e406db
|
recalculate toque number
|
2019-10-31 19:09:57 +03:00 |
|
Kuroshini
|
a8861238ac
|
Time format for country
|
2019-10-31 19:02:48 +03:00 |
|
Anatoly
|
5d43e2fd5b
|
refactor models
|
2019-10-31 18:44:30 +03:00 |
|
alex
|
3c88d4f1f5
|
carousel serializer
|
2019-10-31 18:31:15 +03:00 |
|
Kuroshini
|
26e04719c3
|
Index name for tags
|
2019-10-31 17:58:39 +03:00 |
|
alex
|
f237c37840
|
Merge remote-tracking branch 'origin/develop' into maigrate-carousel
|
2019-10-31 17:56:15 +03:00 |
|
alex
|
1946bddad2
|
start carousel
|
2019-10-31 17:55:19 +03:00 |
|
Anatoly
|
fe586755e3
|
small fix
|
2019-10-31 17:54:56 +03:00 |
|
Anatoly
|
dd38e6e5de
|
refactor models
|
2019-10-31 17:53:37 +03:00 |
|
Виктор Гладких
|
1abe280ef7
|
Add unique collection
|
2019-10-31 17:51:23 +03:00 |
|
littlewolf
|
2ae68e60e4
|
Add flag updates with command python manage.py transfer --update_country_flag
|
2019-10-31 17:47:31 +03:00 |
|
evgeniy-st
|
a44081c2e7
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-31 17:38:07 +03:00 |
|
evgeniy-st
|
b87f21c630
|
update transfer tz field
|
2019-10-31 17:34:59 +03:00 |
|
e.stoyushko
|
4460559541
|
Merge branch 'fix-subquery' into 'develop'
Fix subqueries
See merge request gm/gm-backend!81
|
2019-10-31 14:23:25 +00:00 |
|
alex
|
55e68ec336
|
fix establishment mark
|
2019-10-31 17:19:07 +03:00 |
|
Виктор Гладких
|
7b4837f4f3
|
Add
|
2019-10-31 17:04:25 +03:00 |
|
Виктор Гладких
|
989e80ece6
|
First
|
2019-10-31 16:57:12 +03:00 |
|
evgeniy-st
|
30a58473c3
|
using a fallback language for translation
|
2019-10-31 16:11:46 +03:00 |
|
e.stoyushko
|
6c8deb5f80
|
Merge branch 'feature/geo-subtypes' into 'develop'
Geo subtypes
See merge request gm/gm-backend!86
|
2019-10-31 11:52:10 +00:00 |
|
evgeniy-st
|
af0768b4cc
|
Merge branch 'develop' into fix-subquery
|
2019-10-31 14:45:22 +03:00 |
|
e.stoyushko
|
2c9d579a54
|
Update models.py
|
2019-10-31 11:42:57 +00:00 |
|
alex
|
0d399cc44e
|
add_establishment_mark command
|
2019-10-31 12:29:40 +03:00 |
|
alex
|
7be3c2b93f
|
add_establishment_description command
|
2019-10-31 12:02:52 +03:00 |
|
Anatoly
|
6fe8252025
|
need refactoring, put temporary solution
TagBaseSerializer
TagCategoryBaseSerializer
|
2019-10-31 11:04:53 +03:00 |
|
littlewolf
|
20785770e1
|
Add transfer_language
|
2019-10-31 10:05:39 +03:00 |
|
littlewolf
|
c8554772f1
|
Fix review published_at
Add old_id
Add description to establishment
|
2019-10-31 10:05:00 +03:00 |
|
alex
|
fea93f50f7
|
fix image_url for establishment
|
2019-10-31 09:40:50 +03:00 |
|
littlewolf
|
d1f1337640
|
Merge branch 'origin/feature/migrate-etablishment' into develop
|
2019-10-31 08:50:59 +03:00 |
|
littlewolf
|
11a1928346
|
Add MultipkleObjects exception
|
2019-10-31 08:49:17 +03:00 |
|
littlewolf
|
f259319ade
|
Fix exception
|
2019-10-31 08:42:52 +03:00 |
|
alex
|
9cdb3cca27
|
rm works_now from elastic
|
2019-10-31 08:17:08 +03:00 |
|
alex
|
ea5140cc9c
|
fix summary field in news
|
2019-10-31 08:11:14 +03:00 |
|
littlewolf
|
08ca1dc356
|
Move addresses to new key
|
2019-10-31 07:47:45 +03:00 |
|
littlewolf
|
c08e202f64
|
Fix db
|
2019-10-31 07:46:29 +03:00 |
|
littlewolf
|
d654b093ef
|
Fix
|
2019-10-31 07:44:53 +03:00 |
|
littlewolf
|
8f18320171
|
Merge branch 'develop' into origin/feature/migrate-etablishment
# Conflicts:
# apps/establishment/transfer_data.py
# apps/transfer/management/commands/transfer.py
|
2019-10-31 07:44:07 +03:00 |
|
littlewolf
|
968ae4246b
|
Fix mark
|
2019-10-31 07:37:09 +03:00 |
|
littlewolf
|
b146e6cd24
|
Add establishment address transfer
|
2019-10-31 07:00:44 +03:00 |
|
a.feteleu
|
a4c9c8f0cc
|
fix tags command
|
2019-10-31 02:16:29 +03:00 |
|
Dmitriy Kuzmenko
|
e653e6c7da
|
fix tag command
|
2019-10-31 00:53:01 +03:00 |
|
alex
|
e74c32f0cb
|
fix summary
|
2019-10-30 23:15:40 +03:00 |
|
alex
|
7e503f617e
|
merge migrations
|
2019-10-30 20:15:19 +03:00 |
|
alex
|
962d24f737
|
Merge branch 'migration_fix' into develop
# Conflicts:
# apps/establishment/admin.py
# apps/transfer/models.py
|
2019-10-30 20:04:02 +03:00 |
|
Anatoly
|
414ad72ed3
|
Revert "modified NewsImageSerializer, in future needs refactoring"
This reverts commit 776b500d
|
2019-10-30 20:01:19 +03:00 |
|
Anatoly
|
776b500d19
|
modified NewsImageSerializer, in future needs refactoring
|
2019-10-30 19:59:12 +03:00 |
|
Dmitriy Kuzmenko
|
048b971e78
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-30 19:51:48 +03:00 |
|
Dmitriy Kuzmenko
|
aa2759d7e0
|
fix estab tags
|
2019-10-30 19:51:33 +03:00 |
|
a.feteleu
|
d31bb9b495
|
merge migrations
|
2019-10-30 19:19:40 +03:00 |
|
Dmitriy Kuzmenko
|
638bafe4a6
|
Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
# apps/establishment/admin.py
# project/settings/base.py
|
2019-10-30 19:12:59 +03:00 |
|
Dmitriy Kuzmenko
|
523e3a1ca0
|
merge work in subtitle
|
2019-10-30 18:59:16 +03:00 |
|
Dmitriy Kuzmenko
|
03ee9c1279
|
Merge remote-tracking branch 'origin/origin/migration_fix' into origin/migration_fix
# Conflicts:
# apps/transfer/serializers/news.py
|
2019-10-30 18:52:56 +03:00 |
|
Dmitriy Kuzmenko
|
58be2491a5
|
create command for establishment tags
|
2019-10-30 18:47:13 +03:00 |
|
Kuroshini
|
261d70af53
|
Use another GO endpoint
|
2019-10-30 18:28:27 +03:00 |
|
Виктор Гладких
|
c1c9f99fb5
|
Add product migrate data
|
2019-10-30 18:04:30 +03:00 |
|
Виктор Гладких
|
f6151c0a14
|
delete okd_models from product
|
2019-10-30 17:24:40 +03:00 |
|
Виктор Гладких
|
b74b87d78d
|
Add products model in transfer
|
2019-10-30 17:23:45 +03:00 |
|
alex
|
b5d1715063
|
Merge remote-tracking branch 'origin/migration_fix' into migration_fix
|
2019-10-30 15:54:50 +03:00 |
|
alex
|
4343060c74
|
Merge branch 'migration_fix' into HEAD
|
2019-10-30 15:49:32 +03:00 |
|
alex
|
8c3306628e
|
news transfer
|
2019-10-30 15:48:32 +03:00 |
|
Kuroshini
|
d4792cb342
|
Geo subtypes
|
2019-10-30 14:34:07 +03:00 |
|
Anatoly
|
6fcfb263d3
|
fix ProductModelAdmin
|
2019-10-30 14:23:40 +03:00 |
|
Kuroshini
|
42c596b592
|
Weekday for mobile devices
|
2019-10-30 14:19:03 +03:00 |
|
alex
|
c521839389
|
news refactor
|
2019-10-30 13:53:12 +03:00 |
|
littlewolf
|
a67df32086
|
Fix establishment_mark
|
2019-10-30 12:55:44 +03:00 |
|
littlewolf
|
f690ad3b8f
|
Fix key
|
2019-10-30 12:48:04 +03:00 |
|
littlewolf
|
37c3a43932
|
Mv reviews to mention command
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
86e0699c8c
|
Add reviews transfer
Add language transfer
Fix comment transfer
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
c564f4fd67
|
Fix rewiewers
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
9310bff319
|
Add comment serializer
|
2019-10-30 12:31:38 +03:00 |
|
evgeniy-st
|
7805a63055
|
remove establishment document filtering by country code
|
2019-10-30 12:15:40 +03:00 |
|
evgeniy-st
|
00bcd6c205
|
added merge migrations
|
2019-10-30 11:59:19 +03:00 |
|
evgeniy-st
|
e371fdceea
|
Merge branch 'develop' into migration_fix
|
2019-10-30 11:50:30 +03:00 |
|
e.stoyushko
|
c9edaaa654
|
Merge branch 'feature/geo-type-index-name' into 'develop'
Feature/geo type index name
See merge request gm/gm-backend!84
|
2019-10-30 07:31:50 +00:00 |
|
alex
|
e524483ed0
|
fix ass_publish_data
|
2019-10-30 08:03:30 +03:00 |
|
alex
|
a0c52d8ef9
|
Merge remote-tracking branch 'origin/origin/migration_fix' into migration_fix
|
2019-10-29 21:57:07 +03:00 |
|
Dmitriy Kuzmenko
|
a3bf921771
|
fix timezone
|
2019-10-29 21:54:59 +03:00 |
|
alex
|
0a7a5e57f4
|
Merge remote-tracking branch 'origin/migration_fix' into migration_fix
|
2019-10-29 21:54:14 +03:00 |
|
alex
|
55bdc7771f
|
add image to establishment
|
2019-10-29 21:54:03 +03:00 |
|
Kuroshini
|
a0aa503cfa
|
Add index_name type field to geo
|
2019-10-29 20:56:41 +03:00 |
|
evgeniy-st
|
9fecbfe98f
|
EstablishmentViewSet default ordering and filtration
|
2019-10-29 19:17:44 +03:00 |
|
evgeniy-st
|
3f233fd246
|
update establishment document index & establishment documentview
|
2019-10-29 18:13:21 +03:00 |
|
Anatoly
|
5675f23fae
|
fixed BaseModelAdminMixin
|
2019-10-29 18:12:52 +03:00 |
|
Anatoly
|
5984fdc7cd
|
fixed BaseModelAdminMixin
|
2019-10-29 17:57:11 +03:00 |
|
Anatoly
|
71f2f8a574
|
small fix for establishment model admin
|
2019-10-29 17:44:03 +03:00 |
|
Dmitriy Kuzmenko
|
c32b665b92
|
enable elastic
|
2019-10-29 17:17:24 +03:00 |
|
alex
|
b41ec3eebd
|
add is_publish
|
2019-10-29 17:16:51 +03:00 |
|
Anatoly
|
03c75efece
|
gm-259, gm-260, gm-261
|
2019-10-29 17:16:39 +03:00 |
|
alex
|
59371fae9a
|
Merge remote-tracking branch 'origin/origin/migration_fix' into migration_fix
|
2019-10-29 16:43:27 +03:00 |
|
alex
|
f929c096bc
|
add subtitle like a description
|
2019-10-29 16:42:43 +03:00 |
|
Dmitriy Kuzmenko
|
e270131679
|
Merge branch 'develop' into origin/migration_fix
|
2019-10-29 15:27:40 +03:00 |
|
Dmitriy Kuzmenko
|
8fd14f2f44
|
Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/migration_fix
|
2019-10-29 15:27:19 +03:00 |
|
Anatoly
|
13eaa94261
|
added filter to FavoritesEstablishmentListView
|
2019-10-29 15:23:26 +03:00 |
|
evgeniy-st
|
251edda2ea
|
update Document ViewSet's pagination class
|
2019-10-29 15:19:07 +03:00 |
|
Dmitriy Kuzmenko
|
03bf648ef9
|
add change admin for establishments
|
2019-10-29 15:08:54 +03:00 |
|
Dmitriy Kuzmenko
|
30ba313f54
|
add filter accounts for existing users
|
2019-10-29 14:47:57 +03:00 |
|
Dmitriy Kuzmenko
|
631ffd265a
|
add mixin for admin panel
|
2019-10-29 14:46:44 +03:00 |
|
Dmitriy Kuzmenko
|
97f75dfc05
|
add filter accounts for existing users
|
2019-10-29 14:32:51 +03:00 |
|
Anatoly
|
8cf2cebe85
|
added BaseModelAdminMixin
|
2019-10-29 14:01:27 +03:00 |
|
alex
|
dc11fb055f
|
fix news and paris establishments
|
2019-10-29 12:34:08 +03:00 |
|
alex
|
e68e33859d
|
Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/feature/migration
|
2019-10-29 12:31:32 +03:00 |
|
alex
|
b84eb68dd9
|
Merge branch 'feature/migrate-menu' into origin/feature/migration
|
2019-10-29 12:18:18 +03:00 |
|
littlewolf
|
338c4a4901
|
Add migration
|
2019-10-29 12:16:18 +03:00 |
|
littlewolf
|
72c6545a34
|
Add old_id to account_user
|
2019-10-29 11:30:33 +03:00 |
|
michail
|
7613ece6f8
|
new fix notification.py
|
2019-10-29 13:09:13 +05:00 |
|
michail
|
4a9361e04f
|
fix notification.py
|
2019-10-29 12:50:05 +05:00 |
|
Dmitriy Kuzmenko
|
0990b8e4dd
|
Merge branch 'origin/feature/migrate-etablishment' of ssh://gl.id-east.ru:222/gm/gm-backend into origin/feature/migrate-etablishment
|
2019-10-29 10:36:17 +03:00 |
|
Dmitriy Kuzmenko
|
411bef5272
|
change admin for news
|
2019-10-29 10:30:08 +03:00 |
|
alex
|
939d7f139f
|
fix max max length error
|
2019-10-29 10:20:30 +03:00 |
|
alex
|
4e868c2d8d
|
transfer dishes
|
2019-10-29 08:25:03 +03:00 |
|
Kuroshini
|
4cb44aa1fc
|
Rename
|
2019-10-28 18:44:31 +03:00 |
|
Kuroshini
|
76841af575
|
Booking notes & subscriber
|
2019-10-28 18:43:41 +03:00 |
|
Dmitriy Kuzmenko
|
5bfbafa865
|
fix disable signal of elsatic
|
2019-10-28 17:33:53 +03:00 |
|
Dmitriy Kuzmenko
|
bff4c70fc8
|
disable signal of elsatic
|
2019-10-28 17:32:15 +03:00 |
|
alex
|
c15b5976fb
|
fix ruby schedules
|
2019-10-28 17:07:32 +03:00 |
|
Kuroshini
|
37fb67cbb3
|
Fix subqueries
|
2019-10-28 14:40:39 +03:00 |
|
Kuroshini
|
3628283105
|
Booking pre-payment more info
|
2019-10-28 13:42:59 +03:00 |
|
Anatoly
|
ed09ee78cc
|
small refactoring
|
2019-10-28 13:11:07 +03:00 |
|
Anatoly
|
65e7c965e4
|
added migrations
|
2019-10-28 12:46:10 +03:00 |
|
Anatoly
|
d12df5c8e1
|
added WineAppellation model
|
2019-10-28 12:33:48 +03:00 |
|
alex
|
4e0f3c9a4d
|
with address
|
2019-10-28 10:59:28 +03:00 |
|
alex
|
49dbc9c72e
|
Merge remote-tracking branch 'origin/migrate-location-app' into origin/feature/migrate-etablishment
|
2019-10-28 10:22:33 +03:00 |
|
littlewolf
|
7feed3ac8f
|
Move address transfer to dictionaries
|
2019-10-28 10:14:11 +03:00 |
|
littlewolf
|
3622ac22b9
|
Add migrations
|
2019-10-28 10:13:43 +03:00 |
|
littlewolf
|
7d556df8d5
|
Add address serializer
|
2019-10-28 10:13:01 +03:00 |
|
alex
|
281d57996e
|
fix null timezone
|
2019-10-28 09:24:56 +03:00 |
|
littlewolf
|
25d58a8bc5
|
Fix and add city transfer
|
2019-10-28 07:19:17 +03:00 |
|
littlewolf
|
255b1ad5f1
|
Fix queryset conditions
|
2019-10-28 00:15:37 +03:00 |
|
littlewolf
|
0d30543664
|
Fix regions with subregions
|
2019-10-27 21:43:34 +03:00 |
|
littlewolf
|
07f226604e
|
Fix regions without subregion
|
2019-10-27 20:31:41 +03:00 |
|
Anatoly
|
e41b539ed7
|
added wine region
|
2019-10-27 18:42:51 +03:00 |
|
littlewolf
|
0db2638eb8
|
Fix country queryset
|
2019-10-27 17:23:04 +03:00 |
|
alex
|
3b68a4dc19
|
establishment fin fix 1
|
2019-10-27 16:47:08 +03:00 |
|
alex
|
25a2edf17d
|
establishment fin
|
2019-10-27 16:23:30 +03:00 |
|
littlewolf
|
7eb241ffed
|
Tmp commit
|
2019-10-27 12:47:45 +03:00 |
|
alex
|
16f06ce2f1
|
fix news slug
|
2019-10-26 22:02:38 +03:00 |
|
alex
|
490fae3c00
|
Merge branch 'origin/feature/migration' into origin/feature/migrate-etablishment
# Conflicts:
# apps/transfer/management/commands/transfer.py
|
2019-10-26 20:47:49 +03:00 |
|
Anatoly
|
37d745eeaa
|
added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype
|
2019-10-26 18:54:22 +03:00 |
|
littlewolf
|
8bcf4c9ca0
|
Add child regions
|
2019-10-26 09:35:09 +03:00 |
|
littlewolf
|
cd724de65f
|
Move countries to dictionaries
|
2019-10-26 09:19:34 +03:00 |
|
littlewolf
|
06b12f9427
|
Add country transfer
|
2019-10-26 09:18:45 +03:00 |
|
littlewolf
|
7e757aa63f
|
Merge branch 'origin/feature/migration' into migrate-location-app
# Conflicts:
# apps/gallery/models.py
# apps/location/transfer_data.py
# apps/transfer/management/commands/transfer.py
# project/settings/base.py
# requirements/base.txt
|
2019-10-26 08:45:12 +03:00 |
|
littlewolf
|
e72e92244b
|
Update country serializer
|
2019-10-26 08:42:00 +03:00 |
|
Kuroshini
|
dad4c5f5a3
|
Booking pre-payment
|
2019-10-25 20:08:23 +03:00 |
|
Semyon Yekhmenin
|
e1e0f1e997
|
Added index_name in employee position
|
2019-10-25 13:41:53 +00:00 |
|
Anatoly
|
7d0acba51b
|
added to same_theme and should_read preview_image_url, added UniqueConstraint to NewsGallery model
|
2019-10-25 16:18:16 +03:00 |
|
evgeniy-st
|
174e580c20
|
Merge branch 'feature/search-by-type' into develop
|
2019-10-25 16:07:38 +03:00 |
|
evgeniy-st
|
d4fe5ebd2d
|
search by type & subtype
|
2019-10-25 16:06:52 +03:00 |
|
Виктор Гладких
|
fb770f8e2a
|
Fix merge
|
2019-10-25 15:56:02 +03:00 |
|
Виктор Гладких
|
a38fed847a
|
Fix roles
|
2019-10-25 15:51:07 +03:00 |
|
Виктор Гладких
|
b7831b9739
|
Fix IsContentPageManager
|
2019-10-25 15:25:35 +03:00 |
|
Kuroshini
|
4eaa600fc1
|
Fix all tests
|
2019-10-25 14:13:54 +03:00 |
|
Kuroshini
|
dd0b595132
|
Review fixes
|
2019-10-25 14:13:19 +03:00 |
|
Kuroshini
|
7f23f0e891
|
Establishment each hour reindexing
|
2019-10-25 14:13:19 +03:00 |
|
Semyon Yekhmenin
|
91f6503a26
|
Added country name to site settings
|
2019-10-25 10:54:01 +00:00 |
|
michail
|
3e34dcda91
|
Merge remote-tracking branch 'origin/origin/feature/migration' into origin/feature/migration
|
2019-10-25 15:43:05 +05:00 |
|
michail
|
76d6e22fb9
|
added transfer for advertisement
|
2019-10-25 15:42:54 +05:00 |
|
Виктор Гладких
|
7f4b46dbf8
|
Fix country admin
|
2019-10-25 12:42:01 +03:00 |
|
littlewolf
|
abe8eae655
|
Tmp
|
2019-10-25 12:27:38 +03:00 |
|
alex
|
0f595ee40b
|
merge migrations
|
2019-10-25 12:07:02 +03:00 |
|
alex
|
09647fa4d3
|
start transfer_data
|
2019-10-25 12:03:43 +03:00 |
|
michail
|
d79946633e
|
fix get_description for recipe.py
|
2019-10-25 13:17:35 +05:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +03:00 |
|
Виктор Гладких
|
046d0c5fe6
|
Fix country and comment role
|
2019-10-25 10:59:31 +03:00 |
|
Виктор Гладких
|
c33ea42b8e
|
Merge branch 'develop' into feature/fix_role
|
2019-10-25 10:15:38 +03:00 |
|
Виктор Гладких
|
851ba7f9dd
|
Test edit
|
2019-10-25 10:14:50 +03:00 |
|
littlewolf
|
bf375f3370
|
Remove errors
Add version to timezonefinder
|
2019-10-25 10:01:30 +03:00 |
|
alex
|
cd294961e0
|
Merge remote-tracking branch 'origin/develop' into feature/migration
|
2019-10-25 10:00:25 +03:00 |
|
littlewolf
|
95b5d4ad99
|
Merge branch 'develop' into migrate-location-app
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-25 09:54:03 +03:00 |
|
littlewolf
|
c61d5321a9
|
Tmp commit
|
2019-10-25 09:52:35 +03:00 |
|
littlewolf
|
106ddb044e
|
Add country transfer
|
2019-10-25 07:48:29 +03:00 |
|
Dmitriy Kuzmenko
|
66ddfb455b
|
fix tests
|
2019-10-24 22:19:59 +03:00 |
|
Anatoly
|
81cdaa5c89
|
added image_url & preview_image_url to NewsDocument
|
2019-10-24 19:53:09 +03:00 |
|
evgeniy-st
|
2864576c0c
|
fix TimeZoneChoiceField
|
2019-10-24 17:09:08 +03:00 |
|
alex
|
287578eb9e
|
base models and funcs
|
2019-10-24 17:08:00 +03:00 |
|
Виктор Гладких
|
7ac7df9ea3
|
Fix test news
|
2019-10-24 16:48:29 +03:00 |
|
Anatoly
|
84fb0aec70
|
change field parameter in model Guide (gm-241)
|
2019-10-24 16:42:08 +03:00 |
|
d.kuzmenko
|
f484219ec7
|
Merge branch 'feature/develop_ci' into 'develop'
Feature/develop ci
See merge request gm/gm-backend!70
|
2019-10-24 13:23:00 +00:00 |
|
evgeniy-st
|
8a8986246f
|
Merge branch 'bugfix/kuroshini' into develop
|
2019-10-24 16:19:10 +03:00 |
|
evgeniy-st
|
128488b5ee
|
some bugfixes
|
2019-10-24 16:17:37 +03:00 |
|
Виктор Гладких
|
2cf0a94ccb
|
Fix migr
|
2019-10-24 16:14:18 +03:00 |
|
alex
|
449bf0f28c
|
comment duplicate method
|
2019-10-24 16:11:26 +03:00 |
|
Виктор Гладких
|
df52c8a582
|
Add merged migrations
|
2019-10-24 15:34:35 +03:00 |
|
alex
|
a667655c09
|
pprint
|
2019-10-24 15:32:47 +03:00 |
|
alex
|
6335abe1ea
|
states dict fix
|
2019-10-24 15:24:31 +03:00 |
|
Semyon Yekhmenin
|
2b9c9d14ef
|
Added temporary stub for international news logic (hardcoded news id's)
|
2019-10-24 12:21:59 +00:00 |
|
Kuroshini
|
8c5d59e6bf
|
Revert "return fields"
This reverts commit 55ea169
|
2019-10-24 15:16:51 +03:00 |
|
alex
|
5826fb2475
|
mysql to docker-compose fix exception
|
2019-10-24 14:49:59 +03:00 |
|
Kuroshini
|
55ea169dce
|
return fields
|
2019-10-24 14:14:53 +03:00 |
|
Semyon Yekhmenin
|
74b2b52ee1
|
Added currency to establishment model
|
2019-10-24 11:06:58 +00:00 |
|
alex
|
3ce7e186f7
|
migrate from legacy news
|
2019-10-24 14:01:38 +03:00 |
|
alex
|
0adac058c5
|
Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-24 13:11:05 +03:00 |
|
evgeniy-st
|
636bc43a35
|
remove playlist from news model
|
2019-10-24 12:38:44 +03:00 |
|
alex
|
647147bf03
|
Merge branch 'develop' into feature/migrate-news
|
2019-10-24 12:28:51 +03:00 |
|
Anatoly
|
7b10a71cf6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-10-24 12:18:19 +03:00 |
|
Anatoly
|
7fa52d770e
|
added missing migration for app news
|
2019-10-24 12:17:58 +03:00 |
|
evgeniy-st
|
6c4f1a2e40
|
Fix news serializer
|
2019-10-24 12:08:44 +03:00 |
|
evgeniy-st
|
0edc2fae38
|
Clean news serializer
|
2019-10-24 12:03:41 +03:00 |
|
a.feteleu
|
3d301cb931
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-24 11:34:12 +03:00 |
|
a.feteleu
|
2756529c7f
|
fix migrations in userroles
|
2019-10-24 11:34:00 +03:00 |
|
Semyon Yekhmenin
|
890d1004e1
|
Added view for chosen tags
|
2019-10-24 07:44:47 +00:00 |
|
Kuroshini
|
bc50f118b8
|
Merge branch 'feature/tag-name-indexing' into develop
|
2019-10-23 18:09:41 +03:00 |
|
Kuroshini
|
b2341194bc
|
fix serializer
|
2019-10-23 18:08:43 +03:00 |
|
Sergey Melihov
|
ab5b5801fd
|
Merge branch 'feature/tag-name-indexing' into 'develop'
tag category indexing name
See merge request gm/gm-backend!65
|
2019-10-23 15:00:39 +00:00 |
|
Sergey Melihov
|
f3caf16d2c
|
Merge branch 'changes-from-gm-148' into 'develop'
Changes from gm 148
See merge request gm/gm-backend!63
|
2019-10-23 14:57:34 +00:00 |
|
Anatoly
|
a8001c44b1
|
added validation rule to NewsBackOfficeGallerySerializer
|
2019-10-23 17:50:08 +03:00 |
|
Anatoly
|
1e3c80ad0c
|
small fix
|
2019-10-23 17:40:42 +03:00 |
|
Kuroshini
|
07ac06f405
|
Update migration
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
711d536c98
|
Update migration
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
ce5987de95
|
Attach establishment timestamps as command
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
d5609e4cb8
|
Works now filter first part
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
47da9929cb
|
Some fixes
|
2019-10-23 17:28:06 +03:00 |
|
Kuroshini
|
40357c20b6
|
Changes from gm-148
|
2019-10-23 17:28:06 +03:00 |
|
a.feteleu
|
b78c4f82fe
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-23 17:13:13 +03:00 |
|
Kuroshini
|
125c438f19
|
Review fix #2
|
2019-10-23 17:08:40 +03:00 |
|
a.feteleu
|
7e93aafc3f
|
added merge migrations
|
2019-10-23 17:05:37 +03:00 |
|
evgeniy-st
|
a7a83a8755
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-23 17:03:52 +03:00 |
|
evgeniy-st
|
b1169675a8
|
fix CurrencySerializer
|
2019-10-23 17:03:24 +03:00 |
|
Anatoly
|
bd3a809d85
|
fix migrations
|
2019-10-23 16:48:45 +03:00 |
|
evgeniy-st
|
d8c99062ca
|
fix singals
|
2019-10-23 16:28:42 +03:00 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
Anatoly
|
fd2c1e0ca6
|
Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/production.py
|
2019-10-23 15:37:14 +03:00 |
|
Anatoly
|
6a9f11e989
|
merge from develop
|
2019-10-23 15:31:04 +03:00 |
|
michail
|
cb3ad6bb96
|
added transfer for gallery app
|
2019-10-23 17:19:23 +05:00 |
|
Semyon Yekhmenin
|
81bd7b4912
|
Feature/currency sign
|
2019-10-23 11:58:33 +00:00 |
|
Sergey Melihov
|
883f94c80a
|
Merge branch 'feature/password-changed-notification' into 'develop'
Feature/password changed notification
See merge request gm/gm-backend!58
|
2019-10-23 11:51:15 +00:00 |
|
michail
|
110d0872da
|
added transfer for partner app
|
2019-10-23 16:49:15 +05:00 |
|
Kuroshini
|
f46d4bd9f1
|
Review fix
|
2019-10-23 13:39:45 +03:00 |
|
Semyon Yekhmenin
|
538ae41d85
|
Establishments/slug/<slug> fix
|
2019-10-23 10:06:39 +00:00 |
|
michail
|
6c9ddfbc98
|
added transfer for recipe app
|
2019-10-23 14:42:08 +05:00 |
|
evgeniy-st
|
9c9c49d900
|
update slug fields
|
2019-10-23 12:25:50 +03:00 |
|
michail
|
8d0f4a8a00
|
added transfer for notification app
|
2019-10-23 14:17:34 +05:00 |
|
evgeniy-st
|
64692ae4b3
|
max length of slug is 255
|
2019-10-23 12:03:50 +03:00 |
|
Anatoly
|
90e53d738d
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/main/models.py
# apps/news/admin.py
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/base.py
# project/settings/production.py
# requirements/base.txt
|
2019-10-23 12:00:58 +03:00 |
|
evgeniy-st
|
154df2b720
|
Merge branch 'develop' into feature/product
|
2019-10-23 11:35:24 +03:00 |
|
evgeniy-st
|
766b6659f1
|
Models created: Product, OnlineProduct (proxy), ProductType, ProductSubtype
|
2019-10-23 11:31:45 +03:00 |
|
Anatoly
|
97823ea601
|
change title field in model Collection to translated JSON field (gm-165)
|
2019-10-23 11:25:04 +03:00 |
|
michail
|
1264ba963f
|
edited get_username because nickname from legacy is not unique
|
2019-10-23 13:12:13 +05:00 |
|
michail
|
6dd4e1af33
|
Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects
|
2019-10-23 12:18:39 +05:00 |
|
michail
|
9e6d01b1bd
|
prototype for transfer account
|
2019-10-23 12:18:25 +05:00 |
|
littlewolf
|
fed2aae7f1
|
Fix settings/base
Add transfer_data to location
|
2019-10-23 09:30:36 +03:00 |
|
littlewolf
|
f09bd5996a
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# project/settings/base.py
# requirements/base.txt
|
2019-10-23 09:27:42 +03:00 |
|
littlewolf
|
915683fa7b
|
Remove comments
|
2019-10-23 09:16:39 +03:00 |
|
Kuroshini
|
4a0a305e2c
|
tag category indexing name
|
2019-10-22 18:45:31 +03:00 |
|
Anatoly
|
3d68f1ba29
|
added imgae_url field to model Award (gm-183)
|
2019-10-22 18:20:34 +03:00 |
|
evgeniy-st
|
1b9df7c713
|
Merge branch 'develop' into feature/product
|
2019-10-22 17:12:59 +03:00 |
|
evgeniy-st
|
0c8959f4e7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-22 17:11:22 +03:00 |
|
evgeniy-st
|
d1c9e649b7
|
Remove metadatacontent
|
2019-10-22 17:05:54 +03:00 |
|
Semyon Yekhmenin
|
939e4a26a0
|
Feature/cities by country
|
2019-10-22 13:00:22 +00:00 |
|
evgeniy-st
|
45a3cd4b2b
|
Merge branch 'develop' into feature/product
|
2019-10-22 15:58:51 +03:00 |
|
Anatoly
|
071b634659
|
fixed EstablishmentFilter
|
2019-10-22 15:58:00 +03:00 |
|
Anatoly
|
4c9ea2e0e7
|
change field properties for Collection model
|
2019-10-22 15:45:58 +03:00 |
|
michail
|
5043462095
|
prototype
|
2019-10-22 17:11:45 +05:00 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
evgeniy-st
|
4ceb0e4d86
|
fix establishment migration
|
2019-10-21 20:22:47 +03:00 |
|
d.kuzmenko
|
18a2517fde
|
Merge branch 'feature/GM-176_standard_user' into 'develop'
Feature/gm 176 standard user
See merge request gm/gm-backend!54
|
2019-10-21 14:50:47 +00:00 |
|
Semyon Yekhmenin
|
afc2127646
|
Updated news model with agenda and banner
|
2019-10-21 14:45:34 +00:00 |
|
littlewolf
|
786ee03d8e
|
Fix
|
2019-10-21 17:24:30 +03:00 |
|
littlewolf
|
863762bdf2
|
Fix state
|
2019-10-21 17:23:50 +03:00 |
|
littlewolf
|
21f10d06f2
|
Fix state
|
2019-10-21 17:22:28 +03:00 |
|
evgeniy-st
|
55263e4059
|
remove merge migration
|
2019-10-21 16:51:01 +03:00 |
|
evgeniy-st
|
9c80811020
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 16:50:18 +03:00 |
|
evgeniy-st
|
19caf9faa6
|
Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148
|
2019-10-21 16:48:39 +03:00 |
|
evgeniy-st
|
94502cfc73
|
added priority field to tag model (f7facf826d)
|
2019-10-21 16:47:01 +03:00 |
|
evgeniy-st
|
f96a1d4aa2
|
Revert "Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field."
This reverts commit f7facf826d.
|
2019-10-21 16:42:08 +03:00 |
|
Виктор Гладких
|
23b46e69ed
|
Fix test location
|
2019-10-21 16:28:32 +03:00 |
|
Виктор Гладких
|
d1d092e49d
|
Fix news tests
|
2019-10-21 16:21:14 +03:00 |
|
Виктор Гладких
|
87708df084
|
Fix test establishment
|
2019-10-21 16:11:28 +03:00 |
|
Виктор Гладких
|
adbc22f1f6
|
Fix comment test
|
2019-10-21 16:03:19 +03:00 |
|
Виктор Гладких
|
196d335213
|
Fix
|
2019-10-21 15:47:06 +03:00 |
|
Виктор Гладких
|
f65af6f7cf
|
Merge branch 'feature/GM-176_standard_user' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/GM-176_standard_user
|
2019-10-21 15:44:54 +03:00 |
|
Виктор Гладких
|
4f02fef456
|
Fix migrate
|
2019-10-21 15:44:20 +03:00 |
|
michail
|
4d3ecb65f2
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-21 17:32:02 +05:00 |
|
michail
|
e7107cfd04
|
fixes of news
|
2019-10-21 17:31:44 +05:00 |
|
Виктор Гладких
|
ee93cf9ff6
|
Fix migrate
|
2019-10-21 15:15:19 +03:00 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +03:00 |
|
Kuroshini
|
cc5249674d
|
merge migrations
|
2019-10-21 14:39:23 +03:00 |
|
Виктор Гладких
|
019c22a0c8
|
Fix test
|
2019-10-21 14:39:04 +03:00 |
|
littlewolf
|
3f85aa84cc
|
Remove tmp code
|
2019-10-21 14:19:01 +03:00 |
|
Виктор Гладких
|
3720ac2b8e
|
Fix collection test
|
2019-10-21 12:17:12 +03:00 |
|
Виктор Гладких
|
f338906736
|
Fix location tests
|
2019-10-21 11:44:47 +03:00 |
|
Виктор Гладких
|
c8b3f922e9
|
Fix location tests
|
2019-10-21 11:08:30 +03:00 |
|
evgeniy-st
|
2dbe65a169
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-21 10:31:06 +03:00 |
|
evgeniy-st
|
a9f995adbb
|
Merge branch 'feature/gm-192' into develop
|
2019-10-21 10:30:40 +03:00 |
|
evgeniy-st
|
1cd586662a
|
fix tagcategory binding serializer
|
2019-10-21 10:12:30 +03:00 |
|
littlewolf
|
7ebd338331
|
Tmp template fix
|
2019-10-21 09:59:59 +03:00 |
|
michail
|
c6750400ba
|
fix IntegerField to ForeignKey
|
2019-10-21 11:16:11 +05:00 |
|
michail
|
ec55f7915f
|
Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects
|
2019-10-21 11:08:05 +05:00 |
|
michail
|
019a10db52
|
commit
|
2019-10-21 11:07:54 +05:00 |
|
littlewolf
|
0a24b80917
|
Add title method
|
2019-10-20 19:08:14 +03:00 |
|
littlewolf
|
8965cf0460
|
Add news serializer
|
2019-10-20 17:59:18 +03:00 |
|
Semyon
|
f7facf826d
|
Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field.
|
2019-10-18 18:37:24 +03:00 |
|
evgeniy-st
|
21e3f76f5a
|
Backoffice Tag&TagCategory
|
2019-10-18 18:02:24 +03:00 |
|
Anatoly
|
7be7315cef
|
added filters and endpoint to get winery list
|
2019-10-18 18:00:57 +03:00 |
|
Виктор Гладких
|
5772558c4b
|
Fix
|
2019-10-18 16:04:21 +03:00 |
|
Виктор Гладких
|
7a4005ec21
|
Merge branch 'develop' into feature/GM-176_standard_user
|
2019-10-18 14:54:37 +03:00 |
|
Виктор Гладких
|
c44f8c39c1
|
Fix tests news
|
2019-10-18 13:05:42 +03:00 |
|
Виктор Гладких
|
2e2ed19118
|
Fix establishment tests
|
2019-10-18 12:14:10 +03:00 |
|
Kuroshini
|
3bc9dd7347
|
Open now filter (typo fix)
|
2019-10-18 02:56:49 +03:00 |
|
Kuroshini
|
b77c654c6c
|
Open now filter
|
2019-10-18 02:38:59 +03:00 |
|
Kuroshini
|
4b5b34de20
|
add preview image url (fix typo)
|
2019-10-17 23:28:13 +03:00 |
|
Kuroshini
|
5f2501c712
|
add preview image url
|
2019-10-17 23:25:49 +03:00 |
|
evgeniy-st
|
1cbfb12594
|
Merge remote-tracking branch 'origin/develop' into feature/gm-148
|
2019-10-17 16:58:30 +03:00 |
|
Semyon Yekhmenin
|
1ff571b767
|
Feature/mobile features
|
2019-10-17 13:29:29 +00:00 |
|
Виктор Гладких
|
64ac59ee99
|
Add permission to view ReviewRUDView
|
2019-10-17 16:20:25 +03:00 |
|
Виктор Гладких
|
c012f969af
|
Add RestaurantReviewer role
|
2019-10-17 16:17:17 +03:00 |
|
Виктор Гладких
|
d6ffbf5332
|
Merge branch 'develop' into feature/GM-176_standard_user
|
2019-10-17 15:27:49 +03:00 |
|
Виктор Гладких
|
5a058c14f4
|
Add back for review
|
2019-10-17 15:26:26 +03:00 |
|
evgeniy-st
|
9661de4810
|
Establishment types
|
2019-10-17 15:17:29 +03:00 |
|
Kuroshini
|
d2e34e5d49
|
Timetable search results
|
2019-10-17 15:10:26 +03:00 |
|
Виктор Гладких
|
c80b53a0fc
|
reviewer manager
|
2019-10-17 15:04:08 +03:00 |
|
Kuroshini
|
1998e3dc57
|
Change establishment schedule ES fields type
|
2019-10-17 14:59:35 +03:00 |
|
Kuroshini
|
2c5c067b53
|
try to remove weekday_display
|
2019-10-17 14:56:31 +03:00 |
|
Kuroshini
|
97fc8dce15
|
add schedule to search results
|
2019-10-17 14:45:33 +03:00 |
|
Kuroshini
|
c59811e037
|
Revert "Revert "add schedule to search results""
This reverts commit acea297
|
2019-10-17 14:34:49 +03:00 |
|
Kuroshini
|
acea297c94
|
Revert "add schedule to search results"
This reverts commit c8c66e7
|
2019-10-17 14:33:20 +03:00 |
|
Kuroshini
|
c8c66e7d1b
|
add schedule to search results
|
2019-10-17 14:32:10 +03:00 |
|
Anatoly
|
26ff9963d8
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# requirements/base.txt
|
2019-10-17 13:43:24 +03:00 |
|
Kuroshini
|
6a85e52abc
|
Rename variable
|
2019-10-17 12:30:40 +03:00 |
|
Semyon Yekhmenin
|
5176a455c1
|
Added method for getting coordinates and city by ip
|
2019-10-17 07:03:48 +00:00 |
|
Kuroshini
|
40f1cc1e22
|
Add lookup for categories
|
2019-10-16 20:56:56 +03:00 |
|
Kuroshini
|
9fc4a8703c
|
Search establishment by working time (added lookup)
|
2019-10-16 19:13:33 +03:00 |
|
Kuroshini
|
2f656c459d
|
Search establishment by working time (added fields to serializer)
|
2019-10-16 19:09:38 +03:00 |
|
Kuroshini
|
ed03f0f40f
|
Search establishment by working time
|
2019-10-16 19:05:16 +03:00 |
|
Виктор Гладких
|
766fdcdad5
|
Add reviewer manager
|
2019-10-16 15:18:31 +03:00 |
|
Kuroshini
|
6d7341377b
|
Show timetables list (remove pagination)
|
2019-10-16 14:46:36 +03:00 |
|
Kuroshini
|
c2c9f33b57
|
Show timetables list (only necessary fields)
|
2019-10-16 14:44:55 +03:00 |
|
Kuroshini
|
12a339cd1b
|
Show timetables list
|
2019-10-16 14:36:17 +03:00 |
|
Kuroshini
|
8dad3df4bf
|
Added route for mobile tags
|
2019-10-16 14:11:07 +03:00 |
|
Виктор Гладких
|
5ad3776fe3
|
establishment manager
|
2019-10-16 12:14:13 +03:00 |
|
Виктор Гладких
|
9fd89bf812
|
Add establishment manager role
|
2019-10-16 11:40:51 +03:00 |
|
Виктор Гладких
|
3271a6fed9
|
Establishment manager
|
2019-10-16 11:02:26 +03:00 |
|
Виктор Гладких
|
04a6bbea19
|
Add content page manager
|
2019-10-16 10:43:06 +03:00 |
|
Виктор Гладких
|
86692019d1
|
Add Country admin to views
|
2019-10-16 10:14:23 +03:00 |
|
littlewolf
|
e1b031caf3
|
Tmp commit
|
2019-10-16 07:05:05 +03:00 |
|
Kuroshini
|
e0bce99ca9
|
Fix issue with copies
|
2019-10-15 21:40:55 +03:00 |
|
evgeniy-st
|
a0e24a26a0
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:53:25 +03:00 |
|
evgeniy-st
|
ccf6e12e3f
|
remove tag category from establishment type
|
2019-10-15 18:52:32 +03:00 |
|
evgeniy-st
|
c09b1eb295
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:44:24 +03:00 |
|
evgeniy-st
|
3a54b70093
|
update tag on document index
|
2019-10-15 18:43:08 +03:00 |
|
evgeniy-st
|
c268575a04
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:33:44 +03:00 |
|
evgeniy-st
|
bde81b3700
|
update ES documents
|
2019-10-15 18:32:16 +03:00 |
|
evgeniy-st
|
9d4c483f51
|
clean models (tags)
|
2019-10-15 18:25:09 +03:00 |
|
evgeniy-st
|
42ae1cbb87
|
fix tagcategory queryset
|
2019-10-15 18:13:37 +03:00 |
|
evgeniy-st
|
f7eb534570
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 17:48:40 +03:00 |
|
evgeniy-st
|
c94ad3f017
|
comment some code
|
2019-10-15 17:48:01 +03:00 |
|
evgeniy-st
|
92529f4c5b
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 17:17:35 +03:00 |
|
evgeniy-st
|
60cdec99e0
|
refactor tags
|
2019-10-15 17:17:03 +03:00 |
|
Kuroshini
|
9c09f000fb
|
Password changed notification email
|
2019-10-15 16:32:47 +03:00 |
|
Виктор Гладких
|
322cfcd89d
|
Fix test
|
2019-10-15 15:33:28 +03:00 |
|
Виктор Гладких
|
9acef83894
|
Add country admin
|
2019-10-15 15:23:42 +03:00 |
|
Виктор Гладких
|
ff7df815f4
|
Fix country_id
|
2019-10-15 15:20:44 +03:00 |
|
Виктор Гладких
|
e8d0045cec
|
Merge branch 'develop' into feature/GM-176_standard_user
|
2019-10-15 15:17:15 +03:00 |
|
Anatoly
|
449eae060d
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 12:52:38 +03:00 |
|
Anatoly
|
1764cfc08b
|
added urlpath to get establishment tags to all platform
|
2019-10-15 12:52:21 +03:00 |
|
Anatoly
|
f86b7d489f
|
fix merge
|
2019-10-15 12:23:13 +03:00 |
|
Anatoly
|
2d830b2821
|
Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
|
2019-10-15 12:08:23 +03:00 |
|
littlewolf
|
ba1ce67444
|
Fix limit
|
2019-10-15 12:07:37 +03:00 |
|
littlewolf
|
09865db08a
|
Tmp commit to debug
|
2019-10-15 12:05:49 +03:00 |
|
littlewolf
|
4d908d0bbb
|
Add field converter
|
2019-10-15 12:05:49 +03:00 |
|
littlewolf
|
47a4d28cf0
|
Add fields map for simple field
Add fields map for tuple field
Refactoring code
|
2019-10-15 12:05:49 +03:00 |
|
littlewolf
|
8cae39cbb6
|
Tmp fix
|
2019-10-15 12:05:49 +03:00 |
|
Anatoly
|
6f6717efdc
|
Merge branch 'develop' into feature/gm-192
# Conflicts:
# apps/account/views/common.py
# project/urls/back.py
|
2019-10-15 11:47:14 +03:00 |
|
michail
|
54cfccbcbe
|
the fix of types fields in all apps
|
2019-10-15 13:23:31 +05:00 |
|
michail
|
dc12a184a1
|
the fix types of news fields
|
2019-10-15 12:46:06 +05:00 |
|
Виктор Гладких
|
43531d88dc
|
Country id
|
2019-10-15 10:05:31 +03:00 |
|
Anatoly
|
228cb72c36
|
Merge branch 'develop' into feature/gm-148
|
2019-10-14 18:19:46 +03:00 |
|
Виктор Гладких
|
275c5b467c
|
fixa
|
2019-10-14 18:15:17 +03:00 |
|
Виктор Гладких
|
8d2d5b87ac
|
Fix migrate SQL
|
2019-10-14 17:56:51 +03:00 |
|
Виктор Гладких
|
01a32f66e8
|
Fix location migrate sql
|
2019-10-14 17:38:37 +03:00 |
|
Виктор Гладких
|
1bd3cc9170
|
1
|
2019-10-14 17:32:34 +03:00 |
|
Kuroshini
|
fb4cf25dce
|
Fix empty email after creating account
|
2019-10-14 16:43:59 +03:00 |
|
Kuroshini
|
8eaf611d7e
|
Reverting migration
|
2019-10-14 16:02:02 +03:00 |
|
Kuroshini
|
6fa0051c93
|
Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
|
2019-10-14 15:53:40 +03:00 |
|
Виктор Гладких
|
0656e2ae32
|
Confirmed email for user standard
|
2019-10-14 15:48:31 +03:00 |
|
Виктор Гладких
|
7b4553663c
|
Fix
|
2019-10-14 15:45:41 +03:00 |
|
Виктор Гладких
|
b3eac3666b
|
Standart user, guest.
|
2019-10-14 14:48:13 +03:00 |
|
michail
|
a223832241
|
Relational integers to ForeignKey
|
2019-10-14 15:48:26 +05:00 |
|
michail
|
8ca27c7f87
|
Added transfer.py into main app.
Added legacy models into transfer/models.py
|
2019-10-14 14:30:13 +05:00 |
|
Anatoly
|
469f7bdf4c
|
added prefetch select related
|
2019-10-14 12:24:26 +03:00 |
|
Anatoly
|
9e237d4657
|
removed endpoint to display a list of tags by establishment id, added instead filter to filter tags by establishment id
|
2019-10-14 11:40:03 +03:00 |
|
Anatoly
|
47993a7155
|
added endpoint ot get list of tag categories with tags by establishment type
|
2019-10-14 10:22:17 +03:00 |
|
d.kuzmenko
|
1f6bf819e8
|
Merge branch 'feature/roles' into 'develop'
Feature/roles
See merge request gm/gm-backend!50
|
2019-10-14 07:09:18 +00:00 |
|
Anatoly
|
2d41b9142b
|
Merge remote-tracking branch 'origin/feature/gm-192' into feature/gm-192
|
2019-10-11 18:26:26 +03:00 |
|
Anatoly
|
cb762ce746
|
added param to attr for Establoishment model and small refactoring, boost queries
|
2019-10-11 18:26:13 +03:00 |
|
Виктор Гладких
|
1f44777a15
|
Fix
|
2019-10-11 17:04:55 +03:00 |
|
Виктор Гладких
|
e9ad418976
|
Revert migrate location
|
2019-10-11 16:57:59 +03:00 |
|
evgeniy-st
|
0d7104eace
|
Merge branch 'develop' into feature/gm-192
|
2019-10-11 16:44:54 +03:00 |
|
Anatoly
|
868a3c1b78
|
added merge migration
|
2019-10-11 16:36:34 +03:00 |
|
Anatoly
|
32d56ffe83
|
Merge branch 'develop' into feature/gm-148
|
2019-10-11 16:34:06 +03:00 |
|
d.kuzmenko
|
35532a32f4
|
Merge branch 'bugfix/account-change' into 'develop'
Don't change email until user confirms it
See merge request gm/gm-backend!51
|
2019-10-11 13:20:13 +00:00 |
|
Виктор Гладких
|
f441896d6a
|
Migrate data
|
2019-10-11 16:00:23 +03:00 |
|
Anatoly
|
ddb3eec679
|
finished endpoint to get tags by establishment type and subtype
|
2019-10-11 15:41:31 +03:00 |
|
Виктор Гладких
|
d9fc88e7c6
|
Merge branch 'develop' into feature/roles
|
2019-10-11 14:50:18 +03:00 |
|
Виктор Гладких
|
a6c56a4bf1
|
Fix and refactor
|
2019-10-11 14:49:32 +03:00 |
|
Kuroshini
|
0816a847ac
|
Some booking fixes
|
2019-10-11 14:36:25 +03:00 |
|
Kuroshini
|
114d159449
|
fix tests
|
2019-10-11 13:46:08 +03:00 |
|
michail
|
51b63335d7
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-11 15:41:32 +05:00 |
|
michail
|
7bcd2edab6
|
Added transfer.py into timetable.
Edited transfer.py for collection and location.
|
2019-10-11 15:41:09 +05:00 |
|
Anatoly
|
bdb9348916
|
Merge branch 'bugfix/gm-205' into feature/gm-148
# Conflicts:
# apps/establishment/models.py
|
2019-10-11 13:31:33 +03:00 |
|
Anatoly
|
0b9fd8b1dc
|
Merge branch 'bugfix/gm-205' into develop
|
2019-10-11 13:20:45 +03:00 |
|
littlewolf
|
6142508421
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-11 10:46:00 +03:00 |
|
littlewolf
|
f5c16fba9d
|
Tmp fix
|
2019-10-11 10:45:49 +03:00 |
|
Anatoly
|
a25d846028
|
fixed bug with duplicated records in similar establishments
|
2019-10-10 21:02:56 +03:00 |
|
Kuroshini
|
71528d8a28
|
Password reset confirmation mechanics
|
2019-10-10 20:49:35 +03:00 |
|
Kuroshini
|
c920628574
|
Don't change email until user confirms it
|
2019-10-10 17:42:29 +03:00 |
|
Виктор Гладких
|
caf11ed372
|
Merge branch 'develop' into feature/roles
|
2019-10-10 16:01:33 +03:00 |
|
Виктор Гладких
|
b390b1af26
|
Fix
|
2019-10-10 16:00:23 +03:00 |
|
michail
|
839491c740
|
added Pages, PageTexts, PageCounters and PageMetadata models into
transfer/models.py
|
2019-10-10 17:55:28 +05:00 |
|
michail
|
b2b8798c6c
|
Edited transfer.py for news, partner, reviews, comment.
Added transfer.py for recipe.
|
2019-10-10 17:46:52 +05:00 |
|
Виктор Гладких
|
b83efb7cda
|
Fix migrations
|
2019-10-10 15:23:44 +03:00 |
|
Виктор Гладких
|
ab5a66afe2
|
Test change
|
2019-10-10 15:20:13 +03:00 |
|
Anatoly
|
f83b735eb3
|
changed files
|
2019-10-10 15:10:43 +03:00 |
|
Anatoly
|
e435d71e00
|
Merge branch 'feature/gm-192' of https://gl.id-east.ru/gm/gm-backend into feature/gm-192
|
2019-10-10 15:09:45 +03:00 |
|
Виктор Гладких
|
56c0927a52
|
Add country control
|
2019-10-10 14:58:19 +03:00 |
|
evgeniy-st
|
2aa51b93d3
|
hide es search
|
2019-10-10 14:43:24 +03:00 |
|
Kuroshini
|
74460b3060
|
Fix imports issue
|
2019-10-10 14:43:24 +03:00 |
|
evgeniy-st
|
bb41f00451
|
hide es search
|
2019-10-10 14:42:42 +03:00 |
|
Kuroshini
|
bd7ba611fc
|
Fix imports issue
|
2019-10-10 14:28:42 +03:00 |
|
littlewolf
|
0e474a16ea
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-10 09:04:01 +03:00 |
|
evgeniy-st
|
074a5ec5ea
|
refactor news tags
|
2019-10-09 18:25:40 +03:00 |
|
Anatoly
|
f239e5def8
|
Merge branch 'feature/fix-auth-refactored-email' into feature/gm-192
# Conflicts:
# project/settings/base.py
|
2019-10-09 16:49:31 +03:00 |
|
Виктор Гладких
|
01dd728323
|
Refactor
|
2019-10-09 16:44:29 +03:00 |
|
Виктор Гладких
|
77839c7e8c
|
Merge branch 'develop' into feature/roles
|
2019-10-09 16:29:11 +03:00 |
|
Виктор Гладких
|
7ed976dec0
|
Test
|
2019-10-09 16:28:14 +03:00 |
|
Anatoly
|
74fa1fc014
|
Merge branch 'develop' into feature/gm-192
|
2019-10-09 16:21:50 +03:00 |
|
Anatoly
|
091491e19f
|
small fix
|
2019-10-09 15:57:35 +03:00 |
|
Anatoly
|
3f9dea30ff
|
Revert "remove duplicate migration"
This reverts commit 93894db7
|
2019-10-09 15:54:04 +03:00 |
|
michail
|
4cc9fabd73
|
edited transfer.py for notification, account, establishment
|
2019-10-09 17:43:48 +05:00 |
|
Anatoly
|
a77b7f9c10
|
Revert "remove duplicate migration"
This reverts commit 40570a07
|
2019-10-09 15:42:46 +03:00 |
|
Anatoly
|
495b0a7563
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-10-09 15:36:50 +03:00 |
|
evgeniy-st
|
a763bb8a3a
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:36:44 +03:00 |
|
Anatoly
|
40570a0746
|
Revert "remove duplicate migration"
This reverts commit 93894db7
|
2019-10-09 15:36:43 +03:00 |
|
evgeniy-st
|
3ccd94f0b5
|
Merge remote-tracking branch 'origin/feature/booking' into develop
|
2019-10-09 15:36:26 +03:00 |
|
Anatoly
|
05d3e3ff60
|
fix migrations
|
2019-10-09 15:33:05 +03:00 |
|
Kuroshini
|
f5a45fccf1
|
Fix migration
|
2019-10-09 15:32:22 +03:00 |
|
Anatoly
|
41db19b167
|
Merge branch 'feature/fix-auth-refactored-email' into feature/gm-148
|
2019-10-09 15:20:34 +03:00 |
|
evgeniy-st
|
095b4a4bd7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:11:26 +03:00 |
|
e.stoyushko
|
1969af044c
|
Merge branch 'feature/booking' into 'develop'
Feature/booking
See merge request gm/gm-backend!6
|
2019-10-09 12:00:32 +00:00 |
|
Виктор Гладких
|
48ca13803e
|
Pre test permission comment
|
2019-10-09 14:44:01 +03:00 |
|
e.stoyushko
|
f3eda60868
|
Update urls.py
|
2019-10-09 11:43:09 +00:00 |
|
e.stoyushko
|
0cfc48e537
|
Update admin.py
|
2019-10-09 11:34:14 +00:00 |
|
Anatoly
|
2191a505a5
|
refactored EstablishmentBase serializer
|
2019-10-09 14:11:53 +03:00 |
|
evgeniy-st
|
3c3969bf64
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 14:00:16 +03:00 |
|
Anatoly
|
ca5f588466
|
fix elastic document, fix prefetch and select related
|
2019-10-09 12:53:35 +03:00 |
|
e.stoyushko
|
c6c0ba47c5
|
Merge branch 'feature/news-mail' into 'develop'
Feature/news mail
See merge request gm/gm-backend!48
|
2019-10-09 09:47:50 +00:00 |
|
e.stoyushko
|
b573038980
|
Update tasks.py
|
2019-10-09 09:46:23 +00:00 |
|
Виктор Гладких
|
eff7dfc452
|
Merge branch 'develop' into feature/roles
|
2019-10-09 10:44:04 +03:00 |
|
Anatoly
|
69d02e7a07
|
fix auth
|
2019-10-09 10:05:19 +03:00 |
|
littlewolf
|
22d2396c6b
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# docker-compose.yml
# project/settings/base.py
|
2019-10-09 07:54:15 +03:00 |
|
littlewolf
|
e8c48e99c6
|
Add key to transfer
Add queryset to transfer
Add models and fields get to transfer
|
2019-10-09 07:49:44 +03:00 |
|
Anatoly
|
33d2446c5c
|
Merge branch 'develop' into feature/gm-192
|
2019-10-08 15:39:31 +03:00 |
|
Anatoly
|
d321866dc2
|
gm-192: in progress
|
2019-10-08 15:38:35 +03:00 |
|
Виктор Гладких
|
eeba02c2ae
|
test role
|
2019-10-08 15:26:39 +03:00 |
|
evgeniy-st
|
e2e5faa3f9
|
Merge branch 'develop' into feature/gm-148
|
2019-10-08 14:41:52 +03:00 |
|
evgeniy-st
|
861daf8871
|
update search fields
|
2019-10-08 14:39:42 +03:00 |
|
michail
|
03b22d79db
|
edited Address in location/transfer.py
|
2019-10-08 14:01:40 +05:00 |
|
michail
|
bc7d4ef5a5
|
comment location/transfer.py
|
2019-10-08 12:24:57 +05:00 |
|
Виктор Гладких
|
e66a6bcbfa
|
Fix models
|
2019-10-08 10:18:51 +03:00 |
|
Виктор Гладких
|
7925febc77
|
Models role
|
2019-10-08 09:57:47 +03:00 |
|
littlewolf
|
ab768311f0
|
Update tables structure
|
2019-10-07 22:23:01 +03:00 |
|
evgeniy-st
|
97dc881200
|
Merge branch 'develop' into feature/gm-148
|
2019-10-07 18:03:07 +03:00 |
|
evgeniy-st
|
3bf65472d9
|
Auto fuzziness with match query
|
2019-10-07 16:31:50 +03:00 |
|
michail
|
4e96d09513
|
added transfer.py to account, comment and review
|
2019-10-07 14:34:24 +05:00 |
|
Anatoly
|
8ac5a1970f
|
fixed carousel
|
2019-10-07 10:51:08 +03:00 |
|
Anatoly
|
15ef2295ca
|
migration fix
|
2019-10-07 09:55:24 +03:00 |
|
Kuroshini
|
73646eb05f
|
News email #2
|
2019-10-05 18:08:58 +03:00 |
|
Kuroshini
|
90b8dafba9
|
News email #1
|
2019-10-04 20:24:48 +03:00 |
|
Anatoly
|
90ab1a2ab9
|
Revert "fix migrations"
This reverts commit 9a36b52e
|
2019-10-04 18:02:51 +03:00 |
|
Anatoly
|
d60d166031
|
added merge migration
|
2019-10-04 17:01:40 +03:00 |
|
Anatoly
|
059bcdb07d
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 15:55:58 +03:00 |
|
Kuroshini
|
4d55f80e6f
|
Added migration
|
2019-10-04 15:49:21 +03:00 |
|
Виктор Гладких
|
aa9288d41c
|
Merge branch 'develop' into feature/news-rating
|
2019-10-04 15:41:25 +03:00 |
|
Виктор Гладких
|
f93d0095f4
|
Fix rating
|
2019-10-04 15:40:18 +03:00 |
|
Виктор Гладких
|
9f9c1064bd
|
Fix rating
|
2019-10-04 15:39:14 +03:00 |
|
Anatoly
|
9a36b52eec
|
fix migrations
|
2019-10-04 15:26:29 +03:00 |
|
Anatoly
|
c365711c05
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 14:31:03 +03:00 |
|
Anatoly
|
91790bbc39
|
refactored
|
2019-10-04 14:30:34 +03:00 |
|
michail
|
511312bb28
|
added transfer.py to partner
|
2019-10-04 16:20:04 +05:00 |
|
evgeniy-st
|
175bd4f7b5
|
update establishment document
|
2019-10-04 14:07:50 +03:00 |
|
Anatoly
|
eaa1795f0c
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/authorization/tasks.py
|
2019-10-04 14:00:06 +03:00 |
|
Anatoly
|
af0e6af5c4
|
refactored email reconfirm view
|
2019-10-04 13:48:48 +03:00 |
|
Anatoly
|
b2f900d15d
|
gm-148: refactored
|
2019-10-04 13:25:42 +03:00 |
|
evgeniy-st
|
9fb05f0407
|
Merge branch 'feature/es' into develop
|
2019-10-04 12:11:12 +03:00 |
|
evgeniy-st
|
a73cba4dcf
|
Merge branch 'develop' into feature/es
|
2019-10-04 12:06:53 +03:00 |
|
evgeniy-st
|
50a9622f78
|
News search
|
2019-10-04 12:05:13 +03:00 |
|
Anatoly
|
646eeb8972
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
|
2019-10-04 11:53:31 +03:00 |
|
Anatoly
|
4890e00b95
|
gm-148: refactored
|
2019-10-04 11:50:29 +03:00 |
|
d.kuzmenko
|
f9247477f9
|
Merge branch 'feature/news-rating' into 'develop'
Feature/news rating
See merge request gm/gm-backend!46
|
2019-10-04 08:33:13 +00:00 |
|
michail
|
ad17a2ad7a
|
new relations template
|
2019-10-04 13:18:43 +05:00 |
|
evgeniy-st
|
24f84ae8be
|
update tag filter
|
2019-10-04 11:16:01 +03:00 |
|
Виктор Гладких
|
b42e9781a1
|
Fix code
|
2019-10-04 10:20:36 +03:00 |
|
Виктор Гладких
|
2e0da3a15f
|
Merge branch 'develop' into feature/news-rating
|
2019-10-04 10:16:05 +03:00 |
|
Виктор Гладких
|
ca38f369f7
|
Fix
|
2019-10-04 10:15:07 +03:00 |
|
littlewolf
|
4ce0eb284d
|
Update transfer structure in location
|
2019-10-04 08:16:56 +03:00 |
|
littlewolf
|
b581ead8ae
|
Add relation fields
|
2019-10-04 07:50:19 +03:00 |
|
littlewolf
|
90dd896f13
|
Load app models
Load legacy models
|
2019-10-04 00:14:16 +03:00 |
|
littlewolf
|
673acb4bb9
|
Add sort
Move dependencies to model
Add data_type to model
|
2019-10-03 23:19:40 +03:00 |
|
Kuroshini
|
3f6aa21005
|
Fix issue w/ Lastable service
|
2019-10-03 20:41:26 +03:00 |
|
Kuroshini
|
3da57b72fc
|
Lastable naive realization
|
2019-10-03 19:26:09 +03:00 |
|
evgeniy-st
|
8b9f6ed864
|
another fix migraztion
|
2019-10-03 18:21:04 +03:00 |
|
evgeniy-st
|
880c387759
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-03 18:12:12 +03:00 |
|
evgeniy-st
|
cb37b5733e
|
update migration
|
2019-10-03 18:10:29 +03:00 |
|
evgeniy-st
|
729a77866d
|
update elasticsearch index
|
2019-10-03 17:19:30 +03:00 |
|
littlewolf
|
ea427d6451
|
Update module
|
2019-10-03 16:37:57 +03:00 |
|
michail
|
018d9f6557
|
added establishment and collection transfer.py files
|
2019-10-03 17:54:26 +05:00 |
|
Kuroshini
|
53db4462f8
|
Added lastable booking availability checking method
|
2019-10-03 14:59:38 +03:00 |
|
Виктор Гладких
|
6e9da70594
|
Merge branch 'develop' into feature/news-rating
|
2019-10-03 14:52:30 +03:00 |
|
Виктор Гладких
|
9fd064fdec
|
Add rating unique value
|
2019-10-03 14:51:17 +03:00 |
|
Виктор Гладких
|
14cf7d7b1b
|
Add rating value in news
|
2019-10-03 14:46:34 +03:00 |
|
Kuroshini
|
0408d93599
|
Squashed migrations && added lastable credentials
|
2019-10-03 13:41:45 +03:00 |
|
e.stoyushko
|
4c734cc2ec
|
Merge branch 'feature/translate-classes-carousel' into 'develop'
Feature/translate classes carousel
See merge request gm/gm-backend!44
|
2019-10-03 09:18:25 +00:00 |
|
Виктор Гладких
|
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 |
|
littlewolf
|
cf7184d7ac
|
Switch transfer standard
Add utils
Add -d key
|
2019-10-03 00:29:19 +03:00 |
|
littlewolf
|
288d6cd699
|
Tmp
|
2019-10-02 18:18:38 +03:00 |
|
Anatoly
|
4796fce784
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/admin.py
|
2019-10-02 18:11:47 +03:00 |
|
Anatoly
|
296a09165d
|
added migration
|
2019-10-02 18:09:29 +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
|
83ffb4dae1
|
Merge branch 'develop' into feature/gm-148
|
2019-10-02 16:22:11 +03:00 |
|
Anatoly
|
fec3e703ce
|
refactored collection views
|
2019-10-02 16:21:38 +03:00 |
|
Anatoly
|
e66b2f7f9f
|
refactored
|
2019-10-02 16:13:21 +03:00 |
|
michail
|
223447fc95
|
added model dicts to location/transfer.py
|
2019-10-02 18:11:16 +05:00 |
|
Anatoly
|
ae4d6c3ccd
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
|
2019-10-02 15:46:35 +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 |
|
littlewolf
|
59320f4333
|
Add temp transfer options to apps.location
|
2019-10-02 14:23:24 +03:00 |
|
Виктор Гладких
|
753471544e
|
Add app Rating
|
2019-10-02 14:17:06 +03:00 |
|
Anatoly
|
402bd32eda
|
gm-148: modified news gallery
|
2019-10-02 14:10:23 +03:00 |
|
evgeniy-st
|
ca9475b182
|
refactor this feature
|
2019-10-02 12:35:01 +03:00 |
|
littlewolf
|
9dcdb7575e
|
Switch application
Add application command
Update mixin
Add mixin to models
|
2019-10-02 11:41:14 +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 |
|
Anatoly
|
3234a71cde
|
gm-148: modified settings, added missing migration
|
2019-10-02 10:34:17 +03:00 |
|
Anatoly
|
b31e71d4ef
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/serializers.py
# project/settings/local.py
|
2019-10-02 10:20:14 +03:00 |
|
Anatoly
|
d9635a8599
|
gm-148: refactored
|
2019-10-02 10:16:32 +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 |
|
littlewolf
|
e3d26b5dd1
|
Temp commit
|
2019-10-01 07:43:38 +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 |
|
Anatoly
|
aeebdd02c6
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
|
2019-09-30 15:43:45 +03:00 |
|
Anatoly
|
501b8833ed
|
gm-148: finish
|
2019-09-30 15:40:28 +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 |
|
Anatoly
|
7f79ce8945
|
gm-148: in progress
|
2019-09-27 17:48:27 +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 |
|
Anatoly
|
14ae75f088
|
gm-148: refactored news serializer
|
2019-09-26 18:38:57 +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 |
|
michail
|
b8c734f5e6
|
Add partner tests
|
2019-09-22 15:37:51 +05:00 |
|
michail
|
7729ab5653
|
Add news tests
|
2019-09-21 17:44:27 +05:00 |
|
Anatoly
|
07d17d5bf1
|
refactored similar establishment endpoint
|
2019-09-20 16:55:04 +03:00 |
|
littlewolf
|
eaac6ca885
|
Fix
|
2019-09-20 16:47:20 +03:00 |
|
littlewolf
|
4e495fa47d
|
Remove debug
|
2019-09-20 16:42:35 +03:00 |
|
littlewolf
|
e39bc835fd
|
Fix class name
|
2019-09-20 16:41:24 +03:00 |
|
littlewolf
|
0d7b26bbb2
|
Add update tests
|
2019-09-20 16:40:53 +03:00 |
|
littlewolf
|
85fef10eb3
|
Fix establishment tests
|
2019-09-20 16:28:23 +03:00 |
|
littlewolf
|
aaff7fd3ba
|
Add schedule tests
|
2019-09-20 16:22:41 +03:00 |
|
littlewolf
|
2d8b30c3ee
|
Add patch test to plates class
|
2019-09-20 16:10:51 +03:00 |
|
Anatoly
|
277c7ba2eb
|
added field old_password to endpoint for change user password
|
2019-09-20 16:08:23 +03:00 |
|
littlewolf
|
7f973bbf52
|
Merge branch 'develop' into feature/establishment-tests-api-status
|
2019-09-20 16:00:39 +03:00 |
|
littlewolf
|
df0afc5653
|
Fix plates RUD view
|
2019-09-20 16:00:16 +03:00 |
|
littlewolf
|
2f74c63fd9
|
Fix plate tests
Add menu tests
|
2019-09-20 15:58:23 +03:00 |
|
Dmitriy Kuzmenko
|
1e1b09660d
|
fix news_type
|
2019-09-20 15:55:37 +03:00 |
|
littlewolf
|
014931d2c4
|
Add plate tests
Add is_publish to serializer
Add TODO for is_publish
|
2019-09-20 15:39:53 +03:00 |
|
Anatoly
|
193ecfba7a
|
fixed comments
|
2019-09-20 15:38:20 +03:00 |
|
Anatoly
|
5f3947601a
|
rename url path collection to collections, delete property in M2M field
|
2019-09-20 15:11:33 +03:00 |
|
littlewolf
|
e616d3970c
|
Add class to test childs
|
2019-09-20 14:55:34 +03:00 |
|
littlewolf
|
ee93905556
|
Add phone tests
|
2019-09-20 14:49:04 +03:00 |
|
Anatoly
|
09c9d666b5
|
rename image_url to image, preview_image_url to preview_image
|
2019-09-20 14:42:34 +03:00 |
|
littlewolf
|
00d8f09881
|
Add email tests
|
2019-09-20 14:42:00 +03:00 |
|
littlewolf
|
49d2070544
|
Add establishment tests
|
2019-09-20 14:31:02 +03:00 |
|
Anatoly
|
2089ca067a
|
chane FK to URLField in Collection model, added properties to field collections in Establishment model
|
2019-09-20 14:22:39 +03:00 |
|
Anatoly
|
413c93bead
|
fixed problem with image, refactored favorites, collection
|
2019-09-20 13:35:59 +03:00 |
|
evgeniy-st
|
d2075a1bf8
|
Initial app Product
|
2019-09-20 12:13:26 +03:00 |
|
Sergey Melihov
|
2a79018f76
|
Merge branch 'feature/employee_crud' into 'develop'
Feature/employee crud
See merge request gm/gm-backend!11
|
2019-09-20 06:39:20 +00:00 |
|
evgeniy-st
|
e5f4c27495
|
Fix establishment search
|
2019-09-19 18:27:47 +03:00 |
|
evgeniy-st
|
2cb4d22a94
|
Add in_favorites into models
|
2019-09-19 18:18:19 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
4a08abbfd9
|
employee test crd
|
2019-09-19 18:02:43 +03:00 |
|
Dmitriy Kuzmenko
|
b23a79775d
|
add merge for migrations
|
2019-09-19 17:57:30 +03:00 |
|
Dmitriy Kuzmenko
|
5a36613c97
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/establishment/urls/back.py
|
2019-09-19 17:19:40 +03:00 |
|
Dmitriy Kuzmenko
|
2164e30aef
|
chnage image field to image_url in establishments
|
2019-09-19 17:18:08 +03:00 |
|
Anatoly
|
2ce69eb003
|
added establishment tag identifier to TagListAPIView
|
2019-09-19 17:10:18 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
d3238f50c2
|
add login test
|
2019-09-19 17:06:38 +03:00 |
|
Anatoly
|
00925b7e0a
|
fixed tag list
|
2019-09-19 17:02:27 +03:00 |
|
Anatoly
|
1db37a7cee
|
fixed tag list
|
2019-09-19 16:56:00 +03:00 |
|
Anatoly
|
8d94279dbc
|
fixed migration for app advertisement, added choice to PlatformMixin
|
2019-09-19 16:46:33 +03:00 |
|