Виктор Гладких
|
7613f67f91
|
delete celery, redis
|
2019-10-23 15:44:58 +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 |
|
Виктор Гладких
|
9588c7cd88
|
delete celery, redis
|
2019-10-23 15:35:23 +03:00 |
|
Anatoly
|
6a9f11e989
|
merge from develop
|
2019-10-23 15:31:04 +03:00 |
|
michail
|
2be7f88124
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-23 17:19:43 +05:00 |
|
michail
|
cb3ad6bb96
|
added transfer for gallery app
|
2019-10-23 17:19:23 +05:00 |
|
Виктор Гладких
|
46fdf3e55d
|
delete celery, redis
|
2019-10-23 15:15:03 +03:00 |
|
alex
|
636b15a30c
|
mysql to docker-compose
|
2019-10-23 14:59:40 +03:00 |
|
d.kuzmenko
|
1174d4e281
|
Merge branch 'feature/currency_sign' into 'develop'
Feature/currency sign
See merge request gm/gm-backend!66
|
2019-10-23 11:58:33 +00: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 |
|
evgeniy-st
|
28a4665042
|
Merge branch 'feature/establishment_by_slug_by_country_fix' into develop
|
2019-10-23 14:22:37 +03:00 |
|
Виктор Гладких
|
05cccf85ea
|
add deploy
|
2019-10-23 14:22:03 +03:00 |
|
Виктор Гладких
|
239ebc1dd6
|
add deploy
|
2019-10-23 14:11:02 +03:00 |
|
Kuroshini
|
f46d4bd9f1
|
Review fix
|
2019-10-23 13:39:45 +03:00 |
|
e.stoyushko
|
5afc257c13
|
Merge branch 'feature/establishment_by_slug_by_country_fix' into 'develop'
Establishments/slug/<slug> fix
See merge request gm/gm-backend!57
|
2019-10-23 10:06:39 +00:00 |
|
Semyon Yekhmenin
|
538ae41d85
|
Establishments/slug/<slug> fix
|
2019-10-23 10:06:39 +00:00 |
|
evgeniy-st
|
083c8a7eaa
|
same queryset for Establishment list and detail views
|
2019-10-23 13:00:39 +03:00 |
|
michail
|
6c9ddfbc98
|
added transfer for recipe app
|
2019-10-23 14:42:08 +05:00 |
|
evgeniy-st
|
6f2a2e537d
|
Merge branch 'develop' into feature/establishment_by_slug_by_country_fix
|
2019-10-23 12:35:22 +03: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 |
|
Виктор Гладких
|
c1b5174518
|
add deploy
|
2019-10-23 12:15:00 +03:00 |
|
Виктор Гладких
|
ed551ea1ab
|
add deploy
|
2019-10-23 12:14:21 +03:00 |
|
evgeniy-st
|
64692ae4b3
|
max length of slug is 255
|
2019-10-23 12:03:50 +03:00 |
|
Виктор Гладких
|
4d1d16637e
|
add deploy
|
2019-10-23 12:01:46 +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 |
|
Виктор Гладких
|
1b218a5c07
|
Fix fab
|
2019-10-23 11:51:25 +03:00 |
|
Виктор Гладких
|
7ed853e7a4
|
Fix fab
|
2019-10-23 11:44:59 +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 |
|
Виктор Гладких
|
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 |
|