Commit Graph

Select branches

Hide Pull Requests

develop

Mono Color

• 33942b70b5 Merge branch 'bug-only_waiting_comments_v2' into 'develop' Олег Хаятов 2020-02-03 09:00:25 +0000
• 227b3746ca fix city transfer Anatoly 2020-02-03 11:03:15 +0300
• 8d8a5f50fb move comments filtration from model to view Kirill 2020-02-03 10:46:44 +0300
• 2dc1674f81 Merge branch 'bug-collections_sorting' into 'develop' Олег Хаятов 2020-02-03 07:21:39 +0000
• 287c538294 dish update-delete Kuroshini 2020-02-01 16:01:40 +0300
• 662a1427cd dish create view Kuroshini 2020-02-01 15:34:45 +0300
• 1876ca8c6d backoffice wine for establishment Kuroshini 2020-02-01 14:53:35 +0300
• 804164833a fix typo Kuroshini 2020-02-01 14:02:29 +0300
• cbad99e3ac read file name Kuroshini 2020-02-01 13:58:42 +0300
• 8488449cca card and wines getter Kuroshini 2020-02-01 13:32:20 +0300
• a9ad3ef7e7 card_and_wines get method Kuroshini 2020-01-31 21:19:16 +0300
• f67c8b08a5 Alter comment validator dormantman 2020-01-31 20:49:59 +0300
• 2f4bda9a3a fix comments mark transfer Kuroshini 2020-01-31 20:32:11 +0300
• a544810cac Alter location field dormantman 2020-01-31 19:10:40 +0300
• 1794de6d15 news transfer fix Kuroshini 2020-01-31 18:52:19 +0300
• 45f09094f8 try to return recipes Kuroshini 2020-01-31 18:45:20 +0300
• 8df96716cc added endpoint to add/remove establishment from guide Anatoly 2020-01-31 18:25:06 +0300
• 97588f1efc change start to created sorting Kirill 2020-01-31 17:57:31 +0300
• 202b8c8d96 menu type #2 Kuroshini 2020-01-31 17:08:08 +0300
• 2e0cfabbce menu type Kuroshini 2020-01-31 17:06:38 +0300
• cfba383940 refactored menu models Kuroshini 2020-01-31 17:00:57 +0300
• 6d9983ad3f Merge branch 'feature/agenda-fields' into 'develop' Олег Хаятов 2020-01-31 13:23:22 +0000
• 77129ec7ce Alter serializer transliterated_name field dormantman 2020-01-31 15:48:24 +0300
• b309d69079 Alter serializer location field dormantman 2020-01-31 15:44:44 +0300
• 1f887b3367 Added fields separation dormantman 2020-01-31 15:33:25 +0300
• b518faaf8b added DEFAULT_CALLING_CODE_ANTILLES_GUYANE_WEST_INDIES param, refactored serializers Anatoly 2020-01-31 14:52:22 +0300
• e008e7f2a1 remove not sent menus Kuroshini 2020-01-31 14:39:54 +0300
• 421ec5c73c refactored serializer Anatoly 2020-01-31 13:50:29 +0300
• 4a1e0a347c remove pagination for tag categories in BO Kuroshini 2020-01-31 13:47:50 +0300
• 08831de43a refactored a little Anatoly 2020-01-31 13:43:44 +0300
• 095cc2cb91 fix Anatoly 2020-01-31 13:38:07 +0300
• fb1eee3e4c added hardcoded calling number for Antilles Guyane West Indies islands Anatoly 2020-01-31 13:36:41 +0300
• 11e037f699 modified permissions for tags Anatoly 2020-01-31 13:21:00 +0300
• 2544f8ef5b added flag is_superuser to UserDetailView Anatoly 2020-01-31 13:06:03 +0300
• ac53543dc7 Merge branch 'bug/fix-related-objects-for-collections' into 'develop' Anton Gorbunov 2020-01-31 08:49:15 +0000
• 4ba2edecd0 check before get related_objects a.gorbunov 2020-01-31 08:48:36 +0000
• c6413c7493 subtypes for establishment back Kuroshini 2020-01-31 11:42:35 +0300
• 57cf90c631 added merge migrations Anatoly 2020-01-31 11:35:49 +0300
• 45f65658f0 added "status" field to Establishment model, refactored serializers and filters associated with field "is_publish", modified transfer Anatoly 2020-01-31 11:33:20 +0300
• d3bf68ab09 add_confirmed_at command alex 2020-01-31 11:25:38 +0300
• c3cc87507e confirmed at for csv users alex 2020-01-31 09:03:15 +0300
• 982a52ab96 Added guides binding objects dormantman 2020-01-31 04:02:40 +0300
• 22ee06403f menu create Kuroshini 2020-01-31 01:04:39 +0300
• 4d2d08a6f4 Added auto type dormantman 2020-01-31 00:35:51 +0300
• f83c7273d2 smol fixes Kuroshini 2020-01-31 00:27:40 +0300
• 10620ac881 fix set uploaded files #2 Kuroshini 2020-01-31 00:16:08 +0300
• 47f8905832 fix set uploaded files Kuroshini 2020-01-31 00:14:49 +0300
• ae9d505e3d create and update Kuroshini 2020-01-30 23:51:24 +0300
• 39cdd18392 fix serializer Kuroshini 2020-01-30 22:33:07 +0300
• e1b3908e00 serializer for menu uploads BO Kuroshini 2020-01-30 22:31:48 +0300
• a0408204a1 Added MenuFiles serializer dormantman 2020-01-31 00:13:15 +0300
• fbed631f40 Merge branch 'feature/menus-for-dima' of https://gl.id-east.ru/gm/gm-backend into feature/menus-for-dima dormantman 2020-01-30 22:25:25 +0300
• 5aa831ee3c Added MenuFiles serializer dormantman 2020-01-30 22:16:11 +0300
• 3e0c05c541 fix serializer Kuroshini 2020-01-30 22:11:07 +0300
• 62eb5b0ccb get menus method Kuroshini 2020-01-30 22:06:56 +0300
• a6fc88fdb9 lunch & diner fields Kuroshini 2020-01-30 21:17:04 +0300
• 07cfcb08d7 Added uploads to menu dormantman 2020-01-30 21:49:31 +0300
• b94e933cb1 Added migration dormantman 2020-01-30 20:58:45 +0300
• 14d9b32479 Revert serializer/routes/view/model dormantman 2020-01-30 20:45:07 +0300
• bf941d8755 fix agenda migration Kuroshini 2020-01-30 19:48:21 +0300
• 9d62c062bb migration for agenda Kuroshini 2020-01-30 19:45:13 +0300
• 3b8a28d599 agenda address is string now Kuroshini 2020-01-30 19:43:30 +0300
• ced3abe3cf added command to set the calling code for countries, modified setup_clean_db transfer, modified serializers Anatoly 2020-01-30 17:57:43 +0300
• ac606d14f8 swagger Kuroshini 2020-01-30 17:16:15 +0300
• d60e46419b Merge remote-tracking branch 'origin/develop' into develop alex 2020-01-30 17:01:39 +0300
• 40fa4c543b roles for user csv alex 2020-01-30 17:01:27 +0300
• 0487e7c8dd reword status translation Kuroshini 2020-01-30 16:46:30 +0300
• 442e26cfe4 partners web Kuroshini 2020-01-30 16:37:41 +0300
• e6de2cc4f9 fix method Anatoly 2020-01-30 16:28:32 +0300
• 7541909390 added merge migration Anatoly 2020-01-30 16:19:15 +0300
• 13cc40c19c added transfer for table - a la cartes Anatoly 2020-01-30 16:17:19 +0300
• 973ad80073 filter partners and sponsors Kuroshini 2020-01-30 16:12:17 +0300
• f8aab86f3c fix serializer Kuroshini 2020-01-30 15:45:51 +0300
• 1e126d3b1f migraion for partners Kuroshini 2020-01-30 15:44:33 +0300
• 632233d930 partners remastered (moved fields to binding table) Kuroshini 2020-01-30 15:43:25 +0300
• f05fab8329 Reformat establishment back serializer dormantman 2020-01-30 15:07:46 +0300
• ca29e9b02a Merge remote-tracking branch 'origin/develop' into develop alex 2020-01-30 14:42:37 +0300
• ce919b54d0 user roles for csv alex 2020-01-30 14:42:27 +0300
• 469a80339a replaced checking is_staff on is_superuser Anatoly 2020-01-30 14:33:00 +0300
• d6b8c6191d country name for csv users alex 2020-01-30 14:07:28 +0300
• ab8a4845d8 Merge branch 'feature/back-collections-list' into 'develop' Anton Gorbunov 2020-01-30 10:37:22 +0000
• eabb550f62 remove pagination a.gorbunov 2020-01-30 10:36:22 +0000
• 1b353c48da Merge remote-tracking branch 'origin/develop' into develop alex 2020-01-30 13:18:08 +0300
• 57dd5cb521 user list csv export alex 2020-01-30 13:15:39 +0300
• 21b0786daf fix city model Anatoly 2020-01-30 13:11:19 +0300
• 7378d6d253 Merge branch 'feature/roles' into develop Anatoly 2020-01-30 13:08:26 +0300
• ca5440d431 refactored roles Anatoly 2020-01-30 12:50:14 +0300
• c69bc05156 fix products serializer Kuroshini 2020-01-30 12:17:23 +0300
• 13968b3ed7 type read only alex 2020-01-30 11:21:14 +0300
• 8137bf0f68 fix establishment socials read_only alex 2020-01-30 11:09:12 +0300
• 25c63b8097 Merge branch 'develop' into feature/roles Anatoly 2020-01-30 10:56:46 +0300
• 57e63111fb intermediate commit Anatoly 2020-01-30 10:28:01 +0300
• 214c579701 Update django locales (for subscriptions) dormantman 2020-01-30 04:24:29 +0300
• a2e200b48d fix typing Kuroshini 2020-01-29 22:53:28 +0300
• 2d5be7bfac Merge branch 'feature/cascade-update-roles' into develop Kuroshini 2020-01-29 22:49:56 +0300
• 62c25ac737 simplify code Kuroshini 2020-01-29 22:49:36 +0300
• f3ca4a8de9 place method to user class a.gorbunov 2020-01-29 18:20:21 +0000
• 8eb828e309 partners remastered (sotring and optimization improvement) Kuroshini 2020-01-29 20:44:42 +0300
• 5ad32ad8aa partner bind/unbind Kuroshini 2020-01-29 19:59:11 +0300
• 0261deb5df get partners by establishment Kuroshini 2020-01-29 19:18:09 +0300