Commit Graph

662 Commits

Author SHA1 Message Date
littlewolf
8965cf0460 Add news serializer 2019-10-20 17:59:18 +03:00
littlewolf
e1b031caf3 Tmp commit 2019-10-16 07:05:05 +03:00
littlewolf
ba1ce67444 Fix limit 2019-10-15 12:07:37 +03:00
littlewolf
09865db08a Tmp commit to debug 2019-10-15 12:05:49 +03:00
littlewolf
4d908d0bbb Add field converter 2019-10-15 12:05:49 +03:00
littlewolf
47a4d28cf0 Add fields map for simple field
Add fields map for tuple field
Refactoring code
2019-10-15 12:05:49 +03:00
littlewolf
8cae39cbb6 Tmp fix 2019-10-15 12:05:49 +03:00
michail
54cfccbcbe the fix of types fields in all apps 2019-10-15 13:23:31 +05:00
michail
dc12a184a1 the fix types of news fields 2019-10-15 12:46:06 +05:00
michail
a223832241 Relational integers to ForeignKey 2019-10-14 15:48:26 +05:00
michail
8ca27c7f87 Added transfer.py into main app.
Added legacy models into transfer/models.py
2019-10-14 14:30:13 +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
6142508421 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects 2019-10-11 10:46:00 +03:00
littlewolf
f5c16fba9d Tmp fix 2019-10-11 10:45:49 +03:00
michail
839491c740 added Pages, PageTexts, PageCounters and PageMetadata models into
transfer/models.py
2019-10-10 17:55:28 +05:00
michail
b2b8798c6c Edited transfer.py for news, partner, reviews, comment.
Added transfer.py for recipe.
2019-10-10 17:46:52 +05:00
littlewolf
0e474a16ea Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects 2019-10-10 09:04:01 +03:00
michail
4cc9fabd73 edited transfer.py for notification, account, establishment 2019-10-09 17:43:48 +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
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
evgeniy-st
861daf8871 update search fields 2019-10-08 14:39:42 +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
evgeniy-st
3bf65472d9 Auto fuzziness with match query 2019-10-07 16:31:50 +03:00
michail
4e96d09513 added transfer.py to account, comment and review 2019-10-07 14:34:24 +05:00
d.kuzmenko
cc51e36457 Merge branch 'feature/news-rating' into 'develop'
Feature/news rating

See merge request gm/gm-backend!47
2019-10-04 12:43:34 +00:00
Виктор Гладких
aa9288d41c Merge branch 'develop' into feature/news-rating 2019-10-04 15:41:25 +03:00
Виктор Гладких
f93d0095f4 Fix rating 2019-10-04 15:40:18 +03:00
Виктор Гладких
9f9c1064bd Fix rating 2019-10-04 15:39:14 +03:00
michail
511312bb28 added transfer.py to partner 2019-10-04 16:20:04 +05:00
evgeniy-st
175bd4f7b5 update establishment document 2019-10-04 14:07:50 +03:00
evgeniy-st
2b4638b1fa Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-10-04 14:04:20 +03:00
evgeniy-st
36922e1684 update settings 2019-10-04 14:04:08 +03:00
Anatoly
af0e6af5c4 refactored email reconfirm view 2019-10-04 13:48:48 +03:00
evgeniy-st
9fb05f0407 Merge branch 'feature/es' into develop 2019-10-04 12:11:12 +03:00
evgeniy-st
a73cba4dcf Merge branch 'develop' into feature/es 2019-10-04 12:06:53 +03:00
evgeniy-st
50a9622f78 News search 2019-10-04 12:05:13 +03:00
d.kuzmenko
f9247477f9 Merge branch 'feature/news-rating' into 'develop'
Feature/news rating

See merge request gm/gm-backend!46
2019-10-04 08:33:13 +00:00
michail
ad17a2ad7a new relations template 2019-10-04 13:18:43 +05:00
evgeniy-st
24f84ae8be update tag filter 2019-10-04 11:16:01 +03:00
Виктор Гладких
b42e9781a1 Fix code 2019-10-04 10:20:36 +03:00
Виктор Гладких
2e0da3a15f Merge branch 'develop' into feature/news-rating 2019-10-04 10:16:05 +03:00
Виктор Гладких
ca38f369f7 Fix 2019-10-04 10:15:07 +03: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
90dd896f13 Load app models
Load legacy models
2019-10-04 00:14:16 +03:00
littlewolf
673acb4bb9 Add sort
Move dependencies to model
Add data_type to model
2019-10-03 23:19:40 +03:00
evgeniy-st
8b9f6ed864 another fix migraztion 2019-10-03 18:21:04 +03:00