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
|
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 |
|
Anton Gorbunov
|
1140937346
|
Merge branch 'bug/optimize-collection-images' into 'develop'
optimize news images
See merge request gm/gm-backend!224
|
2020-01-20 10:42:31 +00:00 |
|
a.gorbunov
|
df601e3234
|
optimize news images
|
2020-01-20 10:42:16 +00:00 |
|
Anton Gorbunov
|
914c8fc9f3
|
Merge branch 'bug/optimize-collection-images' into 'develop'
optimize news images
See merge request gm/gm-backend!223
|
2020-01-20 10:40:50 +00:00 |
|
a.gorbunov
|
20a96e1e51
|
optimize news images
|
2020-01-20 10:40:34 +00:00 |
|
Anton Gorbunov
|
dc8bc8a94e
|
Merge branch 'bug/optimize-collection-images' into 'develop'
optimize fix
See merge request gm/gm-backend!222
|
2020-01-20 10:25:51 +00:00 |
|
a.gorbunov
|
bb8accefbf
|
optimize fix
|
2020-01-20 10:25:09 +00:00 |
|
Kuroshini
|
5a662fd745
|
Image id on city creation
|
2020-01-20 13:18:49 +03:00 |
|
alex
|
1bc7a9f13b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-20 12:14:03 +03:00 |
|
alex
|
215e7b5f19
|
establishment employee list
|
2020-01-20 12:13:50 +03:00 |
|
Anatoly
|
452c6f22ae
|
fix role counter
|
2020-01-20 11:45:26 +03:00 |
|
Anatoly
|
765a66dc68
|
fix role counter
|
2020-01-20 11:43:35 +03:00 |
|
Anatoly
|
e6dfa6d74d
|
fix SiteAffilation roles transfer
|
2020-01-20 11:21:51 +03:00 |
|
dormantman
|
f9d4d4ff57
|
Revert "Added type for pop filter in tags"
This reverts commit be96a6c7
|
2020-01-18 01:05:44 +03:00 |
|
dormantman
|
51114b0e95
|
Added db index to siteinterfacedictionary text for optimize
|
2020-01-18 01:04:30 +03:00 |
|
dormantman
|
be96a6c7ba
|
Added type for pop filter in tags
|
2020-01-18 00:55:25 +03:00 |
|
Kuroshini
|
17d8db649b
|
middleware to log db queries #2
|
2020-01-17 20:23:49 +03:00 |
|
Kuroshini
|
918c1fa17d
|
middleware to log db queries
|
2020-01-17 20:21:59 +03:00 |
|
Kuroshini
|
249f6f709e
|
Revert "Added type for pop filter in tags"
This reverts commit 2b28a56
|
2020-01-17 19:13:29 +03:00 |
|
Kuroshini
|
a05db696b0
|
optimize db queries on /api/back/establishments/employees
|
2020-01-17 19:08:33 +03:00 |
|
Dmitry Kuzmenko
|
f400ceed81
|
add filter backend for user
|
2020-01-17 18:15:21 +03:00 |
|
Kuroshini
|
8544098f8c
|
fix command #2
|
2020-01-17 17:41:53 +03:00 |
|
Anatoly
|
a26109a8da
|
added endpoint /api/back/account/role-tab/
|
2020-01-17 17:40:21 +03:00 |
|
Kuroshini
|
0bb521b479
|
fix command
|
2020-01-17 17:35:50 +03:00 |
|
Kuroshini
|
9ef26594b6
|
code improvements
|
2020-01-17 17:33:13 +03:00 |
|
Ruslan Stepanov
|
281aca4fe5
|
Added establishment saving
|
2020-01-17 17:33:13 +03:00 |
|
dormantman
|
294c468405
|
Added live link part
|
2020-01-17 17:33:13 +03:00 |
|
dormantman
|
0a832136d3
|
Added update establishment image urls command
|
2020-01-17 17:33:13 +03:00 |
|
Ruslan Stepanov
|
2b28a562d2
|
Added type for pop filter in tags
|
2020-01-17 14:31:15 +00:00 |
|
Олег Хаятов
|
4ae40dc78d
|
Merge branch 'feature/preview-news' into 'develop'
Added new route preview/slug/<slug>/
See merge request gm/gm-backend!219
|
2020-01-17 14:24:50 +00:00 |
|
Олег Хаятов
|
15df8e405d
|
Merge branch 'feature/agenda-back-office' into 'develop'
Feature/agenda back office
See merge request gm/gm-backend!202
|
2020-01-17 14:23:44 +00:00 |
|
dormantman
|
33852a6551
|
Fixed creating subscriber with signup
|
2020-01-17 17:20:49 +03:00 |
|
Kuroshini
|
c3ed88339e
|
order BO user by date they joined
|
2020-01-17 17:07:23 +03:00 |
|
Олег Хаятов
|
df5888a048
|
Merge branch 'feature/subscriptions' into 'develop'
Fixed many subscribers
See merge request gm/gm-backend!220
|
2020-01-17 13:48:54 +00:00 |
|
dormantman
|
8843d5efed
|
Fixed many subscribers
|
2020-01-17 16:34:59 +03:00 |
|
Kuroshini
|
8b4a6b0b74
|
fix employees search
|
2020-01-17 16:13:33 +03:00 |
|
alex
|
a8ea238bfc
|
some optimize for employee list
|
2020-01-17 16:02:00 +03:00 |
|
Kuroshini
|
abfd4d7288
|
full-text search employees
|
2020-01-17 14:33:57 +03:00 |
|
Ruslan Stepanov
|
903bdbb39d
|
Merge branch 'develop' into 'feature/agenda-back-office'
# Conflicts:
# apps/news/serializers.py
|
2020-01-17 11:12:30 +00:00 |
|
alex
|
4a7eb22291
|
order by position for establishment employee
|
2020-01-17 14:02:46 +03:00 |
|
alex
|
a915cff73d
|
photo for employee
|
2020-01-17 13:56:58 +03:00 |
|
alex
|
0695cdce6b
|
available_for_events field for employee
|
2020-01-17 11:36:13 +03:00 |
|
Anatoly
|
754b6d5b4f
|
fix collection guides
|
2020-01-17 10:02:49 +03:00 |
|
alex
|
4880b2629d
|
select_related for establishment types serializers
|
2020-01-17 09:54:05 +03:00 |
|
alex
|
85e5537b82
|
prefetch_related for employee serializers
|
2020-01-17 09:43:13 +03:00 |
|
alex
|
f15a93f760
|
username, first_name, last_name filter for employee
|
2020-01-17 09:37:15 +03:00 |
|
alex
|
38485292f9
|
public_mark filter for actual employee
|
2020-01-17 09:21:51 +03:00 |
|
alex
|
988de09efe
|
toque_number filter for employee
|
2020-01-17 09:12:18 +03:00 |
|
dormantman
|
a0fdef69b6
|
Fixed conditions for news methods
|
2020-01-16 21:16:08 +03:00 |
|
dormantman
|
6c624115e6
|
Added agenda validate to update method
|
2020-01-16 20:36:19 +03:00 |
|
Kuroshini
|
ea485d9960
|
optimize images at least for establishments
|
2020-01-16 19:21:57 +03:00 |
|
Anatoly
|
391df439c6
|
fix reset password token generator
|
2020-01-16 18:05:09 +03:00 |
|
Kuroshini
|
881e4b11e2
|
last ip for comments backoffice
|
2020-01-16 17:59:25 +03:00 |
|
Kuroshini
|
3d09333d31
|
toques for employees in BO
|
2020-01-16 16:51:33 +03:00 |
|
Kuroshini
|
783e2e5931
|
cascade create agenda
|
2020-01-16 16:40:17 +03:00 |
|