alex
|
68182e837c
|
carousel fin
|
2019-11-01 08:41:56 +03:00 |
|
alex
|
4cdcc8988b
|
Merge remote-tracking branch 'origin/develop' into maigrate-carousel
|
2019-11-01 07:39:11 +03:00 |
|
evgeniy-st
|
972e456f20
|
recalculate toque_number for other countries
|
2019-10-31 19:21:06 +03:00 |
|
evgeniy-st
|
47b7a7bde1
|
Merge branch 'feature/recalculate-toque-number' into develop
|
2019-10-31 19:10:25 +03:00 |
|
evgeniy-st
|
6d34e406db
|
recalculate toque number
|
2019-10-31 19:09:57 +03:00 |
|
alex
|
3c88d4f1f5
|
carousel serializer
|
2019-10-31 18:31:15 +03:00 |
|
Kuroshini
|
26e04719c3
|
Index name for tags
|
2019-10-31 17:58:39 +03:00 |
|
alex
|
f237c37840
|
Merge remote-tracking branch 'origin/develop' into maigrate-carousel
|
2019-10-31 17:56:15 +03:00 |
|
alex
|
1946bddad2
|
start carousel
|
2019-10-31 17:55:19 +03:00 |
|
Anatoly
|
fe586755e3
|
small fix
|
2019-10-31 17:54:56 +03:00 |
|
evgeniy-st
|
a44081c2e7
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-31 17:38:07 +03:00 |
|
evgeniy-st
|
b87f21c630
|
update transfer tz field
|
2019-10-31 17:34:59 +03:00 |
|
e.stoyushko
|
4460559541
|
Merge branch 'fix-subquery' into 'develop'
Fix subqueries
See merge request gm/gm-backend!81
|
2019-10-31 14:23:25 +00:00 |
|
alex
|
55e68ec336
|
fix establishment mark
|
2019-10-31 17:19:07 +03:00 |
|
evgeniy-st
|
30a58473c3
|
using a fallback language for translation
|
2019-10-31 16:11:46 +03:00 |
|
e.stoyushko
|
6c8deb5f80
|
Merge branch 'feature/geo-subtypes' into 'develop'
Geo subtypes
See merge request gm/gm-backend!86
|
2019-10-31 11:52:10 +00:00 |
|
evgeniy-st
|
af0768b4cc
|
Merge branch 'develop' into fix-subquery
|
2019-10-31 14:45:22 +03:00 |
|
e.stoyushko
|
2c9d579a54
|
Update models.py
|
2019-10-31 11:42:57 +00:00 |
|
alex
|
0d399cc44e
|
add_establishment_mark command
|
2019-10-31 12:29:40 +03:00 |
|
alex
|
7be3c2b93f
|
add_establishment_description command
|
2019-10-31 12:02:52 +03:00 |
|
Anatoly
|
6fe8252025
|
need refactoring, put temporary solution
TagBaseSerializer
TagCategoryBaseSerializer
|
2019-10-31 11:04:53 +03:00 |
|
littlewolf
|
20785770e1
|
Add transfer_language
|
2019-10-31 10:05:39 +03:00 |
|
littlewolf
|
c8554772f1
|
Fix review published_at
Add old_id
Add description to establishment
|
2019-10-31 10:05:00 +03:00 |
|
alex
|
fea93f50f7
|
fix image_url for establishment
|
2019-10-31 09:40:50 +03:00 |
|
littlewolf
|
d1f1337640
|
Merge branch 'origin/feature/migrate-etablishment' into develop
|
2019-10-31 08:50:59 +03:00 |
|
littlewolf
|
11a1928346
|
Add MultipkleObjects exception
|
2019-10-31 08:49:17 +03:00 |
|
littlewolf
|
f259319ade
|
Fix exception
|
2019-10-31 08:42:52 +03:00 |
|
alex
|
9cdb3cca27
|
rm works_now from elastic
|
2019-10-31 08:17:08 +03:00 |
|
alex
|
ea5140cc9c
|
fix summary field in news
|
2019-10-31 08:11:14 +03:00 |
|
littlewolf
|
08ca1dc356
|
Move addresses to new key
|
2019-10-31 07:47:45 +03:00 |
|
littlewolf
|
c08e202f64
|
Fix db
|
2019-10-31 07:46:29 +03:00 |
|
littlewolf
|
d654b093ef
|
Fix
|
2019-10-31 07:44:53 +03:00 |
|
littlewolf
|
8f18320171
|
Merge branch 'develop' into origin/feature/migrate-etablishment
# Conflicts:
# apps/establishment/transfer_data.py
# apps/transfer/management/commands/transfer.py
|
2019-10-31 07:44:07 +03:00 |
|
littlewolf
|
968ae4246b
|
Fix mark
|
2019-10-31 07:37:09 +03:00 |
|
littlewolf
|
b146e6cd24
|
Add establishment address transfer
|
2019-10-31 07:00:44 +03:00 |
|
a.feteleu
|
a4c9c8f0cc
|
fix tags command
|
2019-10-31 02:16:29 +03:00 |
|
Dmitriy Kuzmenko
|
e653e6c7da
|
fix tag command
|
2019-10-31 00:53:01 +03:00 |
|
alex
|
e74c32f0cb
|
fix summary
|
2019-10-30 23:15:40 +03:00 |
|
alex
|
7e503f617e
|
merge migrations
|
2019-10-30 20:15:19 +03:00 |
|
alex
|
962d24f737
|
Merge branch 'migration_fix' into develop
# Conflicts:
# apps/establishment/admin.py
# apps/transfer/models.py
|
2019-10-30 20:04:02 +03:00 |
|
Anatoly
|
414ad72ed3
|
Revert "modified NewsImageSerializer, in future needs refactoring"
This reverts commit 776b500d
|
2019-10-30 20:01:19 +03:00 |
|
Anatoly
|
776b500d19
|
modified NewsImageSerializer, in future needs refactoring
|
2019-10-30 19:59:12 +03:00 |
|
Dmitriy Kuzmenko
|
048b971e78
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-30 19:51:48 +03:00 |
|
Dmitriy Kuzmenko
|
aa2759d7e0
|
fix estab tags
|
2019-10-30 19:51:33 +03:00 |
|
a.feteleu
|
d31bb9b495
|
merge migrations
|
2019-10-30 19:19:40 +03:00 |
|
Dmitriy Kuzmenko
|
638bafe4a6
|
Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
# apps/establishment/admin.py
# project/settings/base.py
|
2019-10-30 19:12:59 +03:00 |
|
Dmitriy Kuzmenko
|
523e3a1ca0
|
merge work in subtitle
|
2019-10-30 18:59:16 +03:00 |
|
Dmitriy Kuzmenko
|
03ee9c1279
|
Merge remote-tracking branch 'origin/origin/migration_fix' into origin/migration_fix
# Conflicts:
# apps/transfer/serializers/news.py
|
2019-10-30 18:52:56 +03:00 |
|
Dmitriy Kuzmenko
|
58be2491a5
|
create command for establishment tags
|
2019-10-30 18:47:13 +03:00 |
|
Виктор Гладких
|
c1c9f99fb5
|
Add product migrate data
|
2019-10-30 18:04:30 +03:00 |
|