Dmitriy Kuzmenko
|
914450e8c2
|
add translation fix for tag
|
2019-11-02 19:18:58 +03:00 |
|
GladkihViktor
|
9acf2f5c5f
|
Code style
|
2019-11-02 17:58:00 +03:00 |
|
GladkihViktor
|
4d310515ab
|
Merge branch 'develop' into feature/est_transporation
|
2019-11-02 17:55:08 +03:00 |
|
GladkihViktor
|
56b3d0dcc2
|
Update transportation
|
2019-11-02 17:54:24 +03:00 |
|
Dmitriy Kuzmenko
|
7de6043861
|
filter for tag
|
2019-11-02 17:19:59 +03:00 |
|
Dmitriy Kuzmenko
|
f3f06fcf09
|
filter for tag
|
2019-11-02 17:06:13 +03:00 |
|
Kuroshini
|
0f8425f363
|
Tags by category
|
2019-11-02 16:19:48 +03:00 |
|
Kuroshini
|
e69f272a63
|
Fix time format for frontend
|
2019-11-02 15:42:33 +03:00 |
|
GladkihViktor
|
ea830379fc
|
Fix image url
|
2019-11-02 14:31:12 +03:00 |
|
evgeniy-st
|
4f67c295d1
|
Carousel link
|
2019-11-02 12:11:03 +03:00 |
|
evgeniy-st
|
dcea8b2a69
|
small fix
|
2019-11-02 12:05:18 +03:00 |
|
evgeniy-st
|
11d06b7b97
|
update Carousel model_name
|
2019-11-02 12:00:09 +03:00 |
|
Dmitriy Kuzmenko
|
1747f6e95c
|
fix filter old_estab
|
2019-11-02 10:24:24 +03:00 |
|
Dmitriy Kuzmenko
|
20b9b9affd
|
fix filter old_estab
|
2019-11-02 10:11:47 +03:00 |
|
Dmitriy Kuzmenko
|
4059446a3c
|
add filter by exist Establishments
|
2019-11-02 10:04:32 +03:00 |
|
Dmitriy Kuzmenko
|
4108de5931
|
add filter for transfer establishment by fr
|
2019-11-02 09:17:18 +03:00 |
|
Anatoly
|
4e76fc966e
|
added fix link for establishment preview_image
|
2019-11-01 18:43:48 +03:00 |
|
Dmitriy Kuzmenko
|
5928ee1884
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-01 18:21:03 +03:00 |
|
Dmitriy Kuzmenko
|
0d7187e330
|
change get image in carusel
|
2019-11-01 18:20:48 +03:00 |
|
Anatoly
|
fdd5c0bace
|
added fix link for establishment preview_image, run - ./manage.py transfer --fix_establishment_preview_image
|
2019-11-01 18:10:53 +03:00 |
|
Dmitriy Kuzmenko
|
660eb347c5
|
add filter by country for carusel
|
2019-11-01 18:10:12 +03:00 |
|
alex
|
aab76d219f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-01 17:38:09 +03:00 |
|
alex
|
7acc8592a8
|
country for carousel
|
2019-11-01 17:37:53 +03:00 |
|
Dmitriy Kuzmenko
|
effe468777
|
add active to carusel
|
2019-11-01 16:56:37 +03:00 |
|
Виктор Гладких
|
8787a6b944
|
Fix
|
2019-11-01 16:27:09 +03:00 |
|
Виктор Гладких
|
afdc0154c6
|
Fix
|
2019-11-01 16:24:17 +03:00 |
|
Виктор Гладких
|
c51cfc1aa4
|
Fix publish collect
|
2019-11-01 16:18:33 +03:00 |
|
Semyon Yekhmenin
|
d17790dc34
|
Added filtering chosen tags by country
|
2019-11-01 12:54:24 +00:00 |
|
e.stoyushko
|
74aaab0e93
|
Merge branch 'bugfix/booking-subsscriver-fix' into 'develop'
Bugfix/booking subsscriver fix
See merge request gm/gm-backend!92
|
2019-11-01 12:46:44 +00:00 |
|
Kuroshini
|
e3670c051e
|
Fix note mandatory && subscriber creation
|
2019-11-01 15:32:33 +03:00 |
|
Kuroshini
|
2cd69e02cb
|
Fix note mandatory && subscriber creation
|
2019-11-01 15:31:30 +03:00 |
|
d.kuzmenko
|
975063b3f8
|
Merge branch 'feature/collect' into 'develop'
Fix
See merge request gm/gm-backend!91
|
2019-11-01 12:27:19 +00:00 |
|
Виктор Гладких
|
5e65bff2ba
|
Fix
|
2019-11-01 15:19:42 +03:00 |
|
michail
|
f5a9763edf
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-01 17:15:16 +05:00 |
|
evgeniy-st
|
42cd311dc4
|
Carousel is parsed
|
2019-11-01 15:12:35 +03:00 |
|
michail
|
09e0a36313
|
added image url to partner model
|
2019-11-01 17:08:53 +05:00 |
|
evgeniy-st
|
445d76df75
|
boost name and name_translated in es search
|
2019-11-01 14:56:07 +03:00 |
|
Виктор Гладких
|
1df89b6c48
|
Merge branch 'develop' into feature/collect
|
2019-11-01 14:31:30 +03:00 |
|
Виктор Гладких
|
96aad4ff42
|
Fix country code
|
2019-11-01 14:28:01 +03:00 |
|
alex
|
84cefefa0b
|
fix add_establishment_description
|
2019-11-01 14:14:16 +03:00 |
|
evgeniy-st
|
0fc951696c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-01 12:58:15 +03:00 |
|
evgeniy-st
|
0e04b9d044
|
update toque calculating
|
2019-11-01 12:57:57 +03:00 |
|
littlewolf
|
41e48cb0e9
|
Merge branch 'feature/fix-country-transfer' into develop
|
2019-11-01 12:13:11 +03:00 |
|
littlewolf
|
0352615200
|
Fix country_code svg
|
2019-11-01 12:12:51 +03:00 |
|
Anatoly
|
623934438f
|
fixed svg path
|
2019-11-01 12:00:51 +03:00 |
|
evgeniy-st
|
04afd4d913
|
update country time_format and __str__ method
|
2019-11-01 11:34:48 +03:00 |
|
alex
|
383032b2af
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-01 10:48:56 +03:00 |
|
alex
|
b3bd2a7141
|
add_establishment_social command
|
2019-11-01 10:48:46 +03:00 |
|
d.kuzmenko
|
03feb13166
|
Merge branch 'feature/collect' into 'develop'
Feature/collect
See merge request gm/gm-backend!89
|
2019-11-01 07:36:40 +00:00 |
|
e.stoyushko
|
b7b2e7fb25
|
Merge branch 'feature/booking-prepayment' into 'develop'
Booking pre-payment
See merge request gm/gm-backend!80
|
2019-11-01 07:30:14 +00:00 |
|
e.stoyushko
|
7c530bb43b
|
Merge branch 'feature/time-format-for-front' into 'develop'
Time format for country
See merge request gm/gm-backend!88
|
2019-11-01 07:23:49 +00:00 |
|
Виктор Гладких
|
954d515a5a
|
Merge branch 'develop' into feature/collect
|
2019-11-01 10:18:36 +03:00 |
|
Виктор Гладких
|
dbee524a31
|
Add
|
2019-11-01 10:17:12 +03:00 |
|
Виктор Гладких
|
54f2290bbd
|
exit
|
2019-11-01 10:16:05 +03:00 |
|
alex
|
4be8582e7c
|
Merge branch 'maigrate-carousel' into develop
|
2019-11-01 08:44:46 +03:00 |
|
alex
|
68182e837c
|
carousel fin
|
2019-11-01 08:41:56 +03:00 |
|
littlewolf
|
e2e95256d8
|
Merge branch 'feature/fix-country-transfer' into develop
|
2019-11-01 08:11:30 +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 |
|
Kuroshini
|
a8861238ac
|
Time format for country
|
2019-10-31 19:02:48 +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 |
|
Виктор Гладких
|
1abe280ef7
|
Add unique collection
|
2019-10-31 17:51:23 +03:00 |
|
littlewolf
|
2ae68e60e4
|
Add flag updates with command python manage.py transfer --update_country_flag
|
2019-10-31 17:47:31 +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 |
|
Виктор Гладких
|
7b4837f4f3
|
Add
|
2019-10-31 17:04:25 +03:00 |
|
Виктор Гладких
|
989e80ece6
|
First
|
2019-10-31 16:57:12 +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 |
|