Anatoly
|
0f2d1ca071
|
need checks
|
2019-11-08 19:46:16 +03:00 |
|
Dmitriy Kuzmenko
|
3d83c2a3aa
|
Merge branch 'feature/account_migrate' into develop
|
2019-11-08 17:04:11 +03:00 |
|
Виктор Гладких
|
b8d9a1344b
|
Add hash password
|
2019-11-08 16:31:43 +03:00 |
|
Semyon Yekhmenin
|
d9e14194c3
|
Removed pagination from back regions list view
|
2019-11-08 10:54:50 +00:00 |
|
alex
|
c7537079d4
|
mark to float
|
2019-11-08 12:28:18 +03:00 |
|
alex
|
79a65ab179
|
fix ads
|
2019-11-08 12:26:51 +03:00 |
|
Виктор Гладких
|
be0412ffae
|
Fix url
|
2019-11-08 11:42:40 +03:00 |
|
Виктор Гладких
|
251d29c461
|
Add image url
|
2019-11-08 11:29:45 +03:00 |
|
Anatoly
|
9bdeabe352
|
added tags
|
2019-11-07 19:03:12 +03:00 |
|
alex
|
117604f060
|
models
|
2019-11-07 18:35:01 +03:00 |
|
Kuroshini
|
bf301d21bb
|
Fix tests
|
2019-11-07 18:25:04 +03:00 |
|
Kuroshini
|
c1f89515c5
|
Nested sitefeatures for new design
|
2019-11-07 18:08:29 +03:00 |
|
Виктор Гладких
|
1c8737a798
|
Merge branch 'develop' into feature/account_migrate
|
2019-11-07 17:05:06 +03:00 |
|
evgeniy-st
|
4573233e45
|
fix
|
2019-11-07 17:04:26 +03:00 |
|
Виктор Гладких
|
37ba1a1c39
|
Edit help message
|
2019-11-07 17:03:14 +03:00 |
|
evgeniy-st
|
497451cb3e
|
Added tags to Establishment back-office serializers
|
2019-11-07 17:01:27 +03:00 |
|
Виктор Гладких
|
ba6d18d202
|
Fix account migration
|
2019-11-07 17:01:26 +03:00 |
|
Semyon Yekhmenin
|
475c29ee9e
|
Added function for getting subdivision by ISO 3166-1 alpha-2 country code and ISO 3166-2 subdivision code without country prefix
|
2019-11-07 09:55:20 +00:00 |
|
e.stoyushko
|
d8ccf0f567
|
Merge branch 'bugfix/fix-signup-validators' into 'develop'
Bugfix/fix signup validators
See merge request gm/gm-backend!107
|
2019-11-07 08:58:33 +00:00 |
|
Anatoly
|
ba2b3303bb
|
delete unused attributes (social auth)
|
2019-11-07 10:17:36 +03:00 |
|
Kuroshini
|
952e259fa9
|
Fix validators #2
|
2019-11-06 19:51:53 +03:00 |
|
Anatoly
|
442e4fb2ce
|
refactored social auth
|
2019-11-06 18:50:42 +03:00 |
|
Anatoly
|
3b7bef463f
|
refactored social auth
|
2019-11-06 16:11:26 +03:00 |
|
evgeniy-st
|
164f860cc0
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-06 16:02:37 +03:00 |
|
evgeniy-st
|
e21a8bb550
|
Added country serializer to AddressDetailSerializer
|
2019-11-06 16:02:12 +03:00 |
|
Anatoly
|
0aa0378ae0
|
intermediate commit
|
2019-11-06 15:35:47 +03:00 |
|
alex
|
9b16f46215
|
migrate identities
|
2019-11-06 15:12:33 +03:00 |
|
e.stoyushko
|
a466168d61
|
Merge branch 'bugfix/fix-signup-validators' into 'develop'
Fix validators
See merge request gm/gm-backend!105
|
2019-11-06 11:37:56 +00:00 |
|
Semyon Yekhmenin
|
d717b09153
|
Fixed nearest establishments search
|
2019-11-06 11:35:43 +00:00 |
|
alex
|
a372d29677
|
refactor comment migration
|
2019-11-06 14:24:14 +03:00 |
|
evgeniy-st
|
c17f9ce820
|
Remove name_translated from establishment. Added AddressDetailSerializer
to EstablishmentRUDView
|
2019-11-06 14:16:10 +03:00 |
|
Kuroshini
|
e8dcaeaa9a
|
Fix validators
|
2019-11-06 13:41:37 +03:00 |
|
Dmitriy Kuzmenko
|
edaf9f8fdb
|
add migrations
|
2019-11-06 12:22:16 +03:00 |
|
d.kuzmenko
|
b5789a1a5e
|
Merge branch 'feature/affilations/award_type' into 'develop'
Feature/affilations/award type
See merge request gm/gm-backend!104
|
2019-11-06 09:00:51 +00:00 |
|
Виктор Гладких
|
e04c621a3d
|
Fix message
|
2019-11-06 11:50:42 +03:00 |
|
d.kuzmenko
|
8fca3916f9
|
Merge branch 'feature/affiliations' into 'develop'
Feature/affiliations
See merge request gm/gm-backend!102
|
2019-11-06 08:46:43 +00:00 |
|
Виктор Гладких
|
390ff974d7
|
Fix message
|
2019-11-06 11:41:19 +03:00 |
|
Виктор Гладких
|
0ab60c1852
|
Add awards
|
2019-11-06 11:40:07 +03:00 |
|
evgeniy-st
|
3299bf9891
|
updated establishment search fields
|
2019-11-06 11:32:55 +03:00 |
|
evgeniy-st
|
eb2b727d0d
|
Merge branch 'develop' into feature/establishmen-index-name
|
2019-11-06 11:27:05 +03:00 |
|
evgeniy-st
|
661f6fb395
|
Added fields to Establishment model: index_name, tranliterated_name
|
2019-11-06 11:25:38 +03:00 |
|
Виктор Гладких
|
3e3d7a21db
|
Add award types
|
2019-11-06 10:23:31 +03:00 |
|
Kuroshini
|
19c7ce4c51
|
Send confirmation to new email #3
|
2019-11-05 21:49:57 +03:00 |
|
Kuroshini
|
3fc14ac0d6
|
New email templates #2
|
2019-11-05 21:39:17 +03:00 |
|
Kuroshini
|
70f86c792b
|
New email templates
|
2019-11-05 21:33:38 +03:00 |
|
Kuroshini
|
be48bff5ae
|
Send confirmation to new email
|
2019-11-05 18:56:11 +03:00 |
|
Anatoly
|
87dacfec7f
|
refactored product app, see changes
|
2019-11-05 18:04:34 +03:00 |
|
alex
|
d853960d2e
|
create, delete, get favorite news
|
2019-11-05 17:52:36 +03:00 |
|
Виктор Гладких
|
545e9a249b
|
Fix help
|
2019-11-05 17:32:18 +03:00 |
|
Виктор Гладких
|
6f4cd56fcd
|
Add establishment employee
|
2019-11-05 17:28:13 +03:00 |
|
d.kuzmenko
|
28471686be
|
Merge branch 'feature/fix-open-noon-afternoon' into 'develop'
Feature/fix open noon afternoon
See merge request gm/gm-backend!101
|
2019-11-05 14:26:24 +00:00 |
|
d.kuzmenko
|
19fb746356
|
Merge branch 'feature/remove-presentation-crunches' into 'develop'
Remove all crunches from projects
See merge request gm/gm-backend!100
|
2019-11-05 14:21:16 +00:00 |
|
Kuroshini
|
a60fb84bcb
|
Use not only closed_at / opening_at
|
2019-11-05 17:07:48 +03:00 |
|
evgeniy-st
|
273478a7cb
|
add address to establishmentRUDSerializer
|
2019-11-05 16:57:07 +03:00 |
|
Виктор Гладких
|
22982f3332
|
Add employee fix
|
2019-11-05 16:33:38 +03:00 |
|
Виктор Гладких
|
ea1ddfa320
|
Add employee
|
2019-11-05 16:29:27 +03:00 |
|
evgeniy-st
|
568ec84da0
|
Added filter class to EstalibshmentListCreateView
|
2019-11-05 16:20:24 +03:00 |
|
evgeniy-st
|
83bab7f383
|
remove hardcoded news
|
2019-11-05 15:59:28 +03:00 |
|
Виктор Гладких
|
e7143f73c3
|
Add positions
|
2019-11-05 14:59:32 +03:00 |
|
Anatoly
|
d46ba31654
|
Merge branch 'develop' into features/migrate-wine
# Conflicts:
# apps/product/models.py
# apps/transfer/management/commands/transfer.py
# apps/transfer/models.py
|
2019-11-05 14:56:26 +03:00 |
|
evgeniy-st
|
346f126dbb
|
Added news filter (by country).
|
2019-11-05 14:48:25 +03:00 |
|
michail
|
06f5a551b8
|
additions for migration of comments
|
2019-11-05 16:45:43 +05:00 |
|
Kuroshini
|
f52847a71a
|
Remove all crunches from projects
|
2019-11-05 14:29:53 +03:00 |
|
Dmitriy Kuzmenko
|
c5e96a7ad8
|
fix retrieve
|
2019-11-04 20:33:35 +03:00 |
|
Kuroshini
|
9d087b53ee
|
Hardcode for presentation
|
2019-11-04 18:18:46 +03:00 |
|
Dmitriy Kuzmenko
|
2b3ded6858
|
fix carusel
|
2019-11-04 16:15:29 +03:00 |
|
d.kuzmenko
|
6c0327f1a2
|
Merge branch 'hotfix/news-ids' into 'develop'
Use old ids for demonstration
See merge request gm/gm-backend!99
|
2019-11-04 12:38:17 +00:00 |
|
Kuroshini
|
4dd06f772f
|
Use old ids for demonstration
|
2019-11-04 15:30:59 +03:00 |
|
d.kuzmenko
|
6f0122fe35
|
Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Remove doubles
See merge request gm/gm-backend!98
|
2019-11-04 11:37:17 +00:00 |
|
Kuroshini
|
cf1bb0a88c
|
Remove doubles
|
2019-11-04 14:30:03 +03:00 |
|
d.kuzmenko
|
3abb74d19e
|
Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Temp crunch for chosen tags
See merge request gm/gm-backend!96
|
2019-11-04 08:58:41 +00:00 |
|
Dmitriy Kuzmenko
|
55c24c400b
|
change news tag command
|
2019-11-04 11:49:57 +03:00 |
|
Dmitriy Kuzmenko
|
623a90e6a7
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-04 11:35:25 +03:00 |
|
Dmitriy Kuzmenko
|
888e18b9b1
|
change news tag command
|
2019-11-04 11:35:13 +03:00 |
|
a.feteleu
|
9dc12b36bb
|
added exception detail
|
2019-11-04 11:18:16 +03:00 |
|
Dmitriy Kuzmenko
|
b37b634f59
|
change news tag command
|
2019-11-04 11:09:15 +03:00 |
|
Dmitriy Kuzmenko
|
fb3e5e5c93
|
change add_tags
|
2019-11-04 10:53:16 +03:00 |
|
Dmitriy Kuzmenko
|
b3345d612a
|
renge_menu and carte
|
2019-11-04 02:25:04 +03:00 |
|
Dmitriy Kuzmenko
|
3462c74a65
|
modify add_menus
|
2019-11-04 00:50:37 +03:00 |
|
Dmitriy Kuzmenko
|
db6c93a72f
|
add trensfer menus
|
2019-11-04 00:41:34 +03:00 |
|
Kuroshini
|
b8fe50f806
|
Temp crunch for chosen tags
|
2019-11-03 22:45:44 +03:00 |
|
Dmitriy Kuzmenko
|
9d3e278763
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 20:33:58 +03:00 |
|
Dmitriy Kuzmenko
|
8e61071759
|
add news tag command
|
2019-11-03 20:33:45 +03:00 |
|
a.feteleu
|
d0165df987
|
fix translation
|
2019-11-03 20:31:50 +03:00 |
|
alex
|
8eee337d34
|
fix last published establishment description
|
2019-11-03 19:12:47 +03:00 |
|
Dmitriy Kuzmenko
|
a30f863155
|
fix currency
|
2019-11-03 17:39:10 +03:00 |
|
Dmitriy Kuzmenko
|
f47e2996f4
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 17:13:39 +03:00 |
|
Dmitriy Kuzmenko
|
924b4e68e9
|
fix currency
|
2019-11-03 17:13:27 +03:00 |
|
Anatoly
|
4f89d7603e
|
change translation mechanics
|
2019-11-03 17:00:47 +03:00 |
|
Dmitriy Kuzmenko
|
c50cd7c693
|
add migrations
|
2019-11-03 16:51:17 +03:00 |
|
Dmitriy Kuzmenko
|
02e45593ce
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 16:45:39 +03:00 |
|
Dmitriy Kuzmenko
|
689dca4ea1
|
add migrations
|
2019-11-03 16:45:22 +03:00 |
|
d.kuzmenko
|
902382a82a
|
Merge branch 'feature/chosen_tags-logic' into 'develop'
Feature/chosen tags logic
See merge request gm/gm-backend!93
|
2019-11-03 13:20:51 +00:00 |
|
Dmitriy Kuzmenko
|
2e273e596d
|
add migrations
|
2019-11-03 15:38:00 +03:00 |
|
Dmitriy Kuzmenko
|
c47f659657
|
add fix currency
|
2019-11-03 15:34:53 +03:00 |
|
Dmitriy Kuzmenko
|
b88c0d5213
|
modify script add_currency
|
2019-11-03 15:24:03 +03:00 |
|
Dmitriy Kuzmenko
|
1856589427
|
disabled inline in est, and change currency creator
|
2019-11-03 14:55:08 +03:00 |
|
Dmitriy Kuzmenko
|
398a982c82
|
add fix currency
|
2019-11-03 14:09:07 +03:00 |
|
Dmitriy Kuzmenko
|
791ff3f1c3
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 14:04:03 +03:00 |
|
Dmitriy Kuzmenko
|
1ac3cf95ca
|
add currency
|
2019-11-03 14:03:47 +03:00 |
|
Anatoly
|
10fb4ee0dd
|
small fix
|
2019-11-03 01:40:45 +03:00 |
|
Anatoly
|
201dd40193
|
fixed related news, but in future need refactoring
|
2019-11-03 01:32:46 +03:00 |
|
Dmitriy Kuzmenko
|
248ab103a1
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-03 00:36:31 +03:00 |
|
Dmitriy Kuzmenko
|
c69ef65d79
|
add filter for description
|
2019-11-03 00:36:19 +03:00 |
|
Anatoly
|
c14ab722a1
|
change field parameter in model Guide (gm-241)
|
2019-11-03 00:25:03 +03:00 |
|
Dmitriy Kuzmenko
|
22b4b94f1b
|
add filter for description
|
2019-11-03 00:11:08 +03:00 |
|
alex
|
9da10acd8e
|
fix none value establishment description
|
2019-11-02 22:52:20 +03:00 |
|
alex
|
cc2c475b4e
|
add_establishment_description with elastic error
|
2019-11-02 22:45:57 +03:00 |
|
Dmitriy Kuzmenko
|
f3899f5cb8
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-02 19:19:10 +03:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Anatoly
|
5d43e2fd5b
|
refactor models
|
2019-10-31 18:44:30 +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 |
|
Anatoly
|
dd38e6e5de
|
refactor models
|
2019-10-31 17:53:37 +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 |
|
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 |
|
Kuroshini
|
261d70af53
|
Use another GO endpoint
|
2019-10-30 18:28:27 +03:00 |
|
Виктор Гладких
|
c1c9f99fb5
|
Add product migrate data
|
2019-10-30 18:04:30 +03:00 |
|
Виктор Гладких
|
f6151c0a14
|
delete okd_models from product
|
2019-10-30 17:24:40 +03:00 |
|
Виктор Гладких
|
b74b87d78d
|
Add products model in transfer
|
2019-10-30 17:23:45 +03:00 |
|
alex
|
b5d1715063
|
Merge remote-tracking branch 'origin/migration_fix' into migration_fix
|
2019-10-30 15:54:50 +03:00 |
|
alex
|
4343060c74
|
Merge branch 'migration_fix' into HEAD
|
2019-10-30 15:49:32 +03:00 |
|
alex
|
8c3306628e
|
news transfer
|
2019-10-30 15:48:32 +03:00 |
|
Kuroshini
|
d4792cb342
|
Geo subtypes
|
2019-10-30 14:34:07 +03:00 |
|
Anatoly
|
6fcfb263d3
|
fix ProductModelAdmin
|
2019-10-30 14:23:40 +03:00 |
|
Kuroshini
|
42c596b592
|
Weekday for mobile devices
|
2019-10-30 14:19:03 +03:00 |
|
alex
|
c521839389
|
news refactor
|
2019-10-30 13:53:12 +03:00 |
|
littlewolf
|
a67df32086
|
Fix establishment_mark
|
2019-10-30 12:55:44 +03:00 |
|
littlewolf
|
f690ad3b8f
|
Fix key
|
2019-10-30 12:48:04 +03:00 |
|
littlewolf
|
37c3a43932
|
Mv reviews to mention command
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
86e0699c8c
|
Add reviews transfer
Add language transfer
Fix comment transfer
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
c564f4fd67
|
Fix rewiewers
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
9310bff319
|
Add comment serializer
|
2019-10-30 12:31:38 +03:00 |
|
evgeniy-st
|
7805a63055
|
remove establishment document filtering by country code
|
2019-10-30 12:15:40 +03:00 |
|
evgeniy-st
|
00bcd6c205
|
added merge migrations
|
2019-10-30 11:59:19 +03:00 |
|
evgeniy-st
|
e371fdceea
|
Merge branch 'develop' into migration_fix
|
2019-10-30 11:50:30 +03:00 |
|
e.stoyushko
|
c9edaaa654
|
Merge branch 'feature/geo-type-index-name' into 'develop'
Feature/geo type index name
See merge request gm/gm-backend!84
|
2019-10-30 07:31:50 +00:00 |
|
alex
|
e524483ed0
|
fix ass_publish_data
|
2019-10-30 08:03:30 +03:00 |
|
alex
|
a0c52d8ef9
|
Merge remote-tracking branch 'origin/origin/migration_fix' into migration_fix
|
2019-10-29 21:57:07 +03:00 |
|
Dmitriy Kuzmenko
|
a3bf921771
|
fix timezone
|
2019-10-29 21:54:59 +03:00 |
|