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 |
|
Виктор Гладких
|
d6a9fa6ac0
|
pwd
|
2019-10-23 11:18:26 +03:00 |
|
Виктор Гладких
|
fd65c98660
|
pwd
|
2019-10-23 11:12:53 +03:00 |
|
michail
|
1264ba963f
|
edited get_username because nickname from legacy is not unique
|
2019-10-23 13:12:13 +05:00 |
|
Виктор Гладких
|
1755c192b6
|
pwd
|
2019-10-23 11:10:15 +03:00 |
|
Виктор Гладких
|
5c7af176fd
|
pwd
|
2019-10-23 11:09:11 +03:00 |
|
Виктор Гладких
|
cddab519e4
|
pwd
|
2019-10-23 11:07:01 +03:00 |
|
Виктор Гладких
|
dd7a578a12
|
pwd
|
2019-10-23 11:04:52 +03:00 |
|
Виктор Гладких
|
78209a1101
|
pwd
|
2019-10-23 11:02:43 +03:00 |
|
Виктор Гладких
|
89c949c12c
|
Fix
|
2019-10-23 10:59:04 +03:00 |
|
Виктор Гладких
|
0961d3ee73
|
Fix
|
2019-10-23 10:57:08 +03:00 |
|
Виктор Гладких
|
fea2764bde
|
Fix
|
2019-10-23 10:51:09 +03:00 |
|
Виктор Гладких
|
f11a194eb2
|
Fix
|
2019-10-23 10:49:41 +03:00 |
|
Виктор Гладких
|
19facc3b94
|
Fix
|
2019-10-23 10:46:56 +03:00 |
|
Виктор Гладких
|
9383c806b0
|
Fix
|
2019-10-23 10:45:29 +03:00 |
|
Виктор Гладких
|
1887806fec
|
Fix commit
|
2019-10-23 10:40:59 +03:00 |
|
Виктор Гладких
|
778162922e
|
Test runner
|
2019-10-23 10:39:10 +03: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 |
|
e.stoyushko
|
7b3a379b3f
|
Merge branch 'feature/cities_by_country' into 'develop'
Feature/cities by country
See merge request gm/gm-backend!62
|
2019-10-22 13:00:22 +00: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 |
|
v.gladkikh
|
e1e3799c5f
|
Update .gitlab-ci.yml
|
2019-10-22 12:49:47 +00:00 |
|
Anatoly
|
4c9ea2e0e7
|
change field properties for Collection model
|
2019-10-22 15:45:58 +03:00 |
|
v.gladkikh
|
e70efe3609
|
Update .gitlab-ci.yml
|
2019-10-22 12:45:53 +00:00 |
|
v.gladkikh
|
ba58b74fdf
|
Update .gitlab-ci.yml
|
2019-10-22 12:44:48 +00:00 |
|
Виктор Гладких
|
307abddbbf
|
1
|
2019-10-22 15:43:26 +03:00 |
|
Виктор Гладких
|
580081f76d
|
1
|
2019-10-22 15:41:10 +03:00 |
|
Виктор Гладких
|
386e7d1bf8
|
First CI
|
2019-10-22 15:39:51 +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 |
|
e.stoyushko
|
42e822e5c1
|
Merge branch 'feature/news_model_update' into 'develop'
Updated news model with agenda and banner
See merge request gm/gm-backend!61
|
2019-10-21 14:45:34 +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 |
|