michail
|
7613ece6f8
|
new fix notification.py
|
2019-10-29 13:09:13 +05:00 |
|
michail
|
4a9361e04f
|
fix notification.py
|
2019-10-29 12:50:05 +05:00 |
|
Dmitriy Kuzmenko
|
0990b8e4dd
|
Merge branch 'origin/feature/migrate-etablishment' of ssh://gl.id-east.ru:222/gm/gm-backend into origin/feature/migrate-etablishment
|
2019-10-29 10:36:17 +03:00 |
|
Dmitriy Kuzmenko
|
411bef5272
|
change admin for news
|
2019-10-29 10:30:08 +03:00 |
|
alex
|
939d7f139f
|
fix max max length error
|
2019-10-29 10:20:30 +03:00 |
|
Dmitriy Kuzmenko
|
5bfbafa865
|
fix disable signal of elsatic
|
2019-10-28 17:33:53 +03:00 |
|
Dmitriy Kuzmenko
|
bff4c70fc8
|
disable signal of elsatic
|
2019-10-28 17:32:15 +03:00 |
|
alex
|
c15b5976fb
|
fix ruby schedules
|
2019-10-28 17:07:32 +03:00 |
|
Dmitriy Kuzmenko
|
be31c75c19
|
disable elastic
|
2019-10-28 14:19:22 +03:00 |
|
Dmitriy Kuzmenko
|
853b0e047e
|
add settings for dev server
|
2019-10-28 11:41:47 +03:00 |
|
alex
|
4e0f3c9a4d
|
with address
|
2019-10-28 10:59:28 +03:00 |
|
alex
|
49dbc9c72e
|
Merge remote-tracking branch 'origin/migrate-location-app' into origin/feature/migrate-etablishment
|
2019-10-28 10:22:33 +03:00 |
|
littlewolf
|
7feed3ac8f
|
Move address transfer to dictionaries
|
2019-10-28 10:14:11 +03:00 |
|
littlewolf
|
3622ac22b9
|
Add migrations
|
2019-10-28 10:13:43 +03:00 |
|
littlewolf
|
7d556df8d5
|
Add address serializer
|
2019-10-28 10:13:01 +03:00 |
|
alex
|
281d57996e
|
fix null timezone
|
2019-10-28 09:24:56 +03:00 |
|
littlewolf
|
25d58a8bc5
|
Fix and add city transfer
|
2019-10-28 07:19:17 +03:00 |
|
littlewolf
|
255b1ad5f1
|
Fix queryset conditions
|
2019-10-28 00:15:37 +03:00 |
|
littlewolf
|
0d30543664
|
Fix regions with subregions
|
2019-10-27 21:43:34 +03:00 |
|
alex
|
f146829d10
|
Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/feature/migrate-etablishment
|
2019-10-27 20:55:34 +03:00 |
|
littlewolf
|
07f226604e
|
Fix regions without subregion
|
2019-10-27 20:31:41 +03:00 |
|
littlewolf
|
0db2638eb8
|
Fix country queryset
|
2019-10-27 17:23:04 +03:00 |
|
alex
|
3b68a4dc19
|
establishment fin fix 1
|
2019-10-27 16:47:08 +03:00 |
|
alex
|
25a2edf17d
|
establishment fin
|
2019-10-27 16:23:30 +03:00 |
|
littlewolf
|
7eb241ffed
|
Tmp commit
|
2019-10-27 12:47:45 +03:00 |
|
alex
|
16f06ce2f1
|
fix news slug
|
2019-10-26 22:02:38 +03:00 |
|
alex
|
490fae3c00
|
Merge branch 'origin/feature/migration' into origin/feature/migrate-etablishment
# Conflicts:
# apps/transfer/management/commands/transfer.py
|
2019-10-26 20:47:49 +03:00 |
|
littlewolf
|
8bcf4c9ca0
|
Add child regions
|
2019-10-26 09:35:09 +03:00 |
|
littlewolf
|
cd724de65f
|
Move countries to dictionaries
|
2019-10-26 09:19:34 +03:00 |
|
littlewolf
|
06b12f9427
|
Add country transfer
|
2019-10-26 09:18:45 +03:00 |
|
littlewolf
|
7e757aa63f
|
Merge branch 'origin/feature/migration' into migrate-location-app
# Conflicts:
# apps/gallery/models.py
# apps/location/transfer_data.py
# apps/transfer/management/commands/transfer.py
# project/settings/base.py
# requirements/base.txt
|
2019-10-26 08:45:12 +03:00 |
|
littlewolf
|
e72e92244b
|
Update country serializer
|
2019-10-26 08:42:00 +03:00 |
|
michail
|
3e34dcda91
|
Merge remote-tracking branch 'origin/origin/feature/migration' into origin/feature/migration
|
2019-10-25 15:43:05 +05:00 |
|
michail
|
76d6e22fb9
|
added transfer for advertisement
|
2019-10-25 15:42:54 +05:00 |
|
littlewolf
|
abe8eae655
|
Tmp
|
2019-10-25 12:27:38 +03:00 |
|
alex
|
fc2e31a856
|
Merge branch 'feature/migration' into origin/feature/migrate-etablishment
|
2019-10-25 12:12:26 +03:00 |
|
alex
|
0f595ee40b
|
merge migrations
|
2019-10-25 12:07:02 +03:00 |
|
alex
|
09647fa4d3
|
start transfer_data
|
2019-10-25 12:03:43 +03:00 |
|
michail
|
d79946633e
|
fix get_description for recipe.py
|
2019-10-25 13:17:35 +05:00 |
|
alex
|
95811c7437
|
return to localhost
|
2019-10-25 10:33:31 +03:00 |
|
littlewolf
|
bf375f3370
|
Remove errors
Add version to timezonefinder
|
2019-10-25 10:01:30 +03:00 |
|
alex
|
cd294961e0
|
Merge remote-tracking branch 'origin/develop' into feature/migration
|
2019-10-25 10:00:25 +03:00 |
|
littlewolf
|
95b5d4ad99
|
Merge branch 'develop' into migrate-location-app
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-25 09:54:03 +03:00 |
|
littlewolf
|
c61d5321a9
|
Tmp commit
|
2019-10-25 09:52:35 +03:00 |
|
littlewolf
|
106ddb044e
|
Add country transfer
|
2019-10-25 07:48:29 +03:00 |
|
Dmitriy Kuzmenko
|
66ddfb455b
|
fix tests
|
2019-10-24 22:19:59 +03:00 |
|
Anatoly
|
81cdaa5c89
|
added image_url & preview_image_url to NewsDocument
|
2019-10-24 19:53:09 +03:00 |
|
evgeniy-st
|
2864576c0c
|
fix TimeZoneChoiceField
|
2019-10-24 17:09:08 +03:00 |
|
alex
|
287578eb9e
|
base models and funcs
|
2019-10-24 17:08:00 +03:00 |
|
Anatoly
|
84fb0aec70
|
change field parameter in model Guide (gm-241)
|
2019-10-24 16:42:08 +03:00 |
|