Commit Graph

311 Commits

Author SHA1 Message Date
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
Kirill
8d8a5f50fb move comments filtration from model to view 2020-02-03 10:46:44 +03:00
Anatoly
8df96716cc added endpoint to add/remove establishment from guide 2020-01-31 18:25:25 +03:00
Kuroshini
62eb5b0ccb get menus method 2020-01-30 22:06:56 +03:00
Anatoly
ca5440d431 refactored roles 2020-01-30 12:50:14 +03:00
Anatoly
25c63b8097 Merge branch 'develop' into feature/roles
# Conflicts:
#	apps/account/models.py
#	apps/collection/views/back.py
#	apps/comment/views/back.py
#	apps/establishment/models.py
#	apps/establishment/views/back.py
#	apps/news/views.py
#	apps/partner/views/back.py
2020-01-30 10:56:46 +03:00
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
dormantman
e067e8e793 Added menu upload files 2020-01-28 18:29:02 +03:00
Anatoly
236b532d98 refactored permission classes 2020-01-28 14:54:14 +03:00
Anatoly
38a6508396 modified role model 2020-01-24 18:04:32 +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
a.gorbunov
c0b517e5fe find image regexp 2020-01-20 11:04:02 +00:00
a.gorbunov
a31763c550 fix regexp for find images 2020-01-20 10:58:00 +00: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
ea485d9960 optimize images at least for establishments 2020-01-16 19:21:57 +03:00
Anatoly
017308da95 refactored news transfer 2020-01-16 14:20:07 +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
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
dormantman
d2c03b0f37 Merge remote-tracking branch 'origin/feature/auto-username' into develop 2020-01-14 21:17:17 +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
3f19699e1d supress issues w/ news images compression 2020-01-14 17:32:13 +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
alex
989e9f9465 last country 2020-01-10 15:57:36 +03:00
alex
6ad4e0d46f last_ip 2020-01-10 14:27:00 +03:00
Anatoly
75e4077917 refactored structure of XML-document 2020-01-10 13:06:17 +03:00
Anatoly
963e0597dc set username as non-required field on registration stage
(https://dev-krd.atlassian.net/browse/GM-304)
2020-01-09 17:57:10 +03:00
Anatoly
b457ffe975 small changes 2020-01-09 14:59:29 +03:00
Anatoly
d3c723eb43 intermediate commit 2019-12-30 19:07:06 +03:00
Anatoly
1468e5cdde intermediate commit 2019-12-30 18:15:55 +03:00
Anatoly
2827374911 intermediate commit 2019-12-30 13:22:57 +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
Anatoly
f42f571053 see changes 2019-12-27 15:59:15 +03:00
Anatoly
b41c185a65 see changes 2019-12-27 14:46:36 +03:00
alex
b958e0b597 preview_image fix 2019-12-27 11:16:38 +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