Commit Graph

2385 Commits

Author SHA1 Message Date
a.gorbunov
20a96e1e51 optimize news images 2020-01-20 10:40:34 +00:00
a.gorbunov
bb8accefbf optimize fix 2020-01-20 10:25:09 +00: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
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
alex
2aec0bdfb4 position filter for employee 2020-01-16 16:23:10 +03:00
Олег Хаятов
de55154d89 Merge branch 'feature/subscriptions' into 'develop'
Fix subscriber get

See merge request gm/gm-backend!217
2020-01-16 13:06:14 +00:00