alex
|
dc11fb055f
|
fix news and paris establishments
|
2019-10-29 12:34:08 +03:00 |
|
alex
|
e68e33859d
|
Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/feature/migration
|
2019-10-29 12:31:32 +03:00 |
|
alex
|
b84eb68dd9
|
Merge branch 'feature/migrate-menu' into origin/feature/migration
|
2019-10-29 12:18:18 +03:00 |
|
littlewolf
|
338c4a4901
|
Add migration
|
2019-10-29 12:16:18 +03:00 |
|
littlewolf
|
099e450eb9
|
Merge branch 'add-user-old_id' into origin/feature/migrate-etablishment
|
2019-10-29 11:31:04 +03:00 |
|
littlewolf
|
72c6545a34
|
Add old_id to account_user
|
2019-10-29 11:30:33 +03:00 |
|
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 |
|
alex
|
adcc43309b
|
fix settings
|
2019-10-29 08:26:52 +03:00 |
|
alex
|
4e868c2d8d
|
transfer dishes
|
2019-10-29 08:25:03 +03:00 |
|
Kuroshini
|
4cb44aa1fc
|
Rename
|
2019-10-28 18:44:31 +03:00 |
|
Kuroshini
|
76841af575
|
Booking notes & subscriber
|
2019-10-28 18:43:41 +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 |
|
Kuroshini
|
37fb67cbb3
|
Fix subqueries
|
2019-10-28 14:40:39 +03:00 |
|
Dmitriy Kuzmenko
|
be31c75c19
|
disable elastic
|
2019-10-28 14:19:22 +03:00 |
|
Kuroshini
|
3628283105
|
Booking pre-payment more info
|
2019-10-28 13:42:59 +03:00 |
|
Anatoly
|
ed09ee78cc
|
small refactoring
|
2019-10-28 13:11:07 +03:00 |
|
Anatoly
|
65e7c965e4
|
added migrations
|
2019-10-28 12:46:10 +03:00 |
|
Anatoly
|
64b7d1469b
|
Merge branch 'develop' into feature/products
|
2019-10-28 12:36:36 +03:00 |
|
Anatoly
|
fe76fa64b5
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# celerybeat-schedule
|
2019-10-28 12:34:42 +03:00 |
|
Anatoly
|
2ebeffcf3e
|
Merge branch 'develop' of /home/a.feteleu/projects/gm-backend with conflicts.
|
2019-10-28 12:34:37 +03:00 |
|
Anatoly
|
d12df5c8e1
|
added WineAppellation model
|
2019-10-28 12:33:48 +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 |
|
Anatoly
|
e41b539ed7
|
added wine region
|
2019-10-27 18:42:51 +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 |
|
Anatoly
|
37d745eeaa
|
added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype
|
2019-10-26 18:54:22 +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 |
|