Commit Graph

2949 Commits

Author SHA1 Message Date
dormantman
40bfd479d2 Added access levels 2020-01-22 16:14:00 +03:00
dormantman
6a1fea76b6 Added content page method 2020-01-22 16:03:23 +03:00
Олег Хаятов
b12253fb6b Merge branch 'feature/default-images' into 'develop'
Feature/default images

See merge request gm/gm-backend!231
2020-01-22 12:39:04 +00:00
a.gorbunov
1921efd2c5 get news type default image query will be optimized 2020-01-22 12:34:38 +00:00
Anatoly
b4fe5dd4b0 fix role tab 2020-01-22 15:21:46 +03:00
Kuroshini
5a9b45cd76 comments status field 2020-01-22 15:16:48 +03:00
Anatoly
b989762568 added endpoint to get role types, change endpoint URI ( from /account/role-tab/ to /account/role/tab/) 2020-01-22 14:50:10 +03:00
a.gorbunov
f194863862 [migration] default_image_url field for news types 2020-01-22 11:26:31 +00:00
a.gorbunov
1981b44a10 added get_instances_from_related method for product document 2020-01-22 11:23:28 +00:00
a.gorbunov
b9e6df5482 added default image for news types 2020-01-22 10:55:26 +00:00
Kuroshini
0023fcb47b fix photos 2020-01-22 12:19:16 +03:00
Anatoly
4ff3af61b3 extend full-text search 2020-01-22 09:41:22 +03:00
Олег Хаятов
004e4bdf98 Merge branch 'feature/establishments-with-employees' into 'develop'
Added employee establishments method

See merge request gm/gm-backend!230
2020-01-21 16:29:39 +00:00
dormantman
0688c622cc Fixed structure view 2020-01-21 19:28:29 +03:00
dormantman
88e488e481 Added employee establishments method 2020-01-21 19:19:38 +03:00
Kuroshini
6a36bb5a13 news trigram search 2020-01-21 18:58:26 +03:00
Олег Хаятов
de50d6491f Merge branch 'bugs/comment-fields' into 'develop'
Added fields to comments

See merge request gm/gm-backend!229
2020-01-21 14:54:40 +00:00
dormantman
b72f5c383b Added fields to comments 2020-01-21 17:40:34 +03:00
Anatoly
de78ee5d6e added field phone to User model, change establishment transfer, added filters (full-text search, role_country_code, country_code), change account serializers 2020-01-21 17:36:31 +03:00
Kuroshini
6d627ac240 Revert "fix news ordering"
This reverts commit 1a6828b
2020-01-21 16:01:04 +03:00
Олег Хаятов
716c6b3af2 Merge branch 'feature/subscriptions' into 'develop'
Feature/subscriptions

See merge request gm/gm-backend!228
2020-01-21 12:50:08 +00:00
Kuroshini
1a6828b53e fix news ordering 2020-01-21 15:48:37 +03:00
Kuroshini
5ef58b8202 news ordering 2020-01-21 15:15:32 +03:00
dormantman
d5fea50108 Added locales 2020-01-21 14:49:42 +03:00
dormantman
8e6d433ffd Added localization to subscribes 2020-01-21 14:39:49 +03:00
Kuroshini
d77bd1d79c update default ads duration 2020-01-21 13:56:08 +03:00
Kuroshini
f3dca356ad advertisement 2020-01-21 13:47:30 +03:00
dormantman
a8dd7f9347 Added valid link to unsubscribe 2020-01-21 13:07:56 +03:00
dormantman
36b9474e36 Fixed subscriptions 2020-01-21 12:56:54 +03:00
Kuroshini
8235c6d172 fix 2020-01-21 12:37:33 +03:00
Kuroshini
416af8d343 photo for employee 2020-01-21 12:33:15 +03:00
dormantman
66780ef093 Added subscriptions associate 2020-01-21 12:04:55 +03:00
alex
61c47e4c79 establishment employee position delete view 2020-01-21 08:17:03 +03:00
Kuroshini
e517d87d7e fix cropper 2020-01-20 19:00:36 +03:00
Kuroshini
6ad1849835 fix cropper 2020-01-20 17:41:35 +03:00
Kuroshini
9975b5a8ab fix crop 2020-01-20 17:09:38 +03:00
Kuroshini
66d79d061c fix crop 2020-01-20 17:05:08 +03:00
Олег Хаятов
1c4060ac7b Merge branch 'feature/subscriptions' into 'develop'
Fixed creating subscriber with signup

See merge request gm/gm-backend!227
2020-01-20 13:37:57 +00:00
dormantman
075ce887da Added type to pop in tags 2020-01-20 16:27:11 +03:00
Ruslan Stepanov
27f47cfae6 Merge branch 'develop' into 'feature/subscriptions'
# Conflicts:
#   apps/account/serializers/common.py
2020-01-20 13:24:46 +00:00
alex
a994e7214b fix from_date and to_date for est_employee 2020-01-20 15:51:47 +03:00
Kuroshini
f026cfceba fix rud for inactive news 2020-01-20 14:53:13 +03:00
alex
5f4852d11e Merge remote-tracking branch 'origin/develop' into develop 2020-01-20 14:20:54 +03:00
alex
beefc82d7b toque number and employee for establishment 2020-01-20 14:20:46 +03:00
Kuroshini
9ce5f89d74 try to fix issue w/ news images optimization 2020-01-20 14:18:56 +03:00
Anton Gorbunov
92f349d8e7 Merge branch 'bug/optimize-collection-images' into 'develop'
Bug/optimize collection images

See merge request gm/gm-backend!226
2020-01-20 11:04:51 +00:00
a.gorbunov
c0b517e5fe find image regexp 2020-01-20 11:04:02 +00:00
Anton Gorbunov
9debe8beef Merge branch 'bug/optimize-collection-images' into 'develop'
fix regexp for find images

See merge request gm/gm-backend!225
2020-01-20 10:58:16 +00:00
a.gorbunov
a31763c550 fix regexp for find images 2020-01-20 10:58:00 +00:00
Kuroshini
a9c1e5b154 in favorites for news 2020-01-20 13:51:25 +03:00