Commit Graph

36 Commits

Author SHA1 Message Date
michail
06f5a551b8 additions for migration of comments 2019-11-05 16:45:43 +05:00
littlewolf
8f18320171 Merge branch 'develop' into origin/feature/migrate-etablishment
# Conflicts:
#	apps/establishment/transfer_data.py
#	apps/transfer/management/commands/transfer.py
2019-10-31 07:44:07 +03:00
Dmitriy Kuzmenko
638bafe4a6 Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
#	apps/establishment/admin.py
#	project/settings/base.py
2019-10-30 19:12:59 +03:00
littlewolf
86e0699c8c Add reviews transfer
Add language transfer
Fix comment transfer
2019-10-30 12:31:38 +03:00
littlewolf
c564f4fd67 Fix rewiewers 2019-10-30 12:31:38 +03:00
littlewolf
9310bff319 Add comment serializer 2019-10-30 12:31:38 +03:00
Dmitriy Kuzmenko
e270131679 Merge branch 'develop' into origin/migration_fix 2019-10-29 15:27:40 +03:00
Виктор Гладких
fb770f8e2a Fix merge 2019-10-25 15:56:02 +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
Виктор Гладких
046d0c5fe6 Fix country and comment role 2019-10-25 10:59:31 +03:00
Виктор Гладких
851ba7f9dd Test edit 2019-10-25 10:14:50 +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
Виктор Гладких
c80b53a0fc reviewer manager 2019-10-17 15:04:08 +03:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +03:00
Виктор Гладких
322cfcd89d Fix test 2019-10-15 15:33:28 +03:00
Виктор Гладких
ff7df815f4 Fix country_id 2019-10-15 15:20:44 +03:00
michail
54cfccbcbe the fix of types fields in all apps 2019-10-15 13:23:31 +05:00
Виктор Гладких
43531d88dc Country id 2019-10-15 10:05:31 +03:00
Виктор Гладких
b3eac3666b Standart user, guest. 2019-10-14 14:48:13 +03:00
Виктор Гладких
a6c56a4bf1 Fix and refactor 2019-10-11 14:49:32 +03:00
Виктор Гладких
b390b1af26 Fix 2019-10-10 16:00:23 +03:00
michail
b2b8798c6c Edited transfer.py for news, partner, reviews, comment.
Added transfer.py for recipe.
2019-10-10 17:46:52 +05:00
Виктор Гладких
ab5a66afe2 Test change 2019-10-10 15:20:13 +03:00
Виктор Гладких
56c0927a52 Add country control 2019-10-10 14:58:19 +03:00
Виктор Гладких
01dd728323 Refactor 2019-10-09 16:44:29 +03:00
Виктор Гладких
7ed976dec0 Test 2019-10-09 16:28:14 +03:00
Виктор Гладких
48ca13803e Pre test permission comment 2019-10-09 14:44:01 +03:00
Виктор Гладких
eeba02c2ae test role 2019-10-08 15:26:39 +03:00
michail
4e96d09513 added transfer.py to account, comment and review 2019-10-07 14:34:24 +05:00
Anatoly
1e650b9b1f replace ImageFields to URLFields in User model, refactored serializers that included this fields 2019-09-12 18:10:52 +03:00
Anatoly
808178d56c GM-70: Добавить пагинацию комментариев в карточке ресторанов 2019-09-09 13:12:48 +03:00
Anatoly
742d700d3c refactored comments 2019-09-06 11:06:02 +03:00
Anatoly
a133cfe1dd added default value of is_main flag in comment section for establishments 2019-09-05 11:53:48 +03:00
Anatoly
3cac53c77d fixed comments in establishment list or detail endpoints 2019-09-05 10:32:44 +03:00
Anatoly
605c81b33c replace comment model from establishment app, added new app comment 2019-09-04 18:47:06 +03:00