Commit Graph

1247 Commits

Author SHA1 Message Date
Anatoly
0610075706 fixed transfer product with sub type plates 2019-11-11 13:15:37 +03:00
Anatoly
3a1f57e195 refactored product admin page 2019-11-11 12:29:10 +03:00
Anatoly
c67109d9f8 Merge branch 'develop' into features/migrate-wine
# Conflicts:
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/models.py
#	project/settings/base.py
2019-11-11 11:35:03 +03:00
Anatoly
13228ec85a finalizing 2019-11-11 11:33:20 +03:00
Anatoly
8a49a5ee72 added gallery to model product 2019-11-10 16:08:27 +03:00
Anatoly
efb468f00d added migrator, refactored migrators 2019-11-09 22:58:34 +03:00
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
Виктор Гладких
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
Виктор Гладких
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
Виктор Гладких
545e9a249b Fix help 2019-11-05 17:32:18 +03:00
Виктор Гладких
6f4cd56fcd Add establishment employee 2019-11-05 17:28:13 +03:00