Sergey Melihov
|
ab5b5801fd
|
Merge branch 'feature/tag-name-indexing' into 'develop'
tag category indexing name
See merge request gm/gm-backend!65
|
2019-10-23 15:00:39 +00:00 |
|
Sergey Melihov
|
f3caf16d2c
|
Merge branch 'changes-from-gm-148' into 'develop'
Changes from gm 148
See merge request gm/gm-backend!63
|
2019-10-23 14:57:34 +00:00 |
|
Anatoly
|
a8001c44b1
|
added validation rule to NewsBackOfficeGallerySerializer
|
2019-10-23 17:50:08 +03:00 |
|
Anatoly
|
1e3c80ad0c
|
small fix
|
2019-10-23 17:40:42 +03:00 |
|
Kuroshini
|
07ac06f405
|
Update migration
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
711d536c98
|
Update migration
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
ce5987de95
|
Attach establishment timestamps as command
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
d5609e4cb8
|
Works now filter first part
|
2019-10-23 17:29:00 +03:00 |
|
Kuroshini
|
47da9929cb
|
Some fixes
|
2019-10-23 17:28:06 +03:00 |
|
Kuroshini
|
40357c20b6
|
Changes from gm-148
|
2019-10-23 17:28:06 +03:00 |
|
a.feteleu
|
b78c4f82fe
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-23 17:13:13 +03:00 |
|
Kuroshini
|
125c438f19
|
Review fix #2
|
2019-10-23 17:08:40 +03:00 |
|
a.feteleu
|
7e93aafc3f
|
added merge migrations
|
2019-10-23 17:05:37 +03:00 |
|
evgeniy-st
|
a7a83a8755
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-23 17:03:52 +03:00 |
|
evgeniy-st
|
b1169675a8
|
fix CurrencySerializer
|
2019-10-23 17:03:24 +03:00 |
|
Anatoly
|
bd3a809d85
|
fix migrations
|
2019-10-23 16:48:45 +03:00 |
|
evgeniy-st
|
d8c99062ca
|
fix singals
|
2019-10-23 16:28:42 +03:00 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
Anatoly
|
fd2c1e0ca6
|
Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/production.py
|
2019-10-23 15:37:14 +03:00 |
|
Anatoly
|
6a9f11e989
|
merge from develop
|
2019-10-23 15:31:04 +03:00 |
|
Semyon Yekhmenin
|
81bd7b4912
|
Feature/currency sign
|
2019-10-23 11:58:33 +00:00 |
|
Sergey Melihov
|
883f94c80a
|
Merge branch 'feature/password-changed-notification' into 'develop'
Feature/password changed notification
See merge request gm/gm-backend!58
|
2019-10-23 11:51:15 +00:00 |
|
Kuroshini
|
f46d4bd9f1
|
Review fix
|
2019-10-23 13:39:45 +03:00 |
|
Semyon Yekhmenin
|
538ae41d85
|
Establishments/slug/<slug> fix
|
2019-10-23 10:06:39 +00:00 |
|
evgeniy-st
|
9c9c49d900
|
update slug fields
|
2019-10-23 12:25:50 +03:00 |
|
evgeniy-st
|
64692ae4b3
|
max length of slug is 255
|
2019-10-23 12:03:50 +03:00 |
|
Anatoly
|
90e53d738d
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/main/models.py
# apps/news/admin.py
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/base.py
# project/settings/production.py
# requirements/base.txt
|
2019-10-23 12:00:58 +03:00 |
|
evgeniy-st
|
154df2b720
|
Merge branch 'develop' into feature/product
|
2019-10-23 11:35:24 +03:00 |
|
evgeniy-st
|
766b6659f1
|
Models created: Product, OnlineProduct (proxy), ProductType, ProductSubtype
|
2019-10-23 11:31:45 +03:00 |
|
Anatoly
|
97823ea601
|
change title field in model Collection to translated JSON field (gm-165)
|
2019-10-23 11:25:04 +03:00 |
|
Kuroshini
|
4a0a305e2c
|
tag category indexing name
|
2019-10-22 18:45:31 +03:00 |
|
Anatoly
|
3d68f1ba29
|
added imgae_url field to model Award (gm-183)
|
2019-10-22 18:20:34 +03:00 |
|
evgeniy-st
|
1b9df7c713
|
Merge branch 'develop' into feature/product
|
2019-10-22 17:12:59 +03:00 |
|
evgeniy-st
|
0c8959f4e7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-22 17:11:22 +03:00 |
|
evgeniy-st
|
d1c9e649b7
|
Remove metadatacontent
|
2019-10-22 17:05:54 +03:00 |
|
Semyon Yekhmenin
|
939e4a26a0
|
Feature/cities by country
|
2019-10-22 13:00:22 +00:00 |
|
evgeniy-st
|
45a3cd4b2b
|
Merge branch 'develop' into feature/product
|
2019-10-22 15:58:51 +03:00 |
|
Anatoly
|
071b634659
|
fixed EstablishmentFilter
|
2019-10-22 15:58:00 +03:00 |
|
Anatoly
|
4c9ea2e0e7
|
change field properties for Collection model
|
2019-10-22 15:45:58 +03:00 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
evgeniy-st
|
4ceb0e4d86
|
fix establishment migration
|
2019-10-21 20:22:47 +03:00 |
|
d.kuzmenko
|
18a2517fde
|
Merge branch 'feature/GM-176_standard_user' into 'develop'
Feature/gm 176 standard user
See merge request gm/gm-backend!54
|
2019-10-21 14:50:47 +00:00 |
|
Semyon Yekhmenin
|
afc2127646
|
Updated news model with agenda and banner
|
2019-10-21 14:45:34 +00:00 |
|
evgeniy-st
|
55263e4059
|
remove merge migration
|
2019-10-21 16:51:01 +03:00 |
|
evgeniy-st
|
9c80811020
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 16:50:18 +03:00 |
|
evgeniy-st
|
19caf9faa6
|
Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148
|
2019-10-21 16:48:39 +03:00 |
|
evgeniy-st
|
94502cfc73
|
added priority field to tag model (f7facf826d)
|
2019-10-21 16:47:01 +03:00 |
|
evgeniy-st
|
f96a1d4aa2
|
Revert "Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field."
This reverts commit f7facf826d.
|
2019-10-21 16:42:08 +03:00 |
|
Виктор Гладких
|
23b46e69ed
|
Fix test location
|
2019-10-21 16:28:32 +03:00 |
|
Виктор Гладких
|
d1d092e49d
|
Fix news tests
|
2019-10-21 16:21:14 +03:00 |
|