Commit Graph

1581 Commits

Author SHA1 Message Date
littlewolf
48d9ce37f7 Merge branch 'feature/add-city-endpoints' into feature/migrate-city-photos 2019-11-08 14:15:34 +03:00
e.stoyushko
43956d4d49 Merge branch 'feature/back_region_list_without_pagination' into 'develop'
Removed pagination from back regions list view

See merge request gm/gm-backend!109
2019-11-08 10:54:50 +00: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
littlewolf
6a66867cb8 Fix country serializer in city 2019-11-08 10:49:45 +03:00
littlewolf
4cbb8ed291 Add city info migration 2019-11-08 10:25:21 +03:00
littlewolf
ec07ba74da Add migrations 2019-11-08 09:51:30 +03:00
littlewolf
1c8e08fab1 Fix location city gallery 2019-11-08 01:50:55 +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
littlewolf
086b26e6d9 Add endpoints to gallery 2019-11-07 15:35:06 +03:00
littlewolf
03fc4a6c56 Add city gallery list view 2019-11-07 14:07:19 +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
littlewolf
22ac3d3046 add gallery relation 2019-11-07 11:49:59 +03:00
littlewolf
0b68cb3420 Add gallery relation to location.city 2019-11-07 11:49:10 +03:00
Anatoly
0b4282bd2f disable session authentication class 2019-11-07 10:55:46 +03:00
littlewolf
99e2f30499 Merge branch 'develop' into feature/add-city-endpoints 2019-11-07 10:44:54 +03:00
littlewolf
0463afdecb Add fields and migration to location.city 2019-11-07 10:43:08 +03:00
Anatoly
ba2b3303bb delete unused attributes (social auth) 2019-11-07 10:17:36 +03:00
littlewolf
0058a3bdd4 Add skip_signal to utils 2019-11-06 23:13:57 +03:00
littlewolf
57d22bedcb Add gallery
Add name_translated
Add migrations
2019-11-06 22:56:41 +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
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