Dmitriy Kuzmenko
|
d7c7880860
|
add counter for public_mark and change Guid serializer
|
2019-12-25 15:19:43 +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 |
|
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
|
2fb338bc59
|
refactored method to get similar list on entities (see todo: establishment/models.py)
|
2019-12-23 12:59:47 +03:00 |
|
Anatoly
|
7452f0bef0
|
intermediate commit
|
2019-12-23 12:38:13 +03:00 |
|
alex
|
f6dac3cbcd
|
fix news test
|
2019-12-23 12:33:31 +03:00 |
|
alex
|
7525e6ceef
|
Merge branch 'nes_transfer' into develop
|
2019-12-23 11:55:05 +03:00 |
|
alex
|
17fdc7705e
|
news transfer fin
|
2019-12-23 11:53:34 +03:00 |
|
Anatoly
|
a6bcbdddc1
|
fix es image url
|
2019-12-23 09:44:29 +03:00 |
|
Anatoly
|
cc7125b468
|
added image url to es
|
2019-12-23 09:19:16 +03:00 |
|
alex
|
56b2b243da
|
Merge remote-tracking branch 'origin/develop' into nes_transfer
|
2019-12-23 08:28:28 +03:00 |
|
Dmitriy Kuzmenko
|
f565e188f1
|
Merge branch 'panels' into develop
|
2019-12-22 20:34:29 +03:00 |
|
Dmitriy Kuzmenko
|
f010c97433
|
add export for panel
|
2019-12-22 20:33:51 +03:00 |
|
Kuroshini
|
1247b4c577
|
indexing working time
|
2019-12-20 22:28:57 +03:00 |
|
Kuroshini
|
d97972a3ef
|
fix tags indexing (final)
|
2019-12-20 22:07:19 +03:00 |
|
Kuroshini
|
35673f9ad0
|
fix tags indexing #2
|
2019-12-20 21:59:49 +03:00 |
|
Kuroshini
|
1771b02afd
|
fix tags indexing
|
2019-12-20 21:57:46 +03:00 |
|
Kuroshini
|
0f0a3f9577
|
hardcoded tags
|
2019-12-20 21:10:28 +03:00 |
|
Kuroshini
|
ee8d133248
|
Example for tags creation
|
2019-12-20 20:11:58 +03:00 |
|
Kuroshini
|
dd07769b9b
|
remove label fields from tags
|
2019-12-20 19:25:14 +03:00 |
|
Kuroshini
|
660c8e791b
|
tags translation
|
2019-12-20 19:08:53 +03:00 |
|
Kuroshini
|
d1699e001e
|
tag models translations in interface dictionary
|
2019-12-20 18:01:52 +03:00 |
|
Anatoly
|
72e5d723db
|
added default image for type/subtype
|
2019-12-20 17:27:04 +03:00 |
|
Олег Хаятов
|
5afd0884ee
|
Merge branch 'feature/collection-object-types' into 'develop'
Feature/collection object types
See merge request gm/gm-backend!184
|
2019-12-20 14:02:54 +00: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 |
|
alex
|
2499c0406d
|
news transfer serializer
|
2019-12-20 16:19:04 +03:00 |
|
Kuroshini
|
0993f0a451
|
Revert "Fix collections back url"
This reverts commit dbc928a
|
2019-12-20 16:04:23 +03:00 |
|
Олег Хаятов
|
796914fbe6
|
Merge branch 'fix/collections-url' into 'develop'
Fix collections back url
See merge request gm/gm-backend!182
|
2019-12-20 12:41:25 +00:00 |
|
dormantman
|
dbc928a2f5
|
Fix collections back url
|
2019-12-20 15:35:17 +03:00 |
|
Kuroshini
|
8e20424b78
|
bo creation & modification news info
|
2019-12-20 14:32:09 +03:00 |
|
littlewolf
|
769a71b5eb
|
Fix
|
2019-12-20 13:52:20 +03:00 |
|
littlewolf
|
80759c24e7
|
Fix number
|
2019-12-20 13:19:56 +03:00 |
|
littlewolf
|
aa7ebf4d4c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-20 13:04:30 +03:00 |
|
littlewolf
|
2b8e158954
|
Merge branch 'feature/add-accounts-csv' into develop
|
2019-12-20 13:04:04 +03:00 |
|
littlewolf
|
7a5897e0bb
|
Add slash
Add docs
|
2019-12-20 13:02:28 +03:00 |
|
Anatoly
|
35b7846ca1
|
refactored methods for getting similar establishments
|
2019-12-20 12:57:48 +03:00 |
|
Anatoly
|
821526d631
|
remove incorrect check for establishment, set schedule attr property as blank=True, refactored timetable model
|
2019-12-20 12:36:11 +03:00 |
|
Anatoly
|
36834835cd
|
added filters to location views
|
2019-12-20 11:05:02 +03:00 |
|
Dmitriy Kuzmenko
|
71fb3249b0
|
add chenge to panel admin
|
2019-12-20 10:02:59 +03:00 |
|
Dmitriy Kuzmenko
|
93c9daf6c4
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-20 10:01:33 +03:00 |
|
Dmitriy Kuzmenko
|
f69d7d6e71
|
add chenge to panel admin
|
2019-12-20 10:01:22 +03:00 |
|
Anatoly
|
f87d891daa
|
fix transfer
|
2019-12-20 09:26:45 +03:00 |
|
Kuroshini
|
2b117ba0f5
|
fix typo
|
2019-12-20 01:23:21 +03:00 |
|
Dmitriy Kuzmenko
|
847412bb2f
|
Merge branch 'develop' into panels
# Conflicts:
# apps/main/admin.py
|
2019-12-19 19:09:49 +03:00 |
|
Dmitriy Kuzmenko
|
a1f06fd0b9
|
panels executor
|
2019-12-19 19:07:23 +03:00 |
|
Anatoly
|
05f5261668
|
fix transfer
|
2019-12-19 18:46:11 +03:00 |
|
Anatoly
|
021d608bdc
|
Merge branch 'develop' into feature/guides
|
2019-12-19 18:18:39 +03:00 |
|
Kuroshini
|
bf4538b68a
|
show only published products
|
2019-12-19 17:48:34 +03:00 |
|
Kuroshini
|
de648454c7
|
news to carousel
|
2019-12-19 17:30:02 +03:00 |
|