michail
|
cb3ad6bb96
|
added transfer for gallery app
|
2019-10-23 17:19:23 +05:00 |
|
michail
|
110d0872da
|
added transfer for partner app
|
2019-10-23 16:49:15 +05:00 |
|
michail
|
6c9ddfbc98
|
added transfer for recipe app
|
2019-10-23 14:42:08 +05:00 |
|
michail
|
8d0f4a8a00
|
added transfer for notification app
|
2019-10-23 14:17:34 +05: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 |
|
Anatoly
|
3d68f1ba29
|
added imgae_url field to model Award (gm-183)
|
2019-10-22 18:20:34 +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 |
|
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
|
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
|
e67516c324
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-21 16:47:58 +03:00 |
|
evgeniy-st
|
94502cfc73
|
added priority field to tag model (f7facf826d)
|
2019-10-21 16:47:01 +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 |
|
Виктор Гладких
|
1ed48a43eb
|
Fix url
|
2019-10-21 15:31:19 +03:00 |
|
Виктор Гладких
|
ee93cf9ff6
|
Fix migrate
|
2019-10-21 15:15:19 +03:00 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +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 |
|
Виктор Гладких
|
6dd66275ef
|
Fix trash
|
2019-10-21 12:18:57 +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 |
|
d.kuzmenko
|
e2cbecf9a9
|
Merge branch 'feature/error_translations_fix' into 'develop'
Login validation error message fix
See merge request gm/gm-backend!60
|
2019-10-21 08:10:32 +00:00 |
|
Semyon Yekhmenin
|
1332a8f65a
|
Login validation error message fix
|
2019-10-21 08:10:32 +00:00 |
|
Виктор Гладких
|
c8b3f922e9
|
Fix location tests
|
2019-10-21 11:08:30 +03:00 |
|
evgeniy-st
|
a9f995adbb
|
Merge branch 'feature/gm-192' into develop
|
2019-10-21 10:30:40 +03:00 |
|
evgeniy-st
|
1cd586662a
|
fix tagcategory binding serializer
|
2019-10-21 10:12:30 +03:00 |
|
littlewolf
|
7ebd338331
|
Tmp template fix
|
2019-10-21 09:59:59 +03:00 |
|
michail
|
c6750400ba
|
fix IntegerField to ForeignKey
|
2019-10-21 11:16:11 +05:00 |
|