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 |
|
Виктор Гладких
|
2e99431bdd
|
elastic
|
2019-10-23 17:25:28 +03:00 |
|
Виктор Гладких
|
1092ec1884
|
delete celery, redis
|
2019-10-23 17:24:21 +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 |
|
Виктор Гладких
|
40e64eafe7
|
delete celery, redis
|
2019-10-23 17:08:44 +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 |
|
Виктор Гладких
|
d1e40101b4
|
delete celery, redis
|
2019-10-23 16:59:11 +03:00 |
|
Виктор Гладких
|
1f44f21ede
|
delete celery, redis
|
2019-10-23 16:52:12 +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 |
|
Виктор Гладких
|
649fcc6793
|
delete celery, redis
|
2019-10-23 16:25:57 +03:00 |
|
a.feteleu
|
2058ad09c6
|
Merge branch 'feature/gm-148' into 'develop'
Feature/gm 148
See merge request gm/gm-backend!67
|
2019-10-23 13:08:00 +00:00 |
|
alex
|
72a84d39db
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-23 16:07:05 +03:00 |
|
alex
|
938279bd7a
|
mysql to docker-compose.mysql
|
2019-10-23 16:06:54 +03:00 |
|
Виктор Гладких
|
5668da8e79
|
delete celery, redis
|
2019-10-23 16:03:50 +03:00 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
Виктор Гладких
|
052ff07ac7
|
delete celery, redis
|
2019-10-23 15:47:51 +03:00 |
|
Виктор Гладких
|
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 |
|