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 |
|
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 |
|
Kuroshini
|
f884d8303f
|
carousel news item creation fix
|
2019-12-19 17:20:51 +03:00 |
|
Kuroshini
|
794ac84838
|
must of the week logic
|
2019-12-19 17:04:56 +03:00 |
|
Kuroshini
|
bfd8044b47
|
remove must_of_the_week field
|
2019-12-19 16:48:50 +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 |
|
Kuroshini
|
6924452569
|
fix news image binding
|
2019-12-19 15:12:49 +03:00 |
|
Kuroshini
|
f070ed8175
|
BO title is nullable now
|
2019-12-19 14:54:21 +03:00 |
|
alex
|
4ce01e5740
|
rm code field from city serializer
|
2019-12-19 13:08:26 +03:00 |
|
Kuroshini
|
67597c4fd4
|
Completely remove news start field
|
2019-12-18 19:21:35 +03:00 |
|
Kuroshini
|
6de33d82b0
|
news publication date & time are separate now
|
2019-12-18 18:58:55 +03:00 |
|
dormantman
|
62bee3156c
|
Added description to update booking method
(cherry picked from commit a947eb1)
|
2019-12-18 18:40:05 +03:00 |
|
alex
|
4b563989a1
|
country_code in determine-location
|
2019-12-18 17:46:42 +03:00 |
|
dormantman
|
b6f0616e8e
|
Added booking swagger description
(cherry picked from commit 794dd73)
|
2019-12-18 16:25:17 +03:00 |
|
alex
|
80dce51db2
|
country filter in region and country_code in cities
|
2019-12-18 15:55:05 +03:00 |
|
Anatoly
|
0851a9e6d6
|
added filter values in guide views
|
2019-12-18 15:19:04 +03:00 |
|
Kuroshini
|
3876a6b885
|
Revert "news creation extra kwargs possible fix"
This reverts commit b9a652a
|
2019-12-18 15:03:31 +03:00 |
|
Kuroshini
|
b9a652aeb6
|
news creation extra kwargs possible fix
|
2019-12-18 15:02:19 +03:00 |
|
Kuroshini
|
44c2616efe
|
must of the week is compulsory argument for news creation now
|
2019-12-18 14:59:20 +03:00 |
|
Kuroshini
|
a8003dc1cc
|
fix issue with news creation
|
2019-12-18 14:56:47 +03:00 |
|
Kuroshini
|
2a0d153be5
|
remove filtering news by locale
|
2019-12-18 14:52:49 +03:00 |
|
alex
|
ffa8409032
|
fix establishment description
|
2019-12-18 12:43:18 +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
|
53387886cd
|
must of the week
|
2019-12-17 23:13:57 +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 |
|
Kuroshini
|
23299ad4a1
|
news active logic depended on activated descriptions #3
|
2019-12-17 20:06:31 +03:00 |
|
Kuroshini
|
b9f65a3b18
|
news active logic depended on activated descriptions #2
|
2019-12-17 20:03:11 +03:00 |
|
Kuroshini
|
b469770ff0
|
news active logic depended on activated descriptions
|
2019-12-17 20:01:36 +03:00 |
|
Kuroshini
|
f0585b3ebc
|
fix carousel slugs
|
2019-12-17 18:37:51 +03:00 |
|
Kuroshini
|
41f6b8c930
|
return copied from model after duplication
|
2019-12-17 18:11:32 +03:00 |
|
Виктор Гладких
|
eaefae399d
|
Fix est_type.id
|
2019-12-17 17:52:54 +03:00 |
|
Виктор Гладких
|
1d8b707c3c
|
Fix est_type.id
|
2019-12-17 17:51:56 +03:00 |
|
Kuroshini
|
4da8465c85
|
Merge branch 'feature/news-description-active' into develop
|
2019-12-17 17:34:46 +03:00 |
|
Kuroshini
|
22aefc2f83
|
description is_active logic
|
2019-12-17 17:34:20 +03:00 |
|
Anatoly
|
5032906483
|
revision collection view
|
2019-12-17 17:17:48 +03:00 |
|
evgeniy-st
|
8a7b583154
|
added country_name to endpoint 'determine-location'
|
2019-12-17 16:49:56 +03:00 |
|
Kuroshini
|
900846951e
|
localized description
|
2019-12-17 16:09:03 +03:00 |
|
Kuroshini
|
2863a338e1
|
translated fields work out
|
2019-12-17 16:09:03 +03:00 |
|
Anatoly
|
5d69f2a5e7
|
Merge branch 'develop' into feature/guides
|
2019-12-17 15:21:27 +03:00 |
|
Anatoly
|
387e164510
|
merged from develop, added merge migration and refactored a little bit
|
2019-12-17 15:20:55 +03:00 |
|
alex
|
d29a46c1a5
|
news by_locale
|
2019-12-17 15:13:16 +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 |
|
Kuroshini
|
7608fcb527
|
fix #2
|
2019-12-17 14:22:08 +03:00 |
|
Kuroshini
|
89f8fcf73e
|
fix
|
2019-12-17 14:20:21 +03:00 |
|
Kuroshini
|
f36713ab02
|
description to locale is required now
|
2019-12-17 14:14:21 +03:00 |
|
Kuroshini
|
73f0dd13a5
|
duplicates fix
|
2019-12-17 14:00:52 +03:00 |
|
Anatoly
|
dbbb526902
|
Refactored mechanism to find similar objects. Added endpoints to product app.
|
2019-12-17 13:02:46 +03:00 |
|
alex
|
6a987532ba
|
fix recipe duplicates
|
2019-12-17 11:54:50 +03:00 |
|
alex
|
1c00cc7eae
|
fix news transfer
|
2019-12-17 09:24:17 +03:00 |
|
alex
|
959eb33043
|
Merge remote-tracking branch 'origin/develop' into recipe
|
2019-12-17 08:56:09 +03:00 |
|
Kuroshini
|
b34ab11fd8
|
description news availability management from BO
|
2019-12-16 23:48:55 +03:00 |
|
Kuroshini
|
0a25ec3e7c
|
news duplication info
|
2019-12-16 23:16:19 +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 |
|
Олег Хаятов
|
1ce8686368
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!179
|
2019-12-16 19:10:33 +00:00 |
|
dormantman
|
b09d3af35f
|
Hardcode collection description migrate
|
2019-12-16 22:00:42 +03:00 |
|
littlewolf
|
181e9599e4
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-16 20:36:31 +03:00 |
|
littlewolf
|
385b405937
|
Tmp remove signal to location
|
2019-12-16 20:35:53 +03:00 |
|
Kuroshini
|
e68142bf2e
|
BO news list by country
|
2019-12-16 18:43:15 +03:00 |
|
Anatoly
|
f861aa419c
|
refactored transfer location serializers
|
2019-12-16 17:47:01 +03:00 |
|
Kuroshini
|
b25f387c9b
|
news search
|
2019-12-16 17:29:01 +03:00 |
|
Kuroshini
|
f4fff47d68
|
return news object after binding #2
|
2019-12-16 17:04:52 +03:00 |
|
Kuroshini
|
cf001b3aab
|
return news object after binding
|
2019-12-16 17:02:45 +03:00 |
|
alex
|
6c483dd228
|
recipe transfer
|
2019-12-16 17:02:20 +03:00 |
|
dormantman
|
fb05243281
|
Change related_object field
|
2019-12-16 16:55:11 +03:00 |
|
littlewolf
|
4c27ad5d5a
|
Fix location address transfer
|
2019-12-16 15:37:29 +03:00 |
|
Kuroshini
|
586f6e373b
|
Anatoly, dont erase working code during refactoring pls
|
2019-12-16 15:30:05 +03:00 |
|
littlewolf
|
f542403b96
|
Fix country
|
2019-12-16 14:48:55 +03:00 |
|
littlewolf
|
1841da0097
|
Fix ruby cities
Fix transfer order
|
2019-12-16 14:48:55 +03:00 |
|
dormantman
|
33ac0ad3e6
|
Delete useless import
|
2019-12-16 14:03:44 +03:00 |
|
Олег Хаятов
|
23522eb1f0
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!178
|
2019-12-16 11:02:27 +00:00 |
|
dormantman
|
c2a520b518
|
Reformat code style
|
2019-12-16 13:59:04 +03:00 |
|
Anatoly
|
956aae281f
|
refactored fix duplicates
|
2019-12-16 13:46:52 +03:00 |
|
dormantman
|
a9f5a5b98f
|
Deleted description field
|
2019-12-16 13:34:54 +03:00 |
|
dormantman
|
def1372317
|
Change ordering format
|
2019-12-16 01:02:21 +03:00 |
|
dormantman
|
b847de1183
|
Added collection migration
|
2019-12-16 01:01:56 +03:00 |
|
Kuroshini
|
a120ea1f1b
|
fix search for products
|
2019-12-13 22:05:16 +03:00 |
|
dormantman
|
4eff488369
|
Added description field
|
2019-12-13 21:39:09 +03:00 |
|
Kuroshini
|
c5056224e0
|
sort filters
|
2019-12-13 21:19:15 +03:00 |
|
dormantman
|
525658f39b
|
Reformat ordering
|
2019-12-13 18:32:06 +03:00 |
|
littlewolf
|
ade2d03402
|
Fix ruby_data
|
2019-12-13 17:16:10 +03:00 |
|
Kuroshini
|
f7e4effb9f
|
dynamic filters
|
2019-12-13 16:48:59 +03:00 |
|
dormantman
|
8f6dd7e5c1
|
Added related_object_ids
|
2019-12-13 16:17:35 +03:00 |
|
Dmitriy Kuzmenko
|
6e72c7c0e4
|
merge with debelop
|
2019-12-13 15:47:05 +03:00 |
|
Kuroshini
|
9fbb8f01de
|
dynamic filters
|
2019-12-13 14:57:24 +03:00 |
|
Dmitriy Kuzmenko
|
295518fd12
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-13 13:24:16 +03:00 |
|
Dmitriy Kuzmenko
|
ae15a5e66b
|
fix migration
|
2019-12-13 13:24:04 +03:00 |
|
Kuroshini
|
54db050f03
|
return tags_id__in
|
2019-12-13 13:23:49 +03:00 |
|
Anatoly
|
86257153ac
|
refactored guide ad label photos
|
2019-12-13 12:21:31 +03:00 |
|
littlewolf
|
eb514c0ce2
|
Add clean db setup
|
2019-12-13 12:16:02 +03:00 |
|
Dmitriy Kuzmenko
|
8aa2cb71f3
|
fix migrations
|
2019-12-13 12:08:24 +03:00 |
|
Dmitriy Kuzmenko
|
4c872b936b
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/account/urls/back.py
# apps/account/views/back.py
# apps/transfer/models.py
|
2019-12-13 11:17:12 +03:00 |
|
Dmitriy Kuzmenko
|
f6427e732a
|
Merge remote-tracking branch 'origin/develop' into owner_list
# Conflicts:
# apps/transfer/models.py
|
2019-12-13 11:08:18 +03:00 |
|
Dmitriy Kuzmenko
|
bd6f8a47a1
|
add api for establishment admin
|
2019-12-13 11:02:37 +03:00 |
|
littlewolf
|
6ef0e7adfe
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-13 09:18:44 +03:00 |
|
dormantman
|
5c171c644c
|
Added mixins
|
2019-12-13 03:52:52 +03:00 |
|
dormantman
|
450ca4cf52
|
Added new field rank to collection
|
2019-12-13 03:50:12 +03:00 |
|
Kuroshini
|
0193ca90e3
|
dynamic filters
|
2019-12-12 22:07:07 +03:00 |
|
Kuroshini
|
38f2211982
|
sum fixes for mobile filters
|
2019-12-12 19:05:47 +03:00 |
|
Kuroshini
|
16def7df5d
|
search crunches for mobiles
|
2019-12-12 18:22:52 +03:00 |
|
Anatoly
|
e2ec179f69
|
refactored the mechanism for finding similar establishments
|
2019-12-12 18:10:20 +03:00 |
|
Anatoly
|
8ca8c73b4b
|
fix get_ruby_data
|
2019-12-12 17:15:08 +03:00 |
|
Kuroshini
|
b58d54c07e
|
smallfix
|
2019-12-12 17:06:37 +03:00 |
|
alex
|
731b45ff53
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-12 16:58:29 +03:00 |
|
alex
|
f565285abd
|
back menu filter by establishment
|
2019-12-12 16:58:13 +03:00 |
|
Kuroshini
|
fcf3999d3d
|
news duplication date
|
2019-12-12 16:51:55 +03:00 |
|
Kuroshini
|
bd3dd47742
|
slugs news
|
2019-12-12 16:27:40 +03:00 |
|
Kuroshini
|
22408bf21f
|
Merge branch 'feature/news-doubles' into develop
|
2019-12-12 16:10:02 +03:00 |
|
Kuroshini
|
755f007d25
|
clone news API method
|
2019-12-12 16:09:43 +03:00 |
|
Dmitriy Kuzmenko
|
826abd9142
|
Merge branch 'sql_panel' into develop
|
2019-12-12 15:39:12 +03:00 |
|
Dmitriy Kuzmenko
|
b03cd4fe09
|
add transfer command, models and crud api.
|
2019-12-12 15:37:42 +03:00 |
|
alex
|
3e83bdff59
|
pagination & ordering & country code
|
2019-12-12 15:34:36 +03:00 |
|
Anatoly
|
5fe8273379
|
fix incorrect removal of uniqueness constraint code field
|
2019-12-12 12:48:20 +03:00 |
|
Anatoly
|
ea2eb666d4
|
fix incorrect removal of uniqueness constraint code field
|
2019-12-12 12:40:07 +03:00 |
|
Anatoly
|
28bf782731
|
update method to remove city duplicates
|
2019-12-12 11:17:59 +03:00 |
|
Anatoly
|
3dfd674aa4
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-12 10:51:03 +03:00 |
|
alex
|
e3d41ecd8d
|
Merge remote-tracking branch 'origin/develop' into es_product
|
2019-12-12 09:35:28 +03:00 |
|
Kuroshini
|
9d2b7ff77c
|
add migration
|
2019-12-11 19:18:04 +03:00 |
|
Kuroshini
|
60f6c8d811
|
fix migrations
|
2019-12-11 19:15:19 +03:00 |
|
Kuroshini
|
370f9cc7ce
|
remove wrong migration
|
2019-12-11 18:26:29 +03:00 |
|
Kuroshini
|
56501d76f2
|
order images
|
2019-12-11 18:20:53 +03:00 |
|
Dmitriy Kuzmenko
|
86b2e708f0
|
add datamigrate and change for models
|
2019-12-11 18:12:26 +03:00 |
|
Dmitriy Kuzmenko
|
d2f011417a
|
add datamigrate and change for models
|
2019-12-11 18:11:39 +03:00 |
|
dormantman
|
e0a66f300b
|
Hide unnecessary fields
|
2019-12-11 18:07:04 +03:00 |
|
dormantman
|
a6b77e74b5
|
Remove unnecessary slash
|
2019-12-11 17:59:42 +03:00 |
|
dormantman
|
6cbfc38c9c
|
Added back collections method for collection detail
|
2019-12-11 17:58:39 +03:00 |
|
Kuroshini
|
90f75c6da5
|
update news gallery
|
2019-12-11 17:54:53 +03:00 |
|
alex
|
bbb72dabbe
|
Merge remote-tracking branch 'origin/develop' into es_product
|
2019-12-11 17:10:56 +03:00 |
|
Kuroshini
|
f182ec4981
|
remove wrong unique constraint
|
2019-12-11 17:07:29 +03:00 |
|
Kuroshini
|
df00ceaa02
|
Merge branch 'feature/reformat-filter-requests' into develop
|
2019-12-11 16:47:15 +03:00 |
|
dormantman
|
0b1b960108
|
Remove excess output
|
2019-12-11 16:27:52 +03:00 |
|
dormantman
|
9f27b0c5d9
|
Added different types
|
2019-12-11 16:27:18 +03:00 |
|
dormantman
|
d8e3ad0bb5
|
Added works_at_weekday
|
2019-12-11 16:26:43 +03:00 |
|
dormantman
|
f0709fa409
|
Fixed tag filter type
|
2019-12-11 16:22:30 +03:00 |
|
d.kuzmenko
|
b68e98e9aa
|
Merge branch 'feature/add-accounts-csv' into 'develop'
Feature/add accounts csv
See merge request gm/gm-backend!177
|
2019-12-11 13:19:50 +00:00 |
|
d.kuzmenko
|
f55983a46f
|
Merge branch 'feature/add-city-search' into 'develop'
Add endpoint to get all cities with search string
See merge request gm/gm-backend!174
|
2019-12-11 13:18:58 +00:00 |
|
Kuroshini
|
39c8f6d152
|
remove carousel hardcode
|
2019-12-11 15:47:08 +03:00 |
|
Kuroshini
|
165509bc64
|
update news_gallery model
|
2019-12-11 15:13:06 +03:00 |
|
Anatoly
|
1b7c83899a
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-11 15:01:17 +03:00 |
|
Kuroshini
|
822b18e2f4
|
create new image after crop
|
2019-12-11 14:58:31 +03:00 |
|
Kuroshini
|
6b3ee76b80
|
Merge branch 'feature/reformat-filter-requests' into develop
|
2019-12-11 13:23:41 +03:00 |
|
dormantman
|
19c42ab1d7
|
Added page types
|
2019-12-11 13:03:31 +03:00 |
|
Anatoly
|
fb5a9d4302
|
refactored ads
|
2019-12-11 12:26:32 +03:00 |
|
Kuroshini
|
907a9365e1
|
fix multislug news update
|
2019-12-11 12:14:23 +03:00 |
|
littlewolf
|
a254160f43
|
Add account csv endpoint
|
2019-12-11 12:10:26 +03:00 |
|
alex
|
ca2ac15cdb
|
fix product type
|
2019-12-11 10:23:59 +03:00 |
|
Виктор Гладких
|
b48cd4a81c
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-11 09:28:25 +03:00 |
|
alex
|
41659958f7
|
product establishment_detail address
|
2019-12-11 09:10:49 +03:00 |
|
alex
|
b5e1344b38
|
Merge remote-tracking branch 'origin/develop' into es_product
|
2019-12-11 07:56:57 +03:00 |
|
Kuroshini
|
043fcb262b
|
fix test #2
|
2019-12-10 23:30:07 +03:00 |
|
Kuroshini
|
ecef1a217a
|
fix some test
|
2019-12-10 22:10:37 +03:00 |
|
Kuroshini
|
377d8196dc
|
fix slugs serialization
|
2019-12-10 20:58:08 +03:00 |
|
Kuroshini
|
401abc568c
|
news unique slug creation
|
2019-12-10 20:04:23 +03:00 |
|
Kuroshini
|
77af35f543
|
many slugs es news fix
|
2019-12-10 19:33:15 +03:00 |
|
Kuroshini
|
c90f8302ee
|
fix news indexing
|
2019-12-10 19:29:11 +03:00 |
|
dormantman
|
096d5dab18
|
Added tags/filters method
|
2019-12-10 19:24:56 +03:00 |
|
Kuroshini
|
c1bb7c9b79
|
News multilang slug (ES)
|
2019-12-10 19:23:40 +03:00 |
|
Kuroshini
|
4010c9fede
|
News multilang slugs (model && views)
|
2019-12-10 19:16:19 +03:00 |
|
Виктор Гладких
|
c32d3e4827
|
permission
|
2019-12-10 18:54:49 +03:00 |
|
Anatoly
|
3bbd76a4f8
|
added endpoints
|
2019-12-10 18:50:12 +03:00 |
|
Виктор Гладких
|
e3cf808e3d
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-10 18:37:36 +03:00 |
|
Виктор Гладких
|
0a8db7e3ad
|
permission
|
2019-12-10 18:36:18 +03:00 |
|
Anatoly
|
7d40471084
|
intermediate commit
|
2019-12-10 17:44:29 +03:00 |
|
littlewolf
|
68aafe75c0
|
Fix
|
2019-12-10 17:41:13 +03:00 |
|
littlewolf
|
47cb7f8e63
|
Tmp commit
|
2019-12-10 17:09:43 +03:00 |
|
Anatoly
|
ab82d9a2d6
|
refactoring guide and collection endpoints
|
2019-12-10 16:24:37 +03:00 |
|
Kuroshini
|
34173afb05
|
fix field analyzer
|
2019-12-10 15:41:33 +03:00 |
|
Kuroshini
|
3b85e927a1
|
BO title field
|
2019-12-10 15:39:53 +03:00 |
|
Kuroshini
|
bec4e9be96
|
ordering from center for mobiles
|
2019-12-10 15:34:51 +03:00 |
|
dormantman
|
4ec812d617
|
Created new category_test url
|
2019-12-10 14:27:16 +03:00 |
|
Anatoly
|
aea5c9e96b
|
Merge branch 'develop' into feature/similar-wines
|
2019-12-10 13:11:40 +03:00 |
|
Anatoly
|
51da45b00b
|
refactoring
|
2019-12-10 13:08:28 +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 |
|
Anatoly
|
439fb17778
|
Merge branch 'develop' into feature/similar-wines
|
2019-12-10 12:46:44 +03:00 |
|
Kuroshini
|
ce5e5f6cb7
|
fix issue w/ tag_category
|
2019-12-10 12:42:42 +03:00 |
|
Виктор Гладких
|
6b8fdf7eed
|
Add migrate for product models
|
2019-12-10 10:45:35 +03:00 |
|
alex
|
0647dd45f8
|
fix get_translated_value by type obj
|
2019-12-10 10:25:10 +03:00 |
|
littlewolf
|
323c2628e0
|
Add endpoint to get all cities with search string
|
2019-12-10 10:17:58 +03:00 |
|
alex
|
32e6e20c6b
|
fix get method
|
2019-12-10 10:15:04 +03:00 |
|
alex
|
96f3175827
|
fix get_name_translated
|
2019-12-10 09:45:35 +03:00 |
|
alex
|
ed18d1c44d
|
forgotten migrations
|
2019-12-10 09:24:32 +03:00 |
|
littlewolf
|
814807c564
|
Fix update_city_info
|
2019-12-09 21:15:55 +03:00 |
|
Kuroshini
|
a2395b807e
|
User locale & city reading
|
2019-12-09 20:42:47 +03:00 |
|
Kuroshini
|
7910c98c8a
|
add wine_origins
|
2019-12-09 18:20:32 +03:00 |
|
Dmitriy Kuzmenko
|
9d557e4ce8
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-09 17:47:51 +03:00 |
|
Dmitriy Kuzmenko
|
6af7a7da5b
|
add footer migrations and api
|
2019-12-09 17:47:37 +03:00 |
|
Kuroshini
|
be793eed73
|
fix issue w/ tags binding
|
2019-12-09 17:40:05 +03:00 |
|