alex
|
e3d7618c62
|
preview_image to establishment and product type and subtype
|
2019-12-27 09:47:48 +03:00 |
|
Dmitriy Kuzmenko
|
6e35713772
|
add merge migrations
|
2019-12-23 17:07:49 +03:00 |
|
d.kuzmenko
|
6a68042178
|
Merge branch 'feature/permission_liquor' into 'develop'
Feature/permission liquor
See merge request gm/gm-backend!175
|
2019-12-23 13:40:13 +00:00 |
|
Anatoly
|
2fb338bc59
|
refactored method to get similar list on entities (see todo: establishment/models.py)
|
2019-12-23 12:59:47 +03:00 |
|
Anatoly
|
cc7125b468
|
added image url to es
|
2019-12-23 09:19:16 +03:00 |
|
Kuroshini
|
660c8e791b
|
tags translation
|
2019-12-20 19:08:53 +03:00 |
|
Anatoly
|
72e5d723db
|
added default image for type/subtype
|
2019-12-20 17:27:04 +03:00 |
|
Anatoly
|
471239983e
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/views/back.py
# apps/transfer/models.py
|
2019-12-17 14:47:26 +03:00 |
|
Виктор Гладких
|
41670729d5
|
Fix
|
2019-12-17 14:29:20 +03:00 |
|
Виктор Гладких
|
458370d4c9
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-17 14:24:15 +03:00 |
|
Anatoly
|
dbbb526902
|
Refactored mechanism to find similar objects. Added endpoints to product app.
|
2019-12-17 13:02:46 +03:00 |
|
Dmitriy Kuzmenko
|
b03cd4fe09
|
add transfer command, models and crud api.
|
2019-12-12 15:37:42 +03:00 |
|
alex
|
41659958f7
|
product establishment_detail address
|
2019-12-11 09:10:49 +03:00 |
|
Виктор Гладких
|
c32d3e4827
|
permission
|
2019-12-10 18:54:49 +03:00 |
|
Виктор Гладких
|
0a8db7e3ad
|
permission
|
2019-12-10 18:36:18 +03:00 |
|
Anatoly
|
7d40471084
|
intermediate commit
|
2019-12-10 17:44:29 +03:00 |
|
Виктор Гладких
|
d441e69b81
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-10 12:51:30 +03:00 |
|
Виктор Гладких
|
3aa1ca98e0
|
Add test post
|
2019-12-10 12:50:38 +03:00 |
|
Виктор Гладких
|
0132a03852
|
Develop rules
|
2019-12-10 12:49:59 +03:00 |
|
Виктор Гладких
|
6b8fdf7eed
|
Add migrate for product models
|
2019-12-10 10:45:35 +03:00 |
|
Kuroshini
|
7910c98c8a
|
add wine_origins
|
2019-12-09 18:20:32 +03:00 |
|
Kuroshini
|
a6728e3148
|
wine_origins for favorites establishments
|
2019-12-09 16:59:40 +03:00 |
|
Dmitriy Kuzmenko
|
3e0fad2139
|
add merge of migrations
|
2019-12-09 12:14:55 +03:00 |
|
Dmitriy Kuzmenko
|
f6cb62c49c
|
Merge branch 'develop' into fix/check_tags
|
2019-12-09 12:06:37 +03:00 |
|
Anatoly
|
f1fa8a58de
|
small refactoring
|
2019-12-06 17:37:33 +03:00 |
|
Kuroshini
|
6a9356aaa6
|
fix merge conflicts
|
2019-12-06 15:10:48 +03:00 |
|
dormantman
|
0c5140d359
|
Added current product exclude
|
2019-12-06 15:03:18 +03:00 |
|
dormantman
|
1372538acf
|
Merge branch 'fix/dublicate-products' of /home/dormantman/PycharmProjects/gm-backend with conflicts.
|
2019-12-06 14:36:20 +03:00 |
|
alex
|
e08296c52d
|
address to product detail web api
|
2019-12-06 14:12:26 +03:00 |
|
Dmitriy Kuzmenko
|
73c66c7357
|
add_publick_mark
|
2019-12-05 17:19:38 +03:00 |
|
Anatoly
|
1d9ee76a5c
|
fix es for establishments
|
2019-12-05 09:43:55 +03:00 |
|
Anatoly
|
29ff10fb4b
|
added wine origins
|
2019-12-04 20:13:09 +03:00 |
|
evgeniy-st
|
04d6412f39
|
Merge branch 'develop' into feature/in_favorites
|
2019-11-21 18:18:09 +03:00 |
|
evgeniy-st
|
35b6a66c85
|
In favorites
|
2019-11-21 18:12:52 +03:00 |
|
alex
|
86e29173ba
|
transfer partner
|
2019-11-21 16:45:27 +03:00 |
|
Виктор Гладких
|
26b8dcd082
|
Check serial number command
|
2019-11-21 15:26:43 +03:00 |
|
Виктор Гладких
|
5236bca874
|
Check serial number command
|
2019-11-21 15:22:43 +03:00 |
|
Виктор Гладких
|
a2087213a4
|
Check serial number command
|
2019-11-21 15:22:22 +03:00 |
|
Виктор Гладких
|
9a2f7fec39
|
fix
|
2019-11-21 14:33:27 +03:00 |
|
Виктор Гладких
|
938b9436eb
|
Fix name def
|
2019-11-21 13:25:31 +03:00 |
|
Виктор Гладких
|
1687e80492
|
Check serial number for product
|
2019-11-21 13:13:19 +03:00 |
|
Anatoly
|
e303e15f32
|
added two characteristics to wine detail serializer
|
2019-11-21 10:28:17 +03:00 |
|
Anatoly
|
617552841f
|
refactored product, fix transfer and etc., see changelist
|
2019-11-21 09:58:43 +03:00 |
|
Dmitriy Kuzmenko
|
74c1b7069a
|
fix product tags
|
2019-11-21 00:23:17 +03:00 |
|
d.kuzmenko
|
62d7f13f80
|
Merge branch 'fix/tags_many' into 'develop'
Fix/tags many
See merge request gm/gm-backend!143
|
2019-11-20 12:43:05 +00:00 |
|
Виктор Гладких
|
5a55fa82a2
|
Codestyle
|
2019-11-20 15:32:36 +03:00 |
|
Виктор Гладких
|
c570cfdadd
|
Fix
|
2019-11-20 15:29:03 +03:00 |
|
Anatoly
|
ef1af8c3ac
|
added city gallery
|
2019-11-20 13:27:26 +03:00 |
|
Anatoly
|
d3faacba3b
|
fix product view mixins
|
2019-11-20 12:41:43 +03:00 |
|
Anatoly
|
1a1a2a2d24
|
added bo endpoints for establishment notes
|
2019-11-20 09:43:45 +03:00 |
|