Commit Graph

411 Commits

Author SHA1 Message Date
Anatoly
a6cfa2ec58 redefine EMAIL_TECHNICAL_SUPPORT variable in development use 2020-02-07 16:02:51 +03:00
Anatoly
a9f3d3de46 added report template and enabled send an report emails 2020-02-06 17:16:37 +03:00
Anatoly
cd766e6bbf added documentation for /api/back/establishments/<id>/employees/ 2020-02-06 13:12:10 +03:00
Anatoly
8eb07205e1 added report app 2020-02-05 16:46:30 +03:00
Kuroshini
c9cf2672b6 establishment team role revoked email 2020-02-05 14:18:46 +03:00
Kuroshini
8e22119de9 team 2020-02-05 13:32:50 +03:00
Anatoly
b421b934c1 refactored guides 2020-02-05 12:16:07 +03:00
Kuroshini
ec1caeced3 invite existing user email 2020-02-04 22:02:40 +03:00
Kuroshini
fd4b6a68b1 email on new user 2020-02-04 21:30:19 +03:00
Anatoly
400b5ac402 change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random 2020-02-03 17:16:40 +03:00
Anatoly
15b8241213 refactored serializers that retrieving phone numbers 2020-02-03 13:11:13 +03:00
Anatoly
b518faaf8b added DEFAULT_CALLING_CODE_ANTILLES_GUYANE_WEST_INDIES param, refactored serializers 2020-01-31 14:52:35 +03:00
Anatoly
08831de43a refactored a little 2020-01-31 13:43:44 +03:00
Anatoly
ced3abe3cf added command to set the calling code for countries, modified setup_clean_db transfer, modified serializers 2020-01-30 17:57:53 +03:00
Kuroshini
0487e7c8dd reword status translation 2020-01-30 16:46:30 +03:00
Anatoly
7541909390 added merge migration 2020-01-30 16:19:15 +03:00
dormantman
214c579701 Update django locales (for subscriptions) 2020-01-30 04:24:29 +03:00
Kuroshini
9af6458dff translations for news types 2020-01-28 18:21:05 +03:00
evgeniy-st
0216cadd85 remove sentry 2020-01-23 10:02:19 +03:00
Kuroshini
a9acbf3955 fix configs 2020-01-22 21:07:01 +03:00
Kuroshini
e94dd03875 disable news_type update post save 2020-01-22 20:52:15 +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
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
918c1fa17d middleware to log db queries 2020-01-17 20:21:59 +03:00
Kuroshini
127d15b181 try to fix performance issues
(cherry picked from commit 964ead1)
2020-01-16 12:14:04 +03:00
Anatoly
1ba660b5fd add verification code to confirm email template 2020-01-15 14:48:50 +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
a.gorbunov
c110dc3b96 optimize collection images 2020-01-14 18:18:17 +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
Kuroshini
f93337def3 Merge branch 'feature/news-subscription' into develop 2020-01-13 15:38:16 +03:00
dormantman
fdb0892377 Update unsubscribe url 2020-01-13 15:32:40 +03:00
Kuroshini
85f49b5cf6 Merge branch 'feature/news-subscription' into develop 2020-01-13 14:05:41 +03:00
dormantman
469a246f49 Added subscribes notification 2020-01-13 13:37:19 +03:00
Kuroshini
9b2ad2a6dd try new email settings for dev 2020-01-13 13:37:11 +03:00
alex
a16e76e393 last_ip middleware 2020-01-10 14:34:52 +03:00
Anatoly
a59016944c Merge branch 'develop' into feature/guides 2020-01-09 15:00:58 +03:00
Anatoly
b457ffe975 small changes 2020-01-09 14:59:29 +03:00
Kuroshini
7edd836a75 helping hand representation 2019-12-31 01:22:45 +03:00
Dmitriy Kuzmenko
e2d71fca8f Merge branch 'develop' into feature/guides 2019-12-27 18:00:20 +03:00
Dmitriy Kuzmenko
ccd9f717df Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
#	apps/utils/export.py
2019-12-27 17:59:20 +03:00
Dmitriy Kuzmenko
d09776c8fa add xml 2019-12-27 17:57:16 +03:00
Anatoly
151c017561 see changes 2019-12-27 17:49:56 +03:00
alex
e3d7618c62 preview_image to establishment and product type and subtype 2019-12-27 09:47:48 +03:00
Dmitriy Kuzmenko
02d0112d8b add export for guides 2019-12-26 18:11:48 +03:00
Anatoly
986936fdf5 Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
#	apps/collection/views/back.py
2019-12-25 22:15:22 +03:00
Dmitriy Kuzmenko
d7c7880860 add counter for public_mark and change Guid serializer 2019-12-25 15:19:43 +03:00
d.kuzmenko
6a68042178 Merge branch 'feature/permission_liquor' into 'develop'
Feature/permission liquor

See merge request gm/gm-backend!175
2019-12-23 13:40:13 +00:00
Kuroshini
0f0a3f9577 hardcoded tags 2019-12-20 21:10:28 +03:00