littlewolf
|
0db2638eb8
|
Fix country queryset
|
2019-10-27 17:23:04 +03:00 |
|
littlewolf
|
7eb241ffed
|
Tmp commit
|
2019-10-27 12:47:45 +03:00 |
|
littlewolf
|
8bcf4c9ca0
|
Add child regions
|
2019-10-26 09:35:09 +03:00 |
|
littlewolf
|
cd724de65f
|
Move countries to dictionaries
|
2019-10-26 09:19:34 +03:00 |
|
littlewolf
|
06b12f9427
|
Add country transfer
|
2019-10-26 09:18:45 +03:00 |
|
littlewolf
|
e72e92244b
|
Update country serializer
|
2019-10-26 08:42:00 +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 |
|
littlewolf
|
abe8eae655
|
Tmp
|
2019-10-25 12:27:38 +03:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +03:00 |
|
littlewolf
|
95b5d4ad99
|
Merge branch 'develop' into migrate-location-app
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-25 09:54:03 +03:00 |
|
littlewolf
|
c61d5321a9
|
Tmp commit
|
2019-10-25 09:52:35 +03:00 |
|
littlewolf
|
106ddb044e
|
Add country transfer
|
2019-10-25 07:48:29 +03:00 |
|
Kuroshini
|
d5609e4cb8
|
Works now filter first part
|
2019-10-23 17:29:00 +03:00 |
|
littlewolf
|
fed2aae7f1
|
Fix settings/base
Add transfer_data to location
|
2019-10-23 09:30:36 +03:00 |
|
littlewolf
|
f09bd5996a
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# project/settings/base.py
# requirements/base.txt
|
2019-10-23 09:27:42 +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 |
|
michail
|
54cfccbcbe
|
the fix of types fields in all apps
|
2019-10-15 13:23:31 +05: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 |
|
michail
|
a223832241
|
Relational integers to ForeignKey
|
2019-10-14 15:48:26 +05: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 |
|
michail
|
51b63335d7
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-11 15:41:32 +05:00 |
|
michail
|
7bcd2edab6
|
Added transfer.py into timetable.
Edited transfer.py for collection and location.
|
2019-10-11 15:41:09 +05:00 |
|
littlewolf
|
f5c16fba9d
|
Tmp fix
|
2019-10-11 10:45:49 +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 |
|
littlewolf
|
22d2396c6b
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# docker-compose.yml
# project/settings/base.py
|
2019-10-09 07:54:15 +03:00 |
|
littlewolf
|
e8c48e99c6
|
Add key to transfer
Add queryset to transfer
Add models and fields get to transfer
|
2019-10-09 07:49:44 +03:00 |
|
michail
|
03b22d79db
|
edited Address in location/transfer.py
|
2019-10-08 14:01:40 +05:00 |
|
michail
|
bc7d4ef5a5
|
comment location/transfer.py
|
2019-10-08 12:24:57 +05:00 |
|
littlewolf
|
ab768311f0
|
Update tables structure
|
2019-10-07 22:23:01 +03:00 |
|
michail
|
511312bb28
|
added transfer.py to partner
|
2019-10-04 16:20:04 +05:00 |
|
michail
|
ad17a2ad7a
|
new relations template
|
2019-10-04 13:18:43 +05:00 |
|
littlewolf
|
4ce0eb284d
|
Update transfer structure in location
|
2019-10-04 08:16:56 +03:00 |
|
littlewolf
|
b581ead8ae
|
Add relation fields
|
2019-10-04 07:50:19 +03:00 |
|
littlewolf
|
673acb4bb9
|
Add sort
Move dependencies to model
Add data_type to model
|
2019-10-03 23:19:40 +03:00 |
|
littlewolf
|
cf7184d7ac
|
Switch transfer standard
Add utils
Add -d key
|
2019-10-03 00:29:19 +03:00 |
|
michail
|
223447fc95
|
added model dicts to location/transfer.py
|
2019-10-02 18:11:16 +05:00 |
|
littlewolf
|
59320f4333
|
Add temp transfer options to apps.location
|
2019-10-02 14:23:24 +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 |
|
Anatoly
|
27a1998dbc
|
GM-73: Логика похожих ресторанов
|
2019-09-17 15:36:33 +03:00 |
|
evgeniy-st
|
d094f055d2
|
fix counties endpoint
|
2019-09-04 11:21:31 +03:00 |
|
evgeniy-st
|
537735d193
|
sites endpoint
|
2019-09-04 10:35:37 +03:00 |
|
evgeniy-st
|
aa88721800
|
sites endpoint
|
2019-09-04 10:14:11 +03:00 |
|
Dmitriy Kuzmenko
|
fc4facbf83
|
add contacts for establishments
|
2019-09-01 12:35:09 +03:00 |
|
evgeniy-st
|
ba00bf1b00
|
Merge branch 'develop' into feature/establishment
|
2019-08-28 15:35:21 +03:00 |
|
evgeniy-st
|
1aef1a5bb1
|
Translation & establishment
|
2019-08-28 15:21:28 +03:00 |
|
Dmitriy Kuzmenko
|
253da87a99
|
URL refactoring
|
2019-08-28 11:35:38 +03:00 |
|
Anatoly
|
ee619922fa
|
fixed looped import
|
2019-08-27 17:26:43 +03:00 |
|
evgeniy-st
|
c04771ca58
|
recalculate price level preview version
|
2019-08-27 16:53:05 +03:00 |
|
evgeniy-st
|
910027d10f
|
update establishment model, migrations
|
2019-08-27 14:23:11 +03:00 |
|
Anatoly
|
5edcd0afe9
|
replace image field with svg_image field, added validator, and change serializer
|
2019-08-26 17:39:03 +03:00 |
|
Anatoly
|
93bd8a59c4
|
added image field to Country model
|
2019-08-26 11:50:54 +03:00 |
|
Dmitriy Kuzmenko
|
f86a94274d
|
put cookies in request, refactored JWTViewMixin, change endpoint to get news list
|
2019-08-23 09:42:31 +03:00 |
|
evgeniy-st
|
4cceb62d49
|
update Country model
|
2019-08-22 14:45:01 +03:00 |
|
evgeniy-st
|
8a08c9b326
|
Fix __str__ for Country model
|
2019-08-22 14:41:45 +03:00 |
|
evgeniy-st
|
c4ba375323
|
update Country model
|
2019-08-22 14:40:21 +03:00 |
|
evgeniy-st
|
e839094e28
|
Site settings and determine user location over ip
|
2019-08-22 14:23:02 +03:00 |
|
Anatoly
|
d5a14ef8c2
|
version 0.0.11: added new model and CRUD endpoints to them; refactored auth app
|
2019-08-15 11:59:10 +03:00 |
|
Anatoly
|
7fe903b01b
|
version 0.0.8: added CRUD endpoints for models Address, Region, Country and City; also refactored custom permission class
|
2019-08-14 14:00:12 +03:00 |
|
Dmitriy Kuzmenko
|
68f6e0bc9c
|
version 0.0.6 new models and api for News
|
2019-08-13 15:23:00 +03:00 |
|
Dmitriy Kuzmenko
|
c5df0faa16
|
version 0.0.4: add app locations with models City, Regions, Address, Countries
|
2019-08-08 17:06:07 +03:00 |
|