Commit Graph

326 Commits

Author SHA1 Message Date
a.gorbunov
c6e12f3320 must_of_the_week behaviour for update. public_mark has been returned 2020-02-08 10:37:28 +00:00
Олег Хаятов
ae71fde843 Merge branch 'fix_news_slug_unique' into 'develop'
Fix news slug unique

See merge request gm/gm-backend!269
2020-02-07 14:06:58 +00:00
Dmitry Borzenin
afc39a6257 Add comments on create_duplicate and NewsSlug parser 2020-02-07 16:53:25 +03:00
Dmitry Borzenin
73a5f9dc09 Refactoring in NewsSlag parser 2020-02-07 16:51:22 +03:00
Dmitry Borzenin
6645b590b8 Add Parser for News slug 2020-02-07 15:52:25 +03:00
Олег Хаятов
6868f75dc8 Merge branch 'feature/fields_for_establishment' into 'develop'
Feature/fields for establishment

See merge request gm/gm-backend!268
2020-02-07 11:50:42 +00:00
a.gorbunov
f854cd6ba5 last update by for establishment 2020-02-07 11:41:49 +00:00
alex
e4547b9554 active to carousel serializer 2020-02-07 14:09:53 +03:00
a.gorbunov
5b6db0f974 must of the week mark 2020-02-07 10:40:30 +00:00
a.gorbunov
0eb6a73e09 Carousel mixin 2020-02-07 10:25:52 +00:00
Anatoly
26b7ef8ad6 added a documentation for awards 2020-02-07 12:33:15 +03:00
Anatoly
14da53ed94 refactored permission a little 2020-02-07 09:44:11 +03:00
Anatoly
8993ec1097 added documentation for /api/back/establishments/employees/<id>/ 2020-02-06 11:19:41 +03:00
Anatoly
8eb07205e1 added report app 2020-02-05 16:46:30 +03:00
a.gorbunov
a3a66a88e6 allow bind or remove award for establishment 2020-02-05 12:31:02 +00: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
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