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 |
|
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 |
|
dormantman
|
ad43e4a5f9
|
Added new route preview/slug/<slug>/
|
2020-01-16 15:47:01 +03:00 |
|
a.feteleu
|
14f19b2b4d
|
small fix
|
2020-01-16 15:30:37 +03:00 |
|
dormantman
|
0eba2a4405
|
Fix subscriber get
|
2020-01-16 15:27:38 +03:00 |
|
Олег Хаятов
|
e9f07a4aa0
|
Merge branch 'feature/subscriptions' into 'develop'
Added method subscribe with code
See merge request gm/gm-backend!204
|
2020-01-16 11:45:19 +00:00 |
|
Олег Хаятов
|
ffb11b8233
|
Merge branch 'feature/standart-weekdays' into 'develop'
Feature/standart weekdays
See merge request gm/gm-backend!210
|
2020-01-16 11:42:08 +00:00 |
|
Anatoly
|
017308da95
|
refactored news transfer
|
2020-01-16 14:20:07 +03:00 |
|
Kuroshini
|
127d15b181
|
try to fix performance issues
(cherry picked from commit 964ead1)
|
2020-01-16 12:14:04 +03:00 |
|
Ruslan Stepanov
|
7aab0bea31
|
Fixed misprint
|
2020-01-16 08:24:29 +00:00 |
|
Kuroshini
|
0b261330e6
|
some news optimizations
|
2020-01-16 11:19:41 +03:00 |
|
Anton Gorbunov
|
de3933aa88
|
Merge branch 'bug/establishment_optimize' into 'develop'
format condition
See merge request gm/gm-backend!216
|
2020-01-16 08:11:48 +00:00 |
|
a.gorbunov
|
ca3d8a411c
|
format condition
|
2020-01-16 08:11:29 +00:00 |
|
Anton Gorbunov
|
37a6ea8d1e
|
Merge branch 'bug/establishment_optimize' into 'develop'
logs and save extension for preview
See merge request gm/gm-backend!215
|
2020-01-16 07:56:50 +00:00 |
|
a.gorbunov
|
9ea7c25085
|
logs and save extension for preview
|
2020-01-16 07:56:34 +00:00 |
|
Anton Gorbunov
|
87d16ef866
|
Merge branch 'bug/establishment_optimize' into 'develop'
fix condition for optimize establishment preview image
See merge request gm/gm-backend!214
|
2020-01-16 07:30:00 +00:00 |
|
a.gorbunov
|
f09b5c2367
|
fix condition for optimize establishment preview image
|
2020-01-16 07:29:36 +00:00 |
|
Anton Gorbunov
|
cc00d804b1
|
Merge branch 'bug/establishment_optimize' into 'develop'
fix optimize establishment preview images
See merge request gm/gm-backend!213
|
2020-01-16 07:14:08 +00:00 |
|
a.gorbunov
|
78da617682
|
fix optimize establishment preview images
|
2020-01-16 07:13:31 +00:00 |
|
Anton Gorbunov
|
04987fdbd9
|
Merge branch 'bug/establishment_optimize' into 'develop'
fix optimize establishment preview images
See merge request gm/gm-backend!212
|
2020-01-16 07:06:19 +00:00 |
|
a.gorbunov
|
e6dec3a1f0
|
fix optimize establishment preview images
|
2020-01-16 06:51:39 +00:00 |
|
Anatoly
|
6e61587b27
|
refactor admin panel, remove unused field from model NavBarPermission
|
2020-01-15 23:19:17 +03:00 |
|
dormantman
|
abf9cd684a
|
Change description
|
2020-01-15 23:06:38 +03:00 |
|
Anatoly
|
fedf1400fd
|
add M2M site feature relations to NavBarPermission model
|
2020-01-15 22:45:58 +03:00 |
|
Anatoly
|
f86357e041
|
fix comments
|
2020-01-15 22:31:30 +03:00 |
|
dormantman
|
6461ffda4d
|
Added short to label_translated
|
2020-01-15 21:45:29 +03:00 |
|
Kuroshini
|
4b45cab976
|
employees trigram search for back-office
|
2020-01-15 20:49:33 +03:00 |
|
Kuroshini
|
7a7d7a70b0
|
fix naming issue
|
2020-01-15 19:15:32 +03:00 |
|
Kuroshini
|
fab351d800
|
distillery_type #3
|
2020-01-15 18:21:21 +03:00 |
|
Kuroshini
|
9b40d8e48e
|
distillery_type #2
|
2020-01-15 18:02:57 +03:00 |
|
Anatoly
|
a468f264e0
|
fix similarity rules
|
2020-01-15 17:50:34 +03:00 |
|
Kuroshini
|
59f7f8d2d4
|
distillery_type
|
2020-01-15 17:50:12 +03:00 |
|
alex
|
7ce25a41c8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-15 17:06:18 +03:00 |
|
alex
|
f15ac47102
|
subscription_type list for user
|
2020-01-15 17:06:09 +03:00 |
|
Anatoly
|
c0273773bc
|
refactored a little similarity rules
|
2020-01-15 17:00:14 +03:00 |
|
Kuroshini
|
129201d3a9
|
add slug for backoffice establishments
|
2020-01-15 16:51:42 +03:00 |
|
Kuroshini
|
0607a56739
|
Revert "possible fix for similar distilleries"
This reverts commit 2197863
|
2020-01-15 16:47:04 +03:00 |
|
Anatoly
|
59c9c06d64
|
fix transfer location
|
2020-01-15 16:46:12 +03:00 |
|
Kuroshini
|
21978639bd
|
possible fix for similar distilleries
|
2020-01-15 16:40:29 +03:00 |
|
alex
|
677d67cbc5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-15 15:03:48 +03:00 |
|