Виктор Гладких
|
df52c8a582
|
Add merged migrations
|
2019-10-24 15:34:35 +03:00 |
|
alex
|
a667655c09
|
pprint
|
2019-10-24 15:32:47 +03:00 |
|
alex
|
6335abe1ea
|
states dict fix
|
2019-10-24 15:24:31 +03:00 |
|
Semyon Yekhmenin
|
2b9c9d14ef
|
Added temporary stub for international news logic (hardcoded news id's)
|
2019-10-24 12:21:59 +00:00 |
|
Kuroshini
|
8c5d59e6bf
|
Revert "return fields"
This reverts commit 55ea169
|
2019-10-24 15:16:51 +03:00 |
|
alex
|
5826fb2475
|
mysql to docker-compose fix exception
|
2019-10-24 14:49:59 +03:00 |
|
Kuroshini
|
55ea169dce
|
return fields
|
2019-10-24 14:14:53 +03:00 |
|
Semyon Yekhmenin
|
74b2b52ee1
|
Added currency to establishment model
|
2019-10-24 11:06:58 +00:00 |
|
alex
|
3ce7e186f7
|
migrate from legacy news
|
2019-10-24 14:01:38 +03:00 |
|
alex
|
0adac058c5
|
Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-24 13:11:05 +03:00 |
|
evgeniy-st
|
636bc43a35
|
remove playlist from news model
|
2019-10-24 12:38:44 +03:00 |
|
alex
|
647147bf03
|
Merge branch 'develop' into feature/migrate-news
|
2019-10-24 12:28:51 +03:00 |
|
Anatoly
|
7b10a71cf6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-10-24 12:18:19 +03:00 |
|
Anatoly
|
7fa52d770e
|
added missing migration for app news
|
2019-10-24 12:17:58 +03:00 |
|
evgeniy-st
|
6c4f1a2e40
|
Fix news serializer
|
2019-10-24 12:08:44 +03:00 |
|
evgeniy-st
|
0edc2fae38
|
Clean news serializer
|
2019-10-24 12:03:41 +03:00 |
|
a.feteleu
|
3d301cb931
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-24 11:34:12 +03:00 |
|
a.feteleu
|
2756529c7f
|
fix migrations in userroles
|
2019-10-24 11:34:00 +03:00 |
|
Semyon Yekhmenin
|
890d1004e1
|
Added view for chosen tags
|
2019-10-24 07:44:47 +00:00 |
|
Kuroshini
|
bc50f118b8
|
Merge branch 'feature/tag-name-indexing' into develop
|
2019-10-23 18:09:41 +03:00 |
|
Kuroshini
|
b2341194bc
|
fix serializer
|
2019-10-23 18:08:43 +03:00 |
|
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 |
|
michail
|
cb3ad6bb96
|
added transfer for gallery app
|
2019-10-23 17:19:23 +05: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 |
|
michail
|
110d0872da
|
added transfer for partner app
|
2019-10-23 16:49:15 +05: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 |
|
michail
|
6c9ddfbc98
|
added transfer for recipe app
|
2019-10-23 14:42:08 +05:00 |
|
evgeniy-st
|
9c9c49d900
|
update slug fields
|
2019-10-23 12:25:50 +03:00 |
|
michail
|
8d0f4a8a00
|
added transfer for notification app
|
2019-10-23 14:17:34 +05: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 |
|
michail
|
1264ba963f
|
edited get_username because nickname from legacy is not unique
|
2019-10-23 13:12:13 +05:00 |
|
michail
|
6dd4e1af33
|
Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects
|
2019-10-23 12:18:39 +05:00 |
|
michail
|
9e6d01b1bd
|
prototype for transfer account
|
2019-10-23 12:18:25 +05:00 |
|
littlewolf
|
fed2aae7f1
|
Fix settings/base
Add transfer_data to location
|
2019-10-23 09:30:36 +03:00 |
|
littlewolf
|
f09bd5996a
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# project/settings/base.py
# requirements/base.txt
|
2019-10-23 09:27:42 +03:00 |
|
littlewolf
|
915683fa7b
|
Remove comments
|
2019-10-23 09:16:39 +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 |
|
michail
|
5043462095
|
prototype
|
2019-10-22 17:11:45 +05: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 |
|
littlewolf
|
786ee03d8e
|
Fix
|
2019-10-21 17:24:30 +03:00 |
|
littlewolf
|
863762bdf2
|
Fix state
|
2019-10-21 17:23:50 +03:00 |
|
littlewolf
|
21f10d06f2
|
Fix state
|
2019-10-21 17:22:28 +03: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 |
|
Виктор Гладких
|
87708df084
|
Fix test establishment
|
2019-10-21 16:11:28 +03:00 |
|
Виктор Гладких
|
adbc22f1f6
|
Fix comment test
|
2019-10-21 16:03:19 +03:00 |
|
Виктор Гладких
|
196d335213
|
Fix
|
2019-10-21 15:47:06 +03:00 |
|
Виктор Гладких
|
f65af6f7cf
|
Merge branch 'feature/GM-176_standard_user' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/GM-176_standard_user
|
2019-10-21 15:44:54 +03:00 |
|
Виктор Гладких
|
4f02fef456
|
Fix migrate
|
2019-10-21 15:44:20 +03:00 |
|
michail
|
4d3ecb65f2
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-21 17:32:02 +05:00 |
|
michail
|
e7107cfd04
|
fixes of news
|
2019-10-21 17:31:44 +05:00 |
|
Виктор Гладких
|
ee93cf9ff6
|
Fix migrate
|
2019-10-21 15:15:19 +03:00 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +03:00 |
|
Kuroshini
|
cc5249674d
|
merge migrations
|
2019-10-21 14:39:23 +03:00 |
|
Виктор Гладких
|
019c22a0c8
|
Fix test
|
2019-10-21 14:39:04 +03:00 |
|
littlewolf
|
3f85aa84cc
|
Remove tmp code
|
2019-10-21 14:19:01 +03:00 |
|
Виктор Гладких
|
3720ac2b8e
|
Fix collection test
|
2019-10-21 12:17:12 +03:00 |
|
Виктор Гладких
|
f338906736
|
Fix location tests
|
2019-10-21 11:44:47 +03:00 |
|
Виктор Гладких
|
c8b3f922e9
|
Fix location tests
|
2019-10-21 11:08:30 +03:00 |
|