Commit Graph

1137 Commits

Author SHA1 Message Date
alex
8c3306628e news transfer 2019-10-30 15:48:32 +03:00
alex
c521839389 news refactor 2019-10-30 13:53:12 +03:00
alex
e524483ed0 fix ass_publish_data 2019-10-30 08:03:30 +03:00
alex
a0c52d8ef9 Merge remote-tracking branch 'origin/origin/migration_fix' into migration_fix 2019-10-29 21:57:07 +03:00
Dmitriy Kuzmenko
a3bf921771 fix timezone 2019-10-29 21:54:59 +03:00
alex
0a7a5e57f4 Merge remote-tracking branch 'origin/migration_fix' into migration_fix 2019-10-29 21:54:14 +03:00
alex
55bdc7771f add image to establishment 2019-10-29 21:54:03 +03:00
Anatoly
5675f23fae fixed BaseModelAdminMixin 2019-10-29 18:12:52 +03:00
Dmitriy Kuzmenko
c32b665b92 enable elastic 2019-10-29 17:17:24 +03:00
alex
b41ec3eebd add is_publish 2019-10-29 17:16:51 +03:00
alex
59371fae9a Merge remote-tracking branch 'origin/origin/migration_fix' into migration_fix 2019-10-29 16:43:27 +03:00
alex
f929c096bc add subtitle like a description 2019-10-29 16:42:43 +03:00
Dmitriy Kuzmenko
e270131679 Merge branch 'develop' into origin/migration_fix 2019-10-29 15:27:40 +03:00
Dmitriy Kuzmenko
8fd14f2f44 Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/migration_fix 2019-10-29 15:27:19 +03:00
Dmitriy Kuzmenko
03bf648ef9 add change admin for establishments 2019-10-29 15:08:54 +03:00
Dmitriy Kuzmenko
30ba313f54 add filter accounts for existing users 2019-10-29 14:47:57 +03:00
Dmitriy Kuzmenko
631ffd265a add mixin for admin panel 2019-10-29 14:46:44 +03:00
Dmitriy Kuzmenko
97f75dfc05 add filter accounts for existing users 2019-10-29 14:32:51 +03:00
Anatoly
8cf2cebe85 added BaseModelAdminMixin 2019-10-29 14:01:27 +03:00
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
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