Commit Graph

3204 Commits

Author SHA1 Message Date
Anatoly
421ec5c73c refactored serializer 2020-01-31 13:50:42 +03:00
Kuroshini
4a1e0a347c remove pagination for tag categories in BO 2020-01-31 13:47:50 +03:00
Anatoly
08831de43a refactored a little 2020-01-31 13:43:44 +03:00
Anatoly
095cc2cb91 fix 2020-01-31 13:38:07 +03:00
Anatoly
fb1eee3e4c added hardcoded calling number for Antilles Guyane West Indies islands 2020-01-31 13:36:41 +03:00
Anatoly
11e037f699 modified permissions for tags 2020-01-31 13:21:00 +03:00
Anatoly
2544f8ef5b added flag is_superuser to UserDetailView 2020-01-31 13:06:03 +03:00
Anton Gorbunov
ac53543dc7 Merge branch 'bug/fix-related-objects-for-collections' into 'develop'
check before get related_objects

See merge request gm/gm-backend!252
2020-01-31 08:49:15 +00:00
a.gorbunov
4ba2edecd0 check before get related_objects 2020-01-31 08:48:36 +00:00
Kuroshini
c6413c7493 subtypes for establishment back 2020-01-31 11:42:44 +03:00
Anatoly
57cf90c631 added merge migrations 2020-01-31 11:35:49 +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
alex
d3bf68ab09 add_confirmed_at command 2020-01-31 11:25:38 +03:00
alex
c3cc87507e confirmed at for csv users 2020-01-31 09:03:15 +03:00
dormantman
982a52ab96 Added guides binding objects 2020-01-31 04:29:50 +03:00
Kuroshini
22ee06403f menu create 2020-01-31 01:04:39 +03:00
dormantman
4d2d08a6f4 Added auto type 2020-01-31 00:35:51 +03:00
Kuroshini
f83c7273d2 smol fixes 2020-01-31 00:27:40 +03:00
Kuroshini
10620ac881 fix set uploaded files #2 2020-01-31 00:16:52 +03:00
Kuroshini
47f8905832 fix set uploaded files 2020-01-31 00:16:52 +03:00
Kuroshini
ae9d505e3d create and update 2020-01-31 00:16:52 +03:00
Kuroshini
39cdd18392 fix serializer 2020-01-31 00:16:52 +03:00
Kuroshini
e1b3908e00 serializer for menu uploads BO 2020-01-31 00:16:15 +03:00
dormantman
a0408204a1 Added MenuFiles serializer 2020-01-31 00:13:15 +03:00
dormantman
fbed631f40 Merge branch 'feature/menus-for-dima' of https://gl.id-east.ru/gm/gm-backend into feature/menus-for-dima
 Conflicts:
	apps/establishment/serializers/back.py
2020-01-30 22:25:25 +03:00
dormantman
5aa831ee3c Added MenuFiles serializer 2020-01-30 22:16:11 +03:00
Kuroshini
3e0c05c541 fix serializer 2020-01-30 22:11:07 +03:00
Kuroshini
62eb5b0ccb get menus method 2020-01-30 22:06:56 +03:00
Kuroshini
a6fc88fdb9 lunch & diner fields 2020-01-30 21:55:20 +03:00
dormantman
07cfcb08d7 Added uploads to menu 2020-01-30 21:49:31 +03:00
dormantman
b94e933cb1 Added migration 2020-01-30 20:58:45 +03:00
dormantman
14d9b32479 Revert serializer/routes/view/model 2020-01-30 20:45:07 +03:00
Kuroshini
bf941d8755 fix agenda migration 2020-01-30 19:48:21 +03:00
Kuroshini
9d62c062bb migration for agenda 2020-01-30 19:45:13 +03:00
Kuroshini
3b8a28d599 agenda address is string now 2020-01-30 19:43:38 +03:00
Anatoly
ced3abe3cf added command to set the calling code for countries, modified setup_clean_db transfer, modified serializers 2020-01-30 17:57:53 +03:00
Kuroshini
ac606d14f8 swagger 2020-01-30 17:16:15 +03:00
alex
d60e46419b Merge remote-tracking branch 'origin/develop' into develop 2020-01-30 17:01:39 +03:00
alex
40fa4c543b roles for user csv 2020-01-30 17:01:27 +03:00
Kuroshini
0487e7c8dd reword status translation 2020-01-30 16:46:30 +03:00
Kuroshini
442e26cfe4 partners web 2020-01-30 16:37:48 +03:00
Anatoly
e6de2cc4f9 fix method 2020-01-30 16:28:32 +03:00
Anatoly
7541909390 added merge migration 2020-01-30 16:19:15 +03:00
Anatoly
13cc40c19c added transfer for table - a la cartes 2020-01-30 16:17:30 +03:00
Kuroshini
973ad80073 filter partners and sponsors 2020-01-30 16:12:17 +03:00
Kuroshini
f8aab86f3c fix serializer 2020-01-30 15:45:51 +03:00
Kuroshini
1e126d3b1f migraion for partners 2020-01-30 15:44:33 +03:00
Kuroshini
632233d930 partners remastered (moved fields to binding table) 2020-01-30 15:43:25 +03:00
dormantman
f05fab8329 Reformat establishment back serializer 2020-01-30 15:07:46 +03:00
alex
ca29e9b02a Merge remote-tracking branch 'origin/develop' into develop 2020-01-30 14:42:37 +03:00