Anatoly
|
29ff10fb4b
|
added wine origins
|
2019-12-04 20:13:09 +03:00 |
|
Anatoly
|
0fb28467fb
|
updated serializer
|
2019-11-29 13:26:05 +03:00 |
|
Виктор Гладких
|
43fc16f841
|
Fix country test
|
2019-11-25 12:29:53 +03:00 |
|
Anatoly
|
3f164459a7
|
added transfer for filling city gallery
|
2019-11-21 12:37:13 +03:00 |
|
Anatoly
|
617552841f
|
refactored product, fix transfer and etc., see changelist
|
2019-11-21 09:58:43 +03:00 |
|
Kuroshini
|
be581c7b7d
|
Dynamic front filters #1
|
2019-11-20 14:15:25 +03:00 |
|
Anatoly
|
ef1af8c3ac
|
added city gallery
|
2019-11-20 13:27:26 +03:00 |
|
a.feteleu
|
d932df4392
|
add unknown migrations from developm server:-(
|
2019-11-20 10:07:23 +03:00 |
|
alex
|
267544a0b1
|
merge for migration
|
2019-11-19 09:48:25 +03:00 |
|
Anatoly
|
0d9d45bcc5
|
added model Product and bo endpoints
|
2019-11-18 17:58:46 +03:00 |
|
alex
|
dc0b4ce107
|
fix collection establishment in_fav
|
2019-11-18 13:12:24 +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 |
|
Dmitriy Kuzmenko
|
141bddc0db
|
add active flag for languages and Countries
|
2019-11-14 22:54:27 +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 |
|
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 |
|
Anatoly
|
efb468f00d
|
added migrator, refactored migrators
|
2019-11-09 22:58:34 +03:00 |
|
Semyon Yekhmenin
|
d9e14194c3
|
Removed pagination from back regions list view
|
2019-11-08 10:54:50 +00:00 |
|
Kuroshini
|
bf301d21bb
|
Fix tests
|
2019-11-07 18:25:04 +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 |
|
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 |
|
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 |
|