Commit Graph

91 Commits

Author SHA1 Message Date
alex
3e83bdff59 pagination & ordering & country code 2019-12-12 15:34:36 +03:00
Anatoly
8af8cf92e9 added objects related statistic in Collection backoffice serializer 2019-12-06 17:00:54 +03:00
Anatoly
1d9ee76a5c fix es for establishments 2019-12-05 09:43:55 +03:00
Anatoly
9dc8e34e3a Merge branch 'develop' into feature/transfer-guide
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/serializers/common.py
2019-12-04 20:16:21 +03:00
Anatoly
627f7562ec finalizing transfer guides 2019-12-04 14:21:54 +03:00
Anatoly
076d14fd5b added filter model 2019-12-02 13:51:48 +03:00
Anatoly
4e3a990ac6 added command to fix existed collections 2019-11-29 16:44:32 +03:00
Anatoly
eaeebae72a in progress 2019-11-28 15:31:47 +03:00
Dmitriy Kuzmenko
2e17d7265d add back api for collection 2019-11-20 16:29:46 +03:00
Kuroshini
d080f689cb Change Pagination for collection 2019-11-18 22:23:23 +03:00
alex
dc0b4ce107 fix collection establishment in_fav 2019-11-18 13:12:24 +03:00
alex
78e42550c1 add address to establishment similar and collection establishment 2019-11-16 16:57:26 +03:00
Dmitriy Kuzmenko
2cd7755d7e add CRUD collections for back 2019-11-15 16:04:54 +03:00
Anatoly
83a3444c95 added product RUD-endpoints for back-office 2019-11-12 18:50:59 +03:00
Anatoly
eefbec20b1 fix swagger 2019-11-11 22:25:05 +03:00
Anatoly
f4b411e73d added tags, image urls to product serializers 2019-11-11 21:29:34 +03:00
Dmitriy Kuzmenko
7617981259 change command for migration of users 2019-11-11 15:29:31 +03:00
Виктор Гладких
8787a6b944 Fix 2019-11-01 16:27:09 +03:00
Виктор Гладких
afdc0154c6 Fix 2019-11-01 16:24:17 +03:00
Виктор Гладких
c51cfc1aa4 Fix publish collect 2019-11-01 16:18:33 +03:00
Виктор Гладких
5e65bff2ba Fix 2019-11-01 15:19:42 +03:00
Виктор Гладких
96aad4ff42 Fix country code 2019-11-01 14:28:01 +03:00
Виктор Гладких
dbee524a31 Add 2019-11-01 10:17:12 +03:00
Виктор Гладких
54f2290bbd exit 2019-11-01 10:16:05 +03:00
Виктор Гладких
1abe280ef7 Add unique collection 2019-10-31 17:51:23 +03:00
Виктор Гладких
7b4837f4f3 Add 2019-10-31 17:04:25 +03:00
Виктор Гладких
989e80ece6 First 2019-10-31 16:57:12 +03:00
alex
cd294961e0 Merge remote-tracking branch 'origin/develop' into feature/migration 2019-10-25 10:00:25 +03:00
Anatoly
84fb0aec70 change field parameter in model Guide (gm-241) 2019-10-24 16:42:08 +03:00
alex
647147bf03 Merge branch 'develop' into feature/migrate-news 2019-10-24 12:28:51 +03:00
Anatoly
97823ea601 change title field in model Collection to translated JSON field (gm-165) 2019-10-23 11:25:04 +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
Anatoly
4c9ea2e0e7 change field properties for Collection model 2019-10-22 15:45:58 +03:00
Виктор Гладких
3720ac2b8e Fix collection test 2019-10-21 12:17:12 +03:00
michail
54cfccbcbe the fix of types fields in all apps 2019-10-15 13:23:31 +05: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
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
michail
511312bb28 added transfer.py to partner 2019-10-04 16:20:04 +05:00
littlewolf
673acb4bb9 Add sort
Move dependencies to model
Add data_type to model
2019-10-03 23:19:40 +03:00
michail
018d9f6557 added establishment and collection transfer.py files 2019-10-03 17:54:26 +05:00
Anatoly
fec3e703ce refactored collection views 2019-10-02 16:21:38 +03:00
Anatoly
8e3bb54508 added endpoint for retrieving collection detail information 2019-10-02 15:09:19 +03:00
evgeniy-st
1247cefa3b Merge branch 'develop' into feature/refactor-address 2019-10-01 18:07:59 +03:00
evgeniy-st
e42f4d061c refactor address 2019-10-01 18:07:04 +03:00
Dmitriy Kuzmenko
9f280857ef change docker-compose for working celery 2019-10-01 17:42:37 +03:00
Dmitriy Kuzmenko
2af401daa5 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-09-27 17:44:19 +03:00
littlewolf
a0a6578ae8 Add new filter 2019-09-27 17:11:42 +03:00
littlewolf
910322273e Add annotate to filter 2019-09-27 12:01:11 +03:00
littlewolf
44f792db0c Switch sorting 2019-09-27 07:58:21 +03:00