phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,982 Commits 1 Branch 0 Tags 4.8 MiB
e1b3908e00
Commit Graph

2666 Commits

Author SHA1 Message Date
Kuroshini
1c01604f43 Revert "disable ES sync after news_type updating" 
This reverts commit 6ba8fb3
 2020-01-22 21:29:37 +03:00
Kuroshini
1cd0458acc Revert "temp disable tags updating" 
This reverts commit 8aefe9b
 2020-01-22 21:29:34 +03:00
Kuroshini
8cc5355200 Revert "disable ES" 
This reverts commit cc9c641
 2020-01-22 21:29:32 +03:00
Kuroshini
4a1676abcd Revert "disable es" 
This reverts commit 503ce30
 2020-01-22 21:29:28 +03:00
Kuroshini
503ce30350 disable es 2020-01-22 21:26:13 +03:00
Kuroshini
cc9c641df3 disable ES 2020-01-22 21:25:09 +03:00
Kuroshini
8aefe9b0e9 temp disable tags updating 2020-01-22 21:12:30 +03:00
Kuroshini
6ba8fb31cf disable ES sync after news_type updating 2020-01-22 21:09:25 +03:00
Kuroshini
bdf5c77f03 post_save async 2020-01-22 20:54:52 +03:00
Kuroshini
e94dd03875 disable news_type update post save 2020-01-22 20:52:15 +03:00
Kuroshini
407f9026e0 crunch for news type 2020-01-22 20:50:55 +03:00
Kuroshini
dd588c039f fix news ES indexing 2020-01-22 20:23:46 +03:00
Kuroshini
b7fa52a2ab increase news shard number 2020-01-22 20:10:13 +03:00
Олег Хаятов
8083c83df1 Merge branch 'bug/sort-regions' into 'develop' 
fix sort

See merge request gm/gm-backend!234
 2020-01-22 16:57:21 +00:00
Олег Хаятов
f5e60f0609 Merge branch 'bug/establishment-country' into 'develop' 
fix country_id

See merge request gm/gm-backend!233
 2020-01-22 16:55:50 +00:00
Kuroshini
affb985b15 BO news via ES #5 (optimize) 2020-01-22 19:41:44 +03:00
Kuroshini
aab99af87f BO news via ES #4 2020-01-22 19:24:26 +03:00
Kuroshini
65a6ac0dd0 BO new via ES #3 2020-01-22 19:06:09 +03:00
dormantman
8fb8c49bfe Added employee positions method 2020-01-22 18:48:16 +03:00
Kuroshini
1907494f15 BO news via ES#2 2020-01-22 18:47:08 +03:00
Kuroshini
0552d919f1 BO news via ES #1 2020-01-22 18:43:58 +03:00
a.gorbunov
749775075c fix sort 2020-01-22 14:57:37 +00:00
dormantman
c78c6a67b1 Fixed subscriptions unsubscribe 2020-01-22 17:15:49 +03:00
dormantman
07f4947cc0 Change mark value 2020-01-22 17:00:40 +03:00
a.gorbunov
24c352aeac fix country_id 2020-01-22 13:53:28 +00:00
dormantman
3f44a76da9 Added retrieve id method 2020-01-22 16:32:51 +03:00
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
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
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
alex
63cc029ce3 subscriptions read only 2020-01-15 15:03:38 +03:00
Anatoly
8f206f2a9c remove city gallery 2020-01-15 14:20:51 +03:00
Kuroshini
42885e8b4c International carousel 2020-01-15 13:45:22 +03:00
dormantman
7533579172 Added short weekday to tag filters 2020-01-15 13:24:53 +03:00
Anatoly
8cb0f51802 fix transfer command transfer_city_gallery, add field image to City model, fix serializer CityDetailSerializer 2020-01-15 13:22:54 +03:00
Anatoly
32ad122d9a set priority in Feature model as blank, and remove uniqueness constrait 2020-01-15 13:22:54 +03:00
alex
e4123d3ce9 preview_image to establishment and product type and subtype 2020-01-15 10:47:18 +03:00
a.gorbunov
7bc998ca94 fix regex for find images 2020-01-15 06:57:59 +00:00
a.gorbunov
210070b7cf fix regex for find images 2020-01-15 06:45:42 +00:00
alex
19b9e636c1 phones for cascade establishment 2020-01-15 09:20:09 +03:00
dormantman
660a46b895 Added short weekday to model 2020-01-15 01:10:52 +03:00
dormantman
67ab06022f Added short translated weekday for timetable 2020-01-15 01:01:27 +03:00
alex
0cf62353be fix role field 2020-01-14 22:06:53 +03:00
alex
9bd40b0191 Merge remote-tracking branch 'origin/develop' into develop 2020-01-14 22:04:25 +03:00
alex
1c4e141383 fix import error for role serializer 2020-01-14 22:04:11 +03:00
Kuroshini
24f0c25a3d Merge branch 'feature/auto-username' into develop 
# Conflicts:
#	apps/utils/methods.py
 2020-01-14 22:01:57 +03:00
dormantman
42190e0e28 Fix for front auth 2020-01-14 21:57:57 +03:00
Kuroshini
2492000ae6 try to fix issue w/ filters 2020-01-14 21:30:21 +03:00
Kuroshini
da9f393a52 try to fix issue w/ filters 2020-01-14 21:28:29 +03:00
dormantman
d2c03b0f37 Merge remote-tracking branch 'origin/feature/auto-username' into develop 2020-01-14 21:17:17 +03:00
Anatoly
6541070d1c Merge branch 'develop' into feature/navigation-bar 
# Conflicts:
#	apps/main/serializers.py
 2020-01-14 19:06:59 +03:00
Anatoly
5c95c4923f refactored roles, refactored response for User detail view 2020-01-14 18:40:30 +03:00
dormantman
49673d64af Added automatic username creation 2020-01-14 18:20:57 +03:00
a.gorbunov
c110dc3b96 optimize collection images 2020-01-14 18:18:17 +03:00
Kuroshini
440a263ea5 verbose news optimize command fix 2020-01-14 17:34:33 +03:00
Kuroshini
3f19699e1d supress issues w/ news images compression 2020-01-14 17:32:13 +03:00
dormantman
6dda459cc8 Fixed user authenticated 2020-01-14 17:18:41 +03:00
a.gorbunov
710eb274ed remove debug info. Cleanup code. Set default quality 2020-01-14 17:17:55 +03:00
Kuroshini
77cca6c6d7 resize photos 2020-01-14 17:17:55 +03:00
a.gorbunov
ba4c6901f9 quality calculate 2020-01-14 17:17:55 +03:00
a.gorbunov
e70e1d0a67 thumbnail alias for images in news description 2020-01-14 17:17:55 +03:00
anton
0672bcaef9 command for optimize news images 2020-01-14 17:17:55 +03:00
dormantman
d3d4578bc7 Auto creating subscriber 2020-01-14 17:13:45 +03:00
Олег Хаятов
b2d70ddbf0 Merge branch 'bug/similar_products' into 'develop' 
fix sort by product type

See merge request gm/gm-backend!205
 2020-01-14 14:06:09 +00:00
a.gorbunov
7c9d9e8ed1 filter by location 2020-01-14 13:51:01 +00:00
a.gorbunov
9edd3fef18 cleanup code 2020-01-14 13:48:55 +00:00
a.gorbunov
5e5d2832cd fix sort by product type 2020-01-14 13:39:25 +00:00
dormantman
a447dfa471 Added method subscribe with code 2020-01-14 15:59:50 +03:00
Dmitriy Kuzmenko
9aeedff81e Merge branch 'develop' into phone_list 2020-01-14 15:59:46 +03:00
Dmitriy Kuzmenko
b5eb5e89b8 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-01-14 15:41:13 +03:00
Dmitriy Kuzmenko
11b55e9f4c change chosen tag functional 2020-01-14 15:40:49 +03:00
Kuroshini
1ed384ded2 fix issue w/ tags translations 2020-01-14 14:44:15 +03:00
Dmitriy Kuzmenko
bc1a9ac496 add merge migrations 2020-01-14 10:56:49 +03:00
Dmitriy Kuzmenko
387f96b8bf Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-01-14 10:53:53 +03:00
Dmitriy Kuzmenko
fb00c7c3a3 add chosen tag 2020-01-14 10:53:43 +03:00
dormantman
da1fa9d83a Added agenda creating 2020-01-13 18:59:01 +03:00
Anatoly
c1186dd597 added field - "distillery_types" to ES, change country field properties in TagCategory model 2020-01-13 17:07:42 +03:00
alex
35d9f37fab fix serializer 2020-01-13 15:47:50 +03:00
alex
605a3e12e1 phone_list field create and update 2020-01-13 15:44:51 +03:00
dormantman
fdb0892377 Update unsubscribe url 2020-01-13 15:32:40 +03:00
dormantman
3506f6b2f0 Change templates 2020-01-13 14:34:11 +03:00
dormantman
9999096320 Added actions mailing 2020-01-13 14:01:58 +03:00
dormantman
469a246f49 Added subscribes notification 2020-01-13 13:37:19 +03:00
Kuroshini
2deb4b3b7f some code improvements 2020-01-13 12:47:07 +03:00
dormantman
114304b3c9 Reformat builder method 2020-01-13 12:45:52 +03:00
dormantman
bb7cd98b98 Added news locale check 2020-01-13 12:45:52 +03:00
dormantman
f048cf2e17 Mailing fixed 2020-01-13 12:45:52 +03:00
dormantman
6c47fb404b Fix news mailing 2020-01-13 12:45:52 +03:00
Kuroshini
3d030c91fe Merge remote-tracking branch 'origin/develop' into develop 2020-01-13 12:12:15 +03:00
Kuroshini
28c674702c fix news state update 2020-01-13 12:12:01 +03:00
alex
d6345f27e2 establishment menu currency id 2020-01-13 11:56:04 +03:00
Anatoly
b2f3e1f96b added field - "distillery_types" in establishment list, detail and similar list view 2020-01-13 11:50:54 +03:00
alex
d1572cbb56 rm publish filter from BO establishment api 2020-01-13 11:25:22 +03:00
Kuroshini
2c888d1c3a default ordering for BO establishments search 2020-01-13 11:16:02 +03:00
dormantman
62a66a80fb Added agenda validation in all methods 2020-01-11 07:56:21 +03:00
dormantman
bcf73897c8 Added agenda validation 2020-01-11 07:49:50 +03:00
dormantman
6e91a2ef92 Added non-required field agenda for methods 2020-01-11 07:27:37 +03:00
Kuroshini
dabc63647d fix 2020-01-10 19:56:53 +03:00
Kuroshini
8450e48d39 remove pagination 2020-01-10 19:42:44 +03:00
Kuroshini
591b67477f subscribe info fix 2020-01-10 19:36:09 +03:00
Kuroshini
41660933db ordering for backoffice establishments 2020-01-10 18:43:26 +03:00
Kuroshini
e1d417a9e6 add created establishment field to ES 2020-01-10 18:36:57 +03:00
Anatoly
0a3fe15e9c small refactoring (/.../establishments/slug/{slug}/similar/artisans/distilleries to /.../establishments/slug/{slug}/similar/producers/distilleries) 2020-01-10 17:25:27 +03:00
Anatoly
db8917e7af added two endpoints: /.../establishments/slug/{slug}/similar/producers/food/, /.../establishments/slug/{slug}/similar/artisans/distilleries/ 2020-01-10 17:25:27 +03:00
Олег Хаятов
de35a1c0d5 Merge branch 'feature/news-subscription' into 'develop' 
Added unsubscribe action

See merge request gm/gm-backend!198
 2020-01-10 13:16:21 +00:00
dormantman
2800f2f158 Fix unsubscribe bug 2020-01-10 16:11:10 +03:00
alex
989e9f9465 last country 2020-01-10 15:57:36 +03:00
Kuroshini
e8538d4fc2 unique slugs even in the same news object 2020-01-10 15:22:17 +03:00
Anatoly
23f8c0bbcd added field address_id to request data in /api/back/establishments/ 
in Establishment make as mandatory field address
 2020-01-10 14:40:54 +03:00
alex
a16e76e393 last_ip middleware 2020-01-10 14:34:52 +03:00
alex
6ad4e0d46f last_ip 2020-01-10 14:27:00 +03:00