Commit Graph

72 Commits

Author SHA1 Message Date
Anatoly
65e7c965e4 added migrations 2019-10-28 12:46:10 +03:00
Anatoly
d12df5c8e1 added WineAppellation model 2019-10-28 12:33:48 +03:00
Anatoly
e41b539ed7 added wine region 2019-10-27 18:42:51 +03:00
Виктор Гладких
fb770f8e2a Fix merge 2019-10-25 15:56:02 +03:00
Виктор Гладких
b7831b9739 Fix IsContentPageManager 2019-10-25 15:25:35 +03:00
Виктор Гладких
7f4b46dbf8 Fix country admin 2019-10-25 12:42:01 +03:00
Dmitriy Kuzmenko
72713badff remove print from tests 2019-10-25 11:04:40 +03:00
Kuroshini
d5609e4cb8 Works now filter first part 2019-10-23 17:29:00 +03:00
evgeniy-st
0c8959f4e7 Merge branch 'develop' into feature/gm-148 2019-10-22 17:11:22 +03:00
Semyon Yekhmenin
939e4a26a0 Feature/cities by country 2019-10-22 13:00:22 +00:00
evgeniy-st
6c195bc185 Merge branch 'develop' into feature/gm-148 2019-10-21 20:26:31 +03:00
Виктор Гладких
23b46e69ed Fix test location 2019-10-21 16:28:32 +03:00
Виктор Гладких
196d335213 Fix 2019-10-21 15:47:06 +03:00
Виктор Гладких
f65af6f7cf Merge branch 'feature/GM-176_standard_user' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/GM-176_standard_user 2019-10-21 15:44:54 +03:00
Виктор Гладких
4f02fef456 Fix migrate 2019-10-21 15:44:20 +03:00
Виктор Гладких
ee93cf9ff6 Fix migrate 2019-10-21 15:15:19 +03:00
Виктор Гладких
f338906736 Fix location tests 2019-10-21 11:44:47 +03:00
Виктор Гладких
c8b3f922e9 Fix location tests 2019-10-21 11:08:30 +03:00
Виктор Гладких
5772558c4b Fix 2019-10-18 16:04:21 +03:00
Виктор Гладких
7a4005ec21 Merge branch 'develop' into feature/GM-176_standard_user 2019-10-18 14:54:37 +03:00
Kuroshini
b77c654c6c Open now filter 2019-10-18 02:38:59 +03:00
Semyon Yekhmenin
1ff571b767 Feature/mobile features 2019-10-17 13:29:29 +00:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +03:00
Виктор Гладких
275c5b467c fixa 2019-10-14 18:15:17 +03:00
Виктор Гладких
8d2d5b87ac Fix migrate SQL 2019-10-14 17:56:51 +03:00
Виктор Гладких
01a32f66e8 Fix location migrate sql 2019-10-14 17:38:37 +03:00
Виктор Гладких
1f44777a15 Fix 2019-10-11 17:04:55 +03:00
Виктор Гладких
e9ad418976 Revert migrate location 2019-10-11 16:57:59 +03:00
Виктор Гладких
f441896d6a Migrate data 2019-10-11 16:00:23 +03:00
Виктор Гладких
a6c56a4bf1 Fix and refactor 2019-10-11 14:49:32 +03:00
Виктор Гладких
b83efb7cda Fix migrations 2019-10-10 15:23:44 +03:00
Виктор Гладких
ab5a66afe2 Test change 2019-10-10 15:20:13 +03:00
Виктор Гладких
56c0927a52 Add country control 2019-10-10 14:58:19 +03:00
evgeniy-st
e42f4d061c refactor address 2019-10-01 18:07:04 +03:00
Kuroshini
d71ed0c1de Fix lot/lat x/y mapping && address serialization 2019-09-27 19:44:00 +03:00
evgeniy-st
403a60623a Merge branch 'develop' into feature/refactor-establishments 2019-09-27 10:05:15 +03:00
evgeniy-st
f18c18110c Refactor some establishment serializer 2019-09-25 15:32:45 +03:00
littlewolf
2261875d3c Fix tests 2019-09-24 21:36:59 +03:00
littlewolf
c50bdc8637 Add city tests 2019-09-24 21:34:21 +03:00
littlewolf
7455d2c856 Add region tests 2019-09-24 21:30:59 +03:00
littlewolf
6b3558e3ac Add country tests 2019-09-24 21:28:11 +03:00
littlewolf
d62cee341c Add address tests 2019-09-24 21:03:50 +03:00
littlewolf
2f61df2c65 Add address CRUD tests 2019-09-24 16:20:04 +03:00
evgeniy-st
dc4b63d8b2 Refactor news 2019-09-23 15:35:37 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Dmitriy Kuzmenko
20fe40010c Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-09-18 11:41:43 +03:00
Dmitriy Kuzmenko
e9bf129f82 add api locations for back office 2019-09-18 11:39:46 +03:00
evgeniy-st
6e4e1b214d Merge branch 'develop' into feature/elasticsearch-establishment-address 2019-09-17 17:34:22 +03:00
evgeniy-st
e67d7767a1 Elasticsearch: establishment address. Filter by country_id, country_code 2019-09-17 17:33:07 +03:00
Dmitriy Kuzmenko
c3717ecfd9 merge transportation 2019-09-17 17:16:35 +03:00