Commit Graph

68 Commits

Author SHA1 Message Date
Александр Пархомин
fb3fc25a3d add docstring for Comment 2020-02-07 12:01:49 +03:00
Олег Хаятов
6bf5b2a75b Merge branch 'bug-published_comments_not_displayed_v2' into 'develop'
filtration only in moderation v2

See merge request gm/gm-backend!261
2020-02-04 12:53:50 +00:00
Kirill
6030b438a0 filtration only in moderation v2 2020-02-04 15:50:57 +03:00
Олег Хаятов
9982c2ca77 Merge branch 'bug-published_comments_not_displayed_v2' into 'develop'
published_comments_not_displayed

See merge request gm/gm-backend!260
2020-02-04 12:13:44 +00:00
Anatoly
b286bbb1fa added migrations, refactored establishment serializers 2020-02-04 15:07:58 +03:00
Kirill
f3a5605111 filtration only in moderation 2020-02-04 15:05:59 +03:00
Kirill
8d8a5f50fb move comments filtration from model to view 2020-02-03 10:46:44 +03:00
dormantman
f67c8b08a5 Alter comment validator 2020-01-31 20:50:08 +03:00
Anatoly
25c63b8097 Merge branch 'develop' into feature/roles
# Conflicts:
#	apps/account/models.py
#	apps/collection/views/back.py
#	apps/comment/views/back.py
#	apps/establishment/models.py
#	apps/establishment/views/back.py
#	apps/news/views.py
#	apps/partner/views/back.py
2020-01-30 10:56:46 +03:00
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
a.gorbunov
121b917096 fix route 2020-01-28 13:56:32 +00:00
a.gorbunov
a0a6e98fa6 resolve comments 2020-01-28 12:32:18 +00:00
a.gorbunov
028b8475b7 slug from content object 2020-01-28 12:16:18 +00:00
a.gorbunov
8f752ae6a0 tune get comments method 2020-01-28 12:05:30 +00:00
Anatoly
236b532d98 refactored permission classes 2020-01-28 14:54:14 +03:00
Kuroshini
d27a47f905 Revert "Revert "Revert (nickname field) common.py""
This reverts commit f9c5bdc
2020-01-23 18:03:06 +03:00
Kuroshini
f9c5bdceee Revert "Revert (nickname field) common.py"
This reverts commit 5560a01
2020-01-23 18:02:26 +03:00
Ruslan Stepanov
5560a0149d Revert (nickname field) common.py 2020-01-23 07:40:56 +00:00
dormantman
07f4947cc0 Change mark value 2020-01-22 17:00:40 +03:00
Kuroshini
5a9b45cd76 comments status field 2020-01-22 15:16:48 +03:00
dormantman
b72f5c383b Added fields to comments 2020-01-21 17:40:34 +03:00
Kuroshini
881e4b11e2 last ip for comments backoffice 2020-01-16 17:59:25 +03:00
Anatoly
6e61587b27 refactor admin panel, remove unused field from model NavBarPermission 2020-01-15 23:19:17 +03:00
Anatoly
f86357e041 fix comments 2020-01-15 22:31:30 +03:00
Виктор Гладких
28a3e022f6 Fix comment test and permission 2019-11-25 12:13:14 +03:00
Виктор Гладких
86500b6b88 Fix site_id for comment 2019-11-25 11:13:05 +03:00
alex
3a5c34fd4f comment command 2019-11-12 18:29:24 +03:00
alex
3ace542deb comment created date 2019-11-12 18:12:14 +03:00
alex
3f2de46420 fix filter comment by establishment and user 2019-11-12 16:38:06 +03:00
alex
0db7972b5a fix comment country 2019-11-12 16:19:03 +03:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
alex
a372d29677 refactor comment migration 2019-11-06 14:24:14 +03:00
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