a.gorbunov
|
1d3cf9dac0
|
select related before load
|
2020-01-27 06:41:52 +00:00 |
|
a.gorbunov
|
bb8accefbf
|
optimize fix
|
2020-01-20 10:25:09 +00:00 |
|
Anatoly
|
754b6d5b4f
|
fix collection guides
|
2020-01-17 10:02:49 +03:00 |
|
Kuroshini
|
127d15b181
|
try to fix performance issues
(cherry picked from commit 964ead1)
|
2020-01-16 12:14:04 +03:00 |
|
a.gorbunov
|
c110dc3b96
|
optimize collection images
|
2020-01-14 18:18:17 +03:00 |
|
Anatoly
|
b457ffe975
|
small changes
|
2020-01-09 14:59:29 +03:00 |
|
Anatoly
|
d3c723eb43
|
intermediate commit
|
2019-12-30 19:07:06 +03:00 |
|
Anatoly
|
1468e5cdde
|
intermediate commit
|
2019-12-30 18:15:55 +03:00 |
|
Anatoly
|
2827374911
|
intermediate commit
|
2019-12-30 13:22:57 +03:00 |
|
Dmitriy Kuzmenko
|
e2d71fca8f
|
Merge branch 'develop' into feature/guides
|
2019-12-27 18:00:20 +03:00 |
|
Dmitriy Kuzmenko
|
ccd9f717df
|
Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
# apps/utils/export.py
|
2019-12-27 17:59:20 +03:00 |
|
Dmitriy Kuzmenko
|
d09776c8fa
|
add xml
|
2019-12-27 17:57:16 +03:00 |
|
Anatoly
|
151c017561
|
see changes
|
2019-12-27 17:49:56 +03:00 |
|
Anatoly
|
f42f571053
|
see changes
|
2019-12-27 15:59:15 +03:00 |
|
Anatoly
|
b41c185a65
|
see changes
|
2019-12-27 14:46:36 +03:00 |
|
Dmitriy Kuzmenko
|
02d0112d8b
|
add export for guides
|
2019-12-26 18:11:48 +03:00 |
|
alex
|
396921fa75
|
fix GM-318
|
2019-12-26 16:02:17 +03:00 |
|
Anatoly
|
1189b6ff58
|
see changes
|
2019-12-26 10:24:08 +03:00 |
|
Anatoly
|
986936fdf5
|
Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
# apps/collection/views/back.py
|
2019-12-25 22:15:22 +03:00 |
|
Anatoly
|
d9df886b98
|
added guide type field, added tasks, refactored GuideElement model, added endpoint,
|
2019-12-25 22:14:35 +03:00 |
|
Dmitriy Kuzmenko
|
d7c7880860
|
add counter for public_mark and change Guid serializer
|
2019-12-25 15:19:43 +03:00 |
|
Anatoly
|
65746b1cd0
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/models.py
|
2019-12-24 12:33:39 +03:00 |
|
Anatoly
|
d9e45702ec
|
merge
|
2019-12-24 12:24:13 +03:00 |
|
Anatoly
|
db5c879459
|
refactored method to get similar list on entities (see todo: establishment/models.py)
|
2019-12-23 17:53:48 +03:00 |
|
Dmitriy Kuzmenko
|
63304aa2d1
|
add merge migrations
|
2019-12-23 17:16:33 +03:00 |
|
Dmitriy Kuzmenko
|
2580b9f218
|
Merge branch 'develop' into feature/collection-slugs
# Conflicts:
# requirements/base.txt
|
2019-12-23 16:57:24 +03:00 |
|
Ruslan Stepanov
|
8efd4e3c77
|
Fix slugify
|
2019-12-23 13:20:46 +00:00 |
|
Anatoly
|
f576825a71
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/models.py
# apps/establishment/models.py
# apps/establishment/views/web.py
# apps/product/views/common.py
# requirements/base.txt
|
2019-12-23 13:11:05 +03:00 |
|
Anatoly
|
7452f0bef0
|
intermediate commit
|
2019-12-23 12:38:13 +03:00 |
|
Anatoly
|
cc7125b468
|
added image url to es
|
2019-12-23 09:19:16 +03:00 |
|
dormantman
|
2ca31cedfb
|
Added none condition to response
|
2019-12-20 16:59:14 +03:00 |
|
dormantman
|
0420fafabf
|
Added types to collection objects
|
2019-12-20 16:52:25 +03:00 |
|
Anatoly
|
f87d891daa
|
fix transfer
|
2019-12-20 09:26:45 +03:00 |
|
Anatoly
|
05f5261668
|
fix transfer
|
2019-12-19 18:46:11 +03:00 |
|
Anatoly
|
5a6af6a2a7
|
refactored a little bit
|
2019-12-19 16:39:42 +03:00 |
|
Anatoly
|
68b8aa427c
|
added counters
|
2019-12-19 16:27:58 +03:00 |
|
Anatoly
|
0851a9e6d6
|
added filter values in guide views
|
2019-12-18 15:19:04 +03:00 |
|
Anatoly
|
2401763e6c
|
Merge branch 'develop' into feature/guides
|
2019-12-18 12:03:45 +03:00 |
|
Anatoly
|
54eee9565c
|
fix guide element label photo
|
2019-12-18 12:02:39 +03:00 |
|
Kuroshini
|
1131b02891
|
add collection migration & fix serializer according to the task
|
2019-12-17 21:53:42 +03:00 |
|
dormantman
|
c5bfdb9cde
|
Added some params
|
2019-12-17 21:49:46 +03:00 |
|
dormantman
|
5a18be4584
|
Added slugify to create collection
|
2019-12-17 21:49:46 +03:00 |
|
Anatoly
|
5032906483
|
revision collection view
|
2019-12-17 17:17:48 +03:00 |
|
Anatoly
|
387e164510
|
merged from develop, added merge migration and refactored a little bit
|
2019-12-17 15:20:55 +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 |
|
Олег Хаятов
|
c456e43f80
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!180
|
2019-12-16 19:41:59 +00:00 |
|
dormantman
|
04bada1cd1
|
Fixed object names
|
2019-12-16 22:32:38 +03:00 |
|
Kuroshini
|
913da37b84
|
return collections dsc field
|
2019-12-16 22:26:38 +03:00 |
|
dormantman
|
1545ca9035
|
Added description field
|
2019-12-16 22:26:14 +03:00 |
|
Kuroshini
|
10ca6d8932
|
remove hardcode from migration
|
2019-12-16 22:13:25 +03:00 |
|