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 |
|