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 |
|
littlewolf
|
4f2bca78f9
|
Update tests
Update view
|
2019-09-27 07:52:57 +03:00 |
|
littlewolf
|
5793eaad32
|
Add queryset mixin
Switch view in urls/common
Add homepage view
Switch test
|
2019-09-26 20:17:50 +03:00 |
|
Dmitriy Kuzmenko
|
6ea876cdc6
|
test small fix
|
2019-09-26 11:39:48 +03:00 |
|
Kuroshini
|
1534c9b09c
|
Remove unique
(cherry picked from commit f793c20)
|
2019-09-24 14:51:51 +03:00 |
|
Kuroshini
|
65914659e5
|
Slugs serializers
|
2019-09-24 12:31:35 +03:00 |
|
Kuroshini
|
d224c77a01
|
Fix issues with test && recreate migrations
|
2019-09-24 12:06:11 +03:00 |
|
Kuroshini
|
73a858cc8c
|
Slugs feature migrations
|
2019-09-24 10:38:04 +03:00 |
|
Kuroshini
|
6420a676df
|
create slugs manually
|
2019-09-24 10:38:04 +03:00 |
|
Kuroshini
|
1ce71fdcdc
|
slugs for news & establishments
|
2019-09-24 10:38:04 +03:00 |
|
evgeniy-st
|
8f60937e4b
|
Fix migration collection
|
2019-09-23 16:44:28 +03:00 |
|
littlewolf
|
eca921592d
|
Fix guide parent
|
2019-09-23 15:28:59 +03:00 |
|
littlewolf
|
b4a2893fcd
|
Add tests to guide
|
2019-09-23 15:27:38 +03:00 |
|
littlewolf
|
466c0f80d7
|
Add list read test
Add detail read test
|
2019-09-23 14:17:19 +03:00 |
|
Anatoly
|
193ecfba7a
|
fixed comments
|
2019-09-20 15:38:20 +03:00 |
|
Anatoly
|
2089ca067a
|
chane FK to URLField in Collection model, added properties to field collections in Establishment model
|
2019-09-20 14:22:39 +03:00 |
|
Anatoly
|
413c93bead
|
fixed problem with image, refactored favorites, collection
|
2019-09-20 13:35:59 +03:00 |
|
Anatoly
|
af0c134957
|
Fixed docs
|
2019-09-18 12:16:32 +03:00 |
|
Anatoly
|
27a1998dbc
|
GM-73: Логика похожих ресторанов
|
2019-09-17 15:36:33 +03:00 |
|
Anatoly
|
79edd6c51d
|
fixed collection list and news list endpoints
|
2019-08-29 11:42:52 +03:00 |
|
Anatoly
|
4c448efc96
|
added field image_url to news list and collection list
|
2019-08-28 13:41:33 +03:00 |
|
Anatoly
|
e22a54114b
|
refactored collection app
|
2019-08-28 12:22:13 +03:00 |
|
Anatoly
|
0f6147c1dc
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/collection/urls/common.py
|
2019-08-28 11:50:15 +03:00 |
|
Dmitriy Kuzmenko
|
253da87a99
|
URL refactoring
|
2019-08-28 11:35:38 +03:00 |
|
Anatoly
|
b5c50ff730
|
fixed serializers
|
2019-08-28 09:55:45 +03:00 |
|
Anatoly
|
2172972216
|
refactored gallery app
|
2019-08-27 18:58:40 +03:00 |
|
Anatoly
|
ce260a69aa
|
Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"
This reverts commit 07333234
|
2019-08-27 18:18:58 +03:00 |
|
Anatoly
|
df2e60254e
|
fixed migrations
|
2019-08-27 17:50:24 +03:00 |
|