alex
|
2a9ef2c704
|
refactor location transfer 1
|
2020-02-03 16:57:00 +03:00 |
|
alex
|
3c56b0c061
|
refactor account transfer
|
2020-02-03 12:32:53 +03:00 |
|
Kuroshini
|
2f4bda9a3a
|
fix comments mark transfer
|
2020-01-31 20:32:18 +03:00 |
|
Kuroshini
|
1794de6d15
|
news transfer fix
|
2020-01-31 18:52:19 +03:00 |
|
Anatoly
|
45f65658f0
|
added "status" field to Establishment model, refactored serializers and filters associated with field "is_publish", modified transfer
|
2020-01-31 11:34:06 +03:00 |
|
Anatoly
|
13cc40c19c
|
added transfer for table - a la cartes
|
2020-01-30 16:17:30 +03:00 |
|
Kuroshini
|
632233d930
|
partners remastered (moved fields to binding table)
|
2020-01-30 15:43:25 +03:00 |
|
Kuroshini
|
042d749d77
|
added pictures route && removed partners pictures duplicates
|
2020-01-29 17:53:25 +03:00 |
|
Kuroshini
|
38d2e002b7
|
partners transfer
|
2020-01-29 17:16:42 +03:00 |
|
Kuroshini
|
65b0b56c71
|
transfer partners
|
2020-01-29 17:15:12 +03:00 |
|
Kuroshini
|
917e500838
|
partners transfer
|
2020-01-29 17:07:06 +03:00 |
|
Kuroshini
|
869aa7b4f4
|
partners transfer
|
2020-01-29 17:02:58 +03:00 |
|
Kuroshini
|
45acfa37c9
|
partners transfer
|
2020-01-29 17:00:19 +03:00 |
|
Kuroshini
|
4fde19d23e
|
fix partner transfer
|
2020-01-29 16:53:04 +03:00 |
|
Kuroshini
|
24f4abc76d
|
fix transfer partners
|
2020-01-28 21:18:25 +03:00 |
|
Anatoly
|
36c4641ed0
|
fix plates transfer
|
2020-01-24 17:49:42 +03:00 |
|
Anatoly
|
de78ee5d6e
|
added field phone to User model, change establishment transfer, added filters (full-text search, role_country_code, country_code), change account serializers
|
2020-01-21 17:36:31 +03:00 |
|
Anatoly
|
f86357e041
|
fix comments
|
2020-01-15 22:31:30 +03:00 |
|
Anatoly
|
59c9c06d64
|
fix transfer location
|
2020-01-15 16:46:12 +03:00 |
|
Kuroshini
|
ad21b6eb24
|
transfer tags with translations
|
2019-12-30 17:31:09 +03:00 |
|
Dmitriy Kuzmenko
|
e2d71fca8f
|
Merge branch 'develop' into feature/guides
|
2019-12-27 18:00:20 +03:00 |
|
alex
|
0152538333
|
author for review text
|
2019-12-26 10:33:27 +03:00 |
|
Anatoly
|
1189b6ff58
|
see changes
|
2019-12-26 10:24:08 +03:00 |
|
Anatoly
|
858b6f3544
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/serializers/news.py
# apps/utils/models.py
|
2019-12-24 12:10:16 +03:00 |
|
alex
|
17fdc7705e
|
news transfer fin
|
2019-12-23 11:53:34 +03:00 |
|
alex
|
56b2b243da
|
Merge remote-tracking branch 'origin/develop' into nes_transfer
|
2019-12-23 08:28:28 +03:00 |
|
Kuroshini
|
ee8d133248
|
Example for tags creation
|
2019-12-20 20:11:58 +03:00 |
|
alex
|
2499c0406d
|
news transfer serializer
|
2019-12-20 16:19:04 +03:00 |
|
littlewolf
|
3dd76503a5
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/management/commands/transfer.py
|
2019-12-20 11:55:23 +03:00 |
|
littlewolf
|
819e4366f7
|
Fix locatioin
Add decorator to log
|
2019-12-20 11:52:40 +03:00 |
|
alex
|
ffa8409032
|
fix establishment description
|
2019-12-18 12:43:18 +03:00 |
|
Anatoly
|
471239983e
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/views/back.py
# apps/transfer/models.py
|
2019-12-17 14:47:26 +03:00 |
|
alex
|
1c00cc7eae
|
fix news transfer
|
2019-12-17 09:24:17 +03:00 |
|
Anatoly
|
f861aa419c
|
refactored transfer location serializers
|
2019-12-16 17:47:01 +03:00 |
|
alex
|
6c483dd228
|
recipe transfer
|
2019-12-16 17:02:20 +03:00 |
|
littlewolf
|
4c27ad5d5a
|
Fix location address transfer
|
2019-12-16 15:37:29 +03:00 |
|
littlewolf
|
eb514c0ce2
|
Add clean db setup
|
2019-12-13 12:16:02 +03:00 |
|
Anatoly
|
1b7c83899a
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-11 15:01:17 +03:00 |
|
Anatoly
|
ab82d9a2d6
|
refactoring guide and collection endpoints
|
2019-12-10 16:24:37 +03:00 |
|
Kuroshini
|
912431690d
|
rename attrs #2
|
2019-12-09 15:21:39 +03:00 |
|
Anatoly
|
d330aa5205
|
refactoring
|
2019-12-09 13:34:17 +03:00 |
|
littlewolf
|
c480089f30
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# _dockerfiles/db/Dockerfile
# apps/transfer/management/commands/transfer.py
# docker-compose.mysql.yml
# project/settings/local.py
|
2019-12-09 10:41:01 +03:00 |
|
Dmitriy Kuzmenko
|
c62b4016f1
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-05 15:23:24 +03:00 |
|
Dmitriy Kuzmenko
|
f06596b5b6
|
fix review
|
2019-12-05 15:23:16 +03:00 |
|
Anatoly
|
9dc8e34e3a
|
Merge branch 'develop' into feature/transfer-guide
# Conflicts:
# apps/establishment/models.py
# apps/establishment/serializers/common.py
|
2019-12-04 20:16:21 +03:00 |
|
Anatoly
|
29ff10fb4b
|
added wine origins
|
2019-12-04 20:13:09 +03:00 |
|
Anatoly
|
627f7562ec
|
finalizing transfer guides
|
2019-12-04 14:21:54 +03:00 |
|
Dmitriy Kuzmenko
|
637903e613
|
fix scheduler
|
2019-12-03 15:15:02 +03:00 |
|
Dmitriy Kuzmenko
|
b6d0815ed0
|
add news author migration
|
2019-12-03 09:59:11 +03:00 |
|
littlewolf
|
4c273a00be
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-02 15:29:14 +03:00 |
|