Commit Graph

1445 Commits

Author SHA1 Message Date
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
Виктор Гладких
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
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
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
be464c3651 Fix db 2019-11-01 08:12:07 +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
a.feteleu
76288a4524 Merge branch 'feature/tag-index-name' into 'develop'
Feature/tag index name

See merge request gm/gm-backend!87
2019-10-31 16:03:54 +00: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