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 |
|
Anatoly
|
4a38bec2a7
|
added migrations and added migration wine colors
|
2019-11-01 16:48:49 +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 |
|
a.feteleu
|
e9b0d0f91b
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-01 15:57:13 +03:00 |
|
a.feteleu
|
a36e05d96f
|
added csrf trust origins
|
2019-11-01 15:56:51 +03:00 |
|
e.stoyushko
|
8970a1ebc7
|
Merge branch 'feature/chosen_tags_groups_by_country' into 'develop'
Added filtering chosen tags by country
See merge request gm/gm-backend!75
|
2019-11-01 12:54:24 +00: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 |
|
d.kuzmenko
|
a06c499d5a
|
Merge branch 'feature/collect' into 'develop'
Feature/collect
See merge request gm/gm-backend!90
|
2019-11-01 11:41:37 +00:00 |
|
Anatoly
|
e6f9e388aa
|
intermediate commit
|
2019-11-01 14:38:29 +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 |
|
Anatoly
|
d1113364a9
|
intermediate commit
|
2019-11-01 14:09:54 +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 |
|
Dmitriy Kuzmenko
|
11f091c069
|
fix develop settings
|
2019-11-01 12:36:53 +03:00 |
|
Dmitriy Kuzmenko
|
8d8cd09d64
|
fix develop settings
|
2019-11-01 12:32:48 +03:00 |
|
Dmitriy Kuzmenko
|
e4c9d8f9bc
|
fix develop settings
|
2019-11-01 12:30:07 +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 |
|
Anatoly
|
78a8a5d699
|
intermediate commit
|
2019-11-01 11:53:32 +03:00 |
|
evgeniy-st
|
04afd4d913
|
update country time_format and __str__ method
|
2019-11-01 11:34:48 +03:00 |
|
Anatoly
|
6f8361cb83
|
Merge branch 'develop' into features/migrate-wine
|
2019-11-01 11:16:06 +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 |
|