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
|
1ba660b5fd
|
add verification code to confirm email template
|
2020-01-15 14:48:50 +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 |
|
Anton Gorbunov
|
48e15a047a
|
Merge branch 'bug/news_optimize' into 'develop'
fix regex for find images
See merge request gm/gm-backend!209
|
2020-01-15 07:02:42 +00:00 |
|
a.gorbunov
|
7bc998ca94
|
fix regex for find images
|
2020-01-15 06:57:59 +00:00 |
|
Anton Gorbunov
|
0b92451129
|
Merge branch 'bug/news_optimize' into 'develop'
fix regex for find images
See merge request gm/gm-backend!206
|
2020-01-15 06:50:29 +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 |
|
Kuroshini
|
80dec0b6ee
|
compress images with data transfer
|
2020-01-14 17:20:41 +03:00 |
|
dormantman
|
6dda459cc8
|
Fixed user authenticated
|
2020-01-14 17:18:41 +03:00 |
|