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
|
f8c9a5c830
|
Wine regions route
|
2019-11-18 01:20:35 +03:00 |
|
Kuroshini
|
cc67499601
|
Fix wines db queries
|
2019-11-16 18:32:38 +03:00 |
|
Kuroshini
|
2e463feb8d
|
Sort countries by name accordingly to locale
|
2019-11-16 16:23:31 +03:00 |
|
littlewolf
|
6bac3fc9c2
|
Add fields
|
2019-11-16 14:58:22 +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 |
|
Dmitriy Kuzmenko
|
141bddc0db
|
add active flag for languages and Countries
|
2019-11-14 22:54:27 +03:00 |
|
littlewolf
|
c872cdd4bc
|
Add child_region updater
|
2019-11-14 15:21:53 +03:00 |
|
Anatoly
|
688bc851bb
|
fixed product related tags
|
2019-11-14 12:39:09 +03:00 |
|
Kuroshini
|
a91ba7e6f3
|
Indexing products is ready
|
2019-11-13 18:43:30 +03:00 |
|
Anatoly
|
3641d88a05
|
fixed admin pages for product
|
2019-11-13 17:33:19 +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 |
|
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 |
|
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 |
|
Dmitriy Kuzmenko
|
359deeeb39
|
fix model currency
|
2019-11-12 04:06:28 +03:00 |
|
Anatoly
|
46662398e4
|
refactored detail and list view of products
|
2019-11-11 19:19:18 +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 |
|
littlewolf
|
6d27ac533a
|
Add transfer to city_photos
Add migrations
|
2019-11-10 16:34:31 +03:00 |
|
Anatoly
|
efb468f00d
|
added migrator, refactored migrators
|
2019-11-09 22:58:34 +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 |
|
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 |
|
Kuroshini
|
bf301d21bb
|
Fix tests
|
2019-11-07 18:25:04 +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 |
|
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 |
|
littlewolf
|
57d22bedcb
|
Add gallery
Add name_translated
Add migrations
|
2019-11-06 22:56:41 +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 |
|
littlewolf
|
e6094b7961
|
Fix RUD
Remove Create Serializer
|
2019-11-06 09:03:48 +03:00 |
|
Anatoly
|
87dacfec7f
|
refactored product app, see changes
|
2019-11-05 18:04:34 +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 |
|
littlewolf
|
a5b8b0cdb1
|
Fix fields
|
2019-11-05 14:35:11 +03:00 |
|
littlewolf
|
f8669ad3ca
|
Add city create
|
2019-11-05 14:14:38 +03:00 |
|
Kuroshini
|
e69f272a63
|
Fix time format for frontend
|
2019-11-02 15:42:33 +03:00 |
|
Anatoly
|
4a38bec2a7
|
added migrations and added migration wine colors
|
2019-11-01 16:48:49 +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 |
|
evgeniy-st
|
04afd4d913
|
update country time_format and __str__ method
|
2019-11-01 11:34:48 +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
|
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 |
|
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 |
|
Anatoly
|
dd38e6e5de
|
refactor models
|
2019-10-31 17:53:37 +03:00 |
|
littlewolf
|
2ae68e60e4
|
Add flag updates with command python manage.py transfer --update_country_flag
|
2019-10-31 17:47:31 +03:00 |
|
Виктор Гладких
|
989e80ece6
|
First
|
2019-10-31 16:57:12 +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 |
|
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 |
|
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 |
|
Dmitriy Kuzmenko
|
e270131679
|
Merge branch 'develop' into origin/migration_fix
|
2019-10-29 15:27:40 +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 |
|
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 |
|
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 |
|
littlewolf
|
7eb241ffed
|
Tmp commit
|
2019-10-27 12:47:45 +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
|
e72e92244b
|
Update country serializer
|
2019-10-26 08:42:00 +03:00 |
|
Виктор Гладких
|
fb770f8e2a
|
Fix merge
|
2019-10-25 15:56:02 +03:00 |
|
Виктор Гладких
|
b7831b9739
|
Fix IsContentPageManager
|
2019-10-25 15:25:35 +03:00 |
|
Виктор Гладких
|
7f4b46dbf8
|
Fix country admin
|
2019-10-25 12:42:01 +03:00 |
|
littlewolf
|
abe8eae655
|
Tmp
|
2019-10-25 12:27:38 +03:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +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 |
|
Kuroshini
|
d5609e4cb8
|
Works now filter first part
|
2019-10-23 17:29:00 +03: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 |
|
evgeniy-st
|
0c8959f4e7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-22 17:11:22 +03:00 |
|
Semyon Yekhmenin
|
939e4a26a0
|
Feature/cities by country
|
2019-10-22 13:00:22 +00:00 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
Виктор Гладких
|
23b46e69ed
|
Fix test location
|
2019-10-21 16:28:32 +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 |
|
Виктор Гладких
|
ee93cf9ff6
|
Fix migrate
|
2019-10-21 15:15:19 +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 |
|
Виктор Гладких
|
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 |
|
Kuroshini
|
b77c654c6c
|
Open now filter
|
2019-10-18 02:38:59 +03:00 |
|
Semyon Yekhmenin
|
1ff571b767
|
Feature/mobile features
|
2019-10-17 13:29:29 +00:00 |
|
Виктор Гладких
|
86692019d1
|
Add Country admin to views
|
2019-10-16 10:14:23 +03:00 |
|
michail
|
54cfccbcbe
|
the fix of types fields in all apps
|
2019-10-15 13:23:31 +05: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 |
|
michail
|
a223832241
|
Relational integers to ForeignKey
|
2019-10-14 15:48:26 +05:00 |
|
Виктор Гладких
|
1f44777a15
|
Fix
|
2019-10-11 17:04:55 +03:00 |
|
Виктор Гладких
|
e9ad418976
|
Revert migrate location
|
2019-10-11 16:57:59 +03:00 |
|
Виктор Гладких
|
f441896d6a
|
Migrate data
|
2019-10-11 16:00:23 +03:00 |
|
Виктор Гладких
|
a6c56a4bf1
|
Fix and refactor
|
2019-10-11 14:49:32 +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 |
|
littlewolf
|
f5c16fba9d
|
Tmp fix
|
2019-10-11 10:45:49 +03:00 |
|
Виктор Гладких
|
b83efb7cda
|
Fix migrations
|
2019-10-10 15:23:44 +03:00 |
|
Виктор Гладких
|
ab5a66afe2
|
Test change
|
2019-10-10 15:20:13 +03:00 |
|
Виктор Гладких
|
56c0927a52
|
Add country control
|
2019-10-10 14:58: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 |
|
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 |
|
littlewolf
|
ab768311f0
|
Update tables structure
|
2019-10-07 22:23:01 +03:00 |
|
michail
|
511312bb28
|
added transfer.py to partner
|
2019-10-04 16:20:04 +05:00 |
|
michail
|
ad17a2ad7a
|
new relations template
|
2019-10-04 13:18:43 +05: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
|
673acb4bb9
|
Add sort
Move dependencies to model
Add data_type to model
|
2019-10-03 23:19:40 +03:00 |
|
littlewolf
|
cf7184d7ac
|
Switch transfer standard
Add utils
Add -d key
|
2019-10-03 00:29:19 +03:00 |
|
michail
|
223447fc95
|
added model dicts to location/transfer.py
|
2019-10-02 18:11:16 +05:00 |
|
littlewolf
|
59320f4333
|
Add temp transfer options to apps.location
|
2019-10-02 14:23:24 +03:00 |
|
evgeniy-st
|
e42f4d061c
|
refactor address
|
2019-10-01 18:07:04 +03:00 |
|
Kuroshini
|
d71ed0c1de
|
Fix lot/lat x/y mapping && address serialization
|
2019-09-27 19:44:00 +03:00 |
|
evgeniy-st
|
403a60623a
|
Merge branch 'develop' into feature/refactor-establishments
|
2019-09-27 10:05:15 +03:00 |
|
evgeniy-st
|
f18c18110c
|
Refactor some establishment serializer
|
2019-09-25 15:32:45 +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
|
2f61df2c65
|
Add address CRUD tests
|
2019-09-24 16:20:04 +03:00 |
|
evgeniy-st
|
dc4b63d8b2
|
Refactor news
|
2019-09-23 15:35:37 +03:00 |
|
Dmitriy Kuzmenko
|
2164e30aef
|
chnage image field to image_url in establishments
|
2019-09-19 17:18:08 +03:00 |
|
Dmitriy Kuzmenko
|
20fe40010c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-18 11:41:43 +03:00 |
|
Dmitriy Kuzmenko
|
e9bf129f82
|
add api locations for back office
|
2019-09-18 11:39:46 +03:00 |
|
evgeniy-st
|
6e4e1b214d
|
Merge branch 'develop' into feature/elasticsearch-establishment-address
|
2019-09-17 17:34:22 +03:00 |
|
evgeniy-st
|
e67d7767a1
|
Elasticsearch: establishment address. Filter by country_id, country_code
|
2019-09-17 17:33:07 +03:00 |
|
Dmitriy Kuzmenko
|
c3717ecfd9
|
merge transportation
|
2019-09-17 17:16:35 +03:00 |
|
Anatoly
|
27a1998dbc
|
GM-73: Логика похожих ресторанов
|
2019-09-17 15:36:33 +03:00 |
|