Commit Graph

1445 Commits

Author SHA1 Message Date
Виктор Гладких
251d29c461 Add image url 2019-11-08 11:29:45 +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
d.kuzmenko
19d23668e1 Merge branch 'feature/region_name_resolving' into 'develop'
Feature/region name resolving

See merge request gm/gm-backend!55
2019-11-07 09:55:20 +00: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
0b4282bd2f disable session authentication class 2019-11-07 10:55:46 +03: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
Dmitriy Kuzmenko
82d238c123 fiz settings 2019-11-06 15:25:59 +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
e.stoyushko
a485fc1c7f Merge branch 'feature/nearest_establishments_fix' into 'develop'
Fixed nearest establishments search

See merge request gm/gm-backend!106
2019-11-06 11:35:43 +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
d.kuzmenko
35f0d966ea Merge branch 'feature/changed-email-notification' into 'develop'
Feature/changed email notification

See merge request gm/gm-backend!103
2019-11-06 07:49:32 +00: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
effacc2192 News email pictures 2019-11-05 20:29:15 +03:00
Kuroshini
88fa3421de Fix news email template 2019-11-05 19:22:31 +03:00
Kuroshini
be48bff5ae Send confirmation to new email 2019-11-05 18:56:11 +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