dormantman
|
e772663f44
|
Fix subsribtions
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
e33418dfe6
|
Fix unsubscribe
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
8567a818c7
|
Added corrections migrate
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
54d1b7742f
|
Reformat structure
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
8108471c8e
|
Added migrations
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
ec00b3a24f
|
Added correct creating subscribe
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
08f675cdbc
|
Added model Subscribe
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
a8f053a646
|
Added last subscribe/unsubscribe dates
|
2019-12-30 22:44:58 +03:00 |
|
Kuroshini
|
fc215129ed
|
subscriptions work out
|
2019-12-30 22:26:18 +03:00 |
|
dormantman
|
974e0ce8fe
|
Added saving date
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
25e118cf0b
|
Optimize
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
13022ed476
|
Fix subsribtions
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
d9f1da1e49
|
Fix unsubscribe
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
a76efac4a8
|
Added corrections migrate
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
fe330e4270
|
Reformat structure
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
449e0675fa
|
Added migrations
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
7baf022a77
|
Added correct creating subscribe
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
eac841f41f
|
Added model Subscribe
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
fb91383be5
|
Added last subscribe/unsubscribe dates
|
2019-12-30 22:23:16 +03:00 |
|
Anatoly
|
d3c723eb43
|
intermediate commit
|
2019-12-30 19:07:06 +03:00 |
|
Anatoly
|
e56f801e14
|
Merge branch 'develop' into feature/guides
|
2019-12-30 18:16:24 +03:00 |
|
Anatoly
|
1468e5cdde
|
intermediate commit
|
2019-12-30 18:15:55 +03:00 |
|
Kuroshini
|
ad21b6eb24
|
transfer tags with translations
|
2019-12-30 17:31:09 +03:00 |
|
alex
|
ca6a57f012
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-30 16:38:51 +03:00 |
|
alex
|
6b52feffd8
|
fix similar_artisans_producers
|
2019-12-30 16:38:42 +03:00 |
|
Dmitriy Kuzmenko
|
b27e032f15
|
change update index for Establishment
|
2019-12-30 16:36:00 +03:00 |
|
Anatoly
|
cb6834b3c0
|
Merge branch 'develop' into feature/guides
|
2019-12-30 13:23:28 +03:00 |
|
Anatoly
|
2827374911
|
intermediate commit
|
2019-12-30 13:22:57 +03:00 |
|
d.kuzmenko
|
700d8b5286
|
Merge branch 'feature/fix-location-sort' into 'develop'
Add order
See merge request gm/gm-backend!189
|
2019-12-30 07:45:00 +00:00 |
|
a.feteleu
|
8f2ae21aa0
|
fix swagger
|
2019-12-30 10:43:20 +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 |
|
alex
|
dbdeef8642
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-27 17:39:57 +03:00 |
|
alex
|
c9d36ebd1a
|
fix product es
|
2019-12-27 17:39:47 +03:00 |
|
Kuroshini
|
768a01e119
|
return in_favorites flag
|
2019-12-27 17:39:05 +03:00 |
|
d.kuzmenko
|
c32c950260
|
Merge branch 'feature/profile' into 'develop'
Feature/profile
See merge request gm/gm-backend!190
|
2019-12-27 13:57:31 +00:00 |
|
Виктор Гладких
|
4e82d5275a
|
Fix
|
2019-12-27 16:55:01 +03:00 |
|
Kuroshini
|
ea20d6d4c1
|
remove lookups from subtypes
|
2019-12-27 16:52:10 +03:00 |
|
Виктор Гладких
|
ab5bb5c190
|
Merge branch 'develop' into feature/profile
|
2019-12-27 16:35:57 +03:00 |
|
Виктор Гладких
|
660d60e656
|
Lite refactor
|
2019-12-27 16:30:31 +03:00 |
|
Виктор Гладких
|
caa17bf9f4
|
Serialize employee with positions, public_mark and establishment
|
2019-12-27 16:13:22 +03:00 |
|
Anatoly
|
f42f571053
|
see changes
|
2019-12-27 15:59:15 +03:00 |
|
Kuroshini
|
57c7f0dcdf
|
fix ES
|
2019-12-27 15:56:37 +03:00 |
|
Kuroshini
|
57be30fa0e
|
fix es establishments serializer
|
2019-12-27 14:49:35 +03:00 |
|
Anatoly
|
b41c185a65
|
see changes
|
2019-12-27 14:46:36 +03:00 |
|
alex
|
ae486d81fa
|
city filter for establishment
|
2019-12-27 14:32:09 +03:00 |
|
alex
|
32ae1856b6
|
preview_image to establishment and product type and subtype
|
2019-12-27 12:42:45 +03:00 |
|
alex
|
b958e0b597
|
preview_image fix
|
2019-12-27 11:16:38 +03:00 |
|
alex
|
e3d7618c62
|
preview_image to establishment and product type and subtype
|
2019-12-27 09:47:48 +03:00 |
|
Kuroshini
|
8abb582e49
|
fix patch news BO
|
2019-12-26 19:23:28 +03:00 |
|
Kuroshini
|
0da58133fc
|
Fix news patch
|
2019-12-26 18:34:59 +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 |
|
Kuroshini
|
7648e478f5
|
allow city main image changing
|
2019-12-26 15:00:05 +03:00 |
|
littlewolf
|
2651ad1a29
|
Add order
|
2019-12-26 14:19:26 +03:00 |
|
alex
|
668bc92b97
|
fix print
|
2019-12-26 10:45:17 +03:00 |
|
alex
|
0152538333
|
author for review text
|
2019-12-26 10:33:27 +03:00 |
|
Anatoly
|
1189b6ff58
|
see changes
|
2019-12-26 10:24:08 +03:00 |
|
Anatoly
|
cbe03b2f5a
|
Merge branch 'develop' into feature/guides
|
2019-12-25 22:16:48 +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 |
|
Kuroshini
|
ac2dc2344e
|
try to fix issue w/ news elastic update
|
2019-12-25 18:50:59 +03:00 |
|
Kuroshini
|
f3c48281d4
|
back office news reformat
|
2019-12-25 18:09:58 +03:00 |
|
d.kuzmenko
|
61eca800fc
|
Merge branch 'review_users' into 'develop'
Review users
See merge request gm/gm-backend!188
|
2019-12-25 12:54:11 +00:00 |
|
alex
|
d173664750
|
rm comments
|
2019-12-25 15:35:55 +03:00 |
|
Dmitriy Kuzmenko
|
d7c7880860
|
add counter for public_mark and change Guid serializer
|
2019-12-25 15:19:43 +03:00 |
|
Kuroshini
|
cd194b79bd
|
fix artisans chosen tags
|
2019-12-25 14:05:48 +03:00 |
|
Kuroshini
|
432873da31
|
fix main_image for news
(cherry picked from commit 8ca213a)
|
2019-12-25 13:48:32 +03:00 |
|
alex
|
bc0db915be
|
author for review text
|
2019-12-25 09:15:36 +03:00 |
|
alex
|
8a34ef6477
|
Merge remote-tracking branch 'origin/develop' into review_users
|
2019-12-25 09:15:13 +03:00 |
|
littlewolf
|
670da807af
|
Fix fake country flag
|
2019-12-24 14:10:47 +03:00 |
|
alex
|
92e5f7a40b
|
signals for text field
|
2019-12-24 13:40:27 +03:00 |
|
Anatoly
|
65746b1cd0
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/models.py
|
2019-12-24 12:33:39 +03:00 |
|
Anatoly
|
62e12d8570
|
Merge remote-tracking branch 'origin/feature/fix-country-region-city-transfer' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
|
2019-12-24 12:25:42 +03:00 |
|
Anatoly
|
d9e45702ec
|
merge
|
2019-12-24 12:24:13 +03:00 |
|
Anatoly
|
858b6f3544
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/serializers/news.py
# apps/utils/models.py
|
2019-12-24 12:10:16 +03:00 |
|
littlewolf
|
d4c2af9d65
|
Fix country
|
2019-12-24 11:53:46 +03:00 |
|
alex
|
069a2ad2a8
|
review text author model
|
2019-12-24 11:35:20 +03:00 |
|
littlewolf
|
0c2dacb3bf
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/serializers/news.py
# apps/utils/models.py
|
2019-12-24 11:03:08 +03:00 |
|
alex
|
18d6c10120
|
footer links
|
2019-12-24 10:29:48 +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 |
|
Semyon Yekhmenin
|
28331e5274
|
Implemented filtering carousel entries by country code when country code specified and international carousel when not
|
2019-12-23 14:39:45 +00:00 |
|
Dmitriy Kuzmenko
|
63304aa2d1
|
add merge migrations
|
2019-12-23 17:16:33 +03:00 |
|
d.kuzmenko
|
cd7ba1996d
|
Merge branch 'feature/collection-slugs' into 'develop'
Feature/collection slugs
See merge request gm/gm-backend!181
|
2019-12-23 14:09:27 +00:00 |
|
Dmitriy Kuzmenko
|
6e35713772
|
add merge migrations
|
2019-12-23 17:07:49 +03:00 |
|
Dmitriy Kuzmenko
|
2580b9f218
|
Merge branch 'develop' into feature/collection-slugs
# Conflicts:
# requirements/base.txt
|
2019-12-23 16:57:24 +03:00 |
|
d.kuzmenko
|
56ed5432e3
|
Merge branch 'fix/file-upload-size' into 'develop'
Fixed upload size limit
See merge request gm/gm-backend!161
|
2019-12-23 13:50:35 +00:00 |
|
Semyon Yekhmenin
|
3ff7246bea
|
Feature/subscription types
|
2019-12-23 13:50:09 +00:00 |
|
Semyon Yekhmenin
|
9e19a8fc97
|
Feature/news event model update
|
2019-12-23 13:45:47 +00: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 |
|
Ruslan Stepanov
|
8efd4e3c77
|
Fix slugify
|
2019-12-23 13:20:46 +00:00 |
|
alex
|
e4dada0d1d
|
news transfer fix add tags
|
2019-12-23 16:01:47 +03:00 |
|
alex
|
14b8d16e90
|
news transfer fix
|
2019-12-23 15:54:58 +03:00 |
|
alex
|
cbca13093f
|
fix news type
|
2019-12-23 15:43:27 +03:00 |
|
alex
|
1c04703c77
|
fix test and news type
|
2019-12-23 15:39:54 +03:00 |
|
Kuroshini
|
50d0997569
|
Merge remote-tracking branch 'origin/bug/bind-author-news' into develop
|
2019-12-23 15:17:32 +03:00 |
|
dormantman
|
1849166bae
|
Fix author bug
|
2019-12-23 15:12:27 +03:00 |
|
Виктор Гладких
|
31fa1dacce
|
Add qs to SiteFeatures views
|
2019-12-23 14:54:42 +03:00 |
|
Kuroshini
|
61c1f92c2c
|
change serializer for news photo binding
|
2019-12-23 13:56:10 +03:00 |
|
Kuroshini
|
6f9cec2450
|
fix swagger
|
2019-12-23 13:54:10 +03:00 |
|
Kuroshini
|
3b661f24ca
|
fix issues w/ tags
|
2019-12-23 13:51:29 +03:00 |
|
littlewolf
|
56309f2a10
|
Update fake country flag
|
2019-12-23 13:14: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 |
|
dormantman
|
9e7a950088
|
Set code style
|
2019-12-23 12:13:13 +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 |
|
littlewolf
|
215f36eb9b
|
Add unused subregions
|
2019-12-20 19:35:59 +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 |
|
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 |
|
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 |
|
littlewolf
|
3dd76503a5
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/management/commands/transfer.py
|
2019-12-20 11:55:23 +03:00 |
|
littlewolf
|
819e4366f7
|
Fix locatioin
Add decorator to log
|
2019-12-20 11:52:40 +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 |
|