Commit Graph

  • 89f2c3bf1d remove shop category tags from serialization Kirill 2020-02-06 11:22:14 +0300
  • 8993ec1097 added documentation for /api/back/establishments/employees/<id>/ Anatoly 2020-02-06 11:19:31 +0300
  • d234214467 more detailed address information Kuroshini 2020-02-05 18:45:23 +0300
  • 8aa7f89fe2 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Александр Пархомин 2020-02-05 18:42:54 +0300
  • f87278a4dc add docstring for establishment subtype by id Александр Пархомин 2020-02-05 18:42:42 +0300
  • 9a493545d8 types Kuroshini 2020-02-05 18:39:14 +0300
  • b679fdab56 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Александр Пархомин 2020-02-05 18:37:38 +0300
  • 58c4ab8788 add docstring for establishment subtype Александр Пархомин 2020-02-05 18:37:22 +0300
  • a54bc86d20 added documentation for /api/back/establishments/employees/ (GET, POST) Anatoly 2020-02-05 18:27:59 +0300
  • 2151c36d92 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Александр Пархомин 2020-02-05 18:25:10 +0300
  • 06a215060f add docstring for establishment from carousel Александр Пархомин 2020-02-05 18:24:54 +0300
  • 0ab947f5bb establishment address for BO list Kuroshini 2020-02-05 18:00:03 +0300
  • 061c96d198 refactored a little, added Gin indexes to account.User model. Anatoly 2020-02-05 17:58:56 +0300
  • 285f52ce30 establishment back list add toque number and public_mark Kuroshini 2020-02-05 17:46:07 +0300
  • 590292919b Merge remote-tracking branch 'origin/develop' into develop alex 2020-02-05 17:32:45 +0300
  • 10b9c36edb fix unconfirmed_email alex 2020-02-05 17:31:13 +0300
  • b859792b8c Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Александр Пархомин 2020-02-05 17:05:24 +0300
  • 20096fee8d add docstring for establishment by slug Александр Пархомин 2020-02-05 17:05:00 +0300
  • 16ed67f9b1 refactored doc-string Anatoly 2020-02-05 16:58:41 +0300
  • 8eb07205e1 added report app Anatoly 2020-02-05 16:46:22 +0300
  • ab3666b03d fix news states Kuroshini 2020-02-05 16:29:13 +0300
  • ce9aa30074 change news states Kuroshini 2020-02-05 16:12:28 +0300
  • 2eeb67e10f Merge branch 'feature/bind-award-for-establishment' into 'develop' Anton Gorbunov 2020-02-05 12:51:36 +0000
  • bf3a88fe57 cleanup code a.gorbunov 2020-02-05 12:50:42 +0000
  • 3edf197b81 Merge branch 'feature/bind-award-for-establishment' into 'develop' Олег Хаятов 2020-02-05 12:49:58 +0000
  • 786dbfc739 check by content_type a.gorbunov 2020-02-05 12:47:23 +0000
  • b778661564 Merge branch 'develop' into 'feature/bind-award-for-establishment' Anton Gorbunov 2020-02-05 12:44:28 +0000
  • a3a66a88e6 allow bind or remove award for establishment a.gorbunov 2020-02-05 12:31:02 +0000
  • 96a88e2478 notification messages fix Kuroshini 2020-02-05 15:06:44 +0300
  • 6d556665e0 apply user role Kuroshini 2020-02-05 14:23:37 +0300
  • c9cf2672b6 establishment team role revoked email Kuroshini 2020-02-05 14:18:39 +0300
  • 6d9852fc7b added guide type filter to guide list view Anatoly 2020-02-05 14:16:36 +0300
  • 34adf748ed fix location integration with ruby script Anatoly 2020-02-05 13:57:42 +0300
  • 8e22119de9 team Kuroshini 2020-02-05 13:32:42 +0300
  • b421b934c1 refactored guides Anatoly 2020-02-05 12:16:07 +0300
  • ec1caeced3 invite existing user email Kuroshini 2020-02-04 22:02:40 +0300
  • 1c5976896b fix hardcode Kuroshini 2020-02-04 21:32:39 +0300
  • fd4b6a68b1 email on new user Kuroshini 2020-02-04 21:30:19 +0300
  • d2440f5bf1 clean unaccepted invites task Kuroshini 2020-02-04 20:26:39 +0300
  • eb8ee67f06 dismiss from team members method Kuroshini 2020-02-04 19:40:30 +0300
  • a302e1181c team members list Kuroshini 2020-02-04 18:47:20 +0300
  • 68ceb44acf fix guide Anatoly 2020-02-04 18:41:55 +0300
  • 49d6a983d9 new user for team w/ confirmed email Kuroshini 2020-02-04 18:26:00 +0300
  • fc0cf3e25b invite team member route Kuroshini 2020-02-04 18:22:03 +0300
  • 2db59131a8 migration for team Kuroshini 2020-02-04 18:20:17 +0300
  • c68d6ec148 fix extend guide method Anatoly 2020-02-04 18:10:39 +0300
  • e7759ada27 AwardType List filters alex 2020-02-04 17:40:07 +0300
  • 6a0943b0de years field in award type serializer alex 2020-02-04 17:22:37 +0300
  • 0c87e3cd25 Merge remote-tracking branch 'origin/develop' into develop alex 2020-02-04 17:19:18 +0300
  • 8f899905ec years for award types alex 2020-02-04 17:19:09 +0300
  • 37eef69ee2 fix view Anatoly 2020-02-04 17:16:31 +0300
  • b7a84a147c small fix Anatoly 2020-02-04 17:11:06 +0300
  • 1c6ec90fbf added an endpoint that return an array of country calling codes /api/back/location/countries/calling-codes/ Anatoly 2020-02-04 17:01:46 +0300
  • 28d4122840 establishment statuses method Kuroshini 2020-02-04 16:22:57 +0300
  • b74590ce75 remove allow null for available_for_events a.gorbunov 2020-02-04 13:12:51 +0000
  • ee8dc65f0b available_for_events allow null a.gorbunov 2020-02-04 13:08:19 +0000
  • e633b4f5f5 subtypes to establishments list Kuroshini 2020-02-04 16:05:25 +0300
  • 5687eff646 Merge remote-tracking branch 'origin/develop' into develop alex 2020-02-04 16:01:40 +0300
  • 9177d41309 refactor location transfer alex 2020-02-04 16:01:31 +0300
  • 6bf5b2a75b Merge branch 'bug-published_comments_not_displayed_v2' into 'develop' Олег Хаятов 2020-02-04 12:53:50 +0000
  • a23c50a130 available_for_events not required a.gorbunov 2020-02-04 12:53:08 +0000
  • 6030b438a0 filtration only in moderation v2 Kirill 2020-02-04 15:50:57 +0300
  • 5aa74ff7c9 fix positions by establishment type/subtype Kuroshini 2020-02-04 15:42:15 +0300
  • 9982c2ca77 Merge branch 'bug-published_comments_not_displayed_v2' into 'develop' Олег Хаятов 2020-02-04 12:13:44 +0000
  • b286bbb1fa added migrations, refactored establishment serializers Anatoly 2020-02-04 15:07:58 +0300
  • f3a5605111 filtration only in moderation Kirill 2020-02-04 15:05:59 +0300
  • 11cd688851 merge migrations Kuroshini 2020-02-04 14:36:33 +0300
  • d5b5149fb0 Merge branch 'feature/establishment_fields' into 'develop' Олег Хаятов 2020-02-04 11:34:44 +0000
  • 26b76c0b8c Optimize query a.gorbunov 2020-02-04 11:31:13 +0000
  • 990b15f1d7 added new fields a.gorbunov 2020-02-04 11:11:52 +0000
  • d0311ec974 fix field name in serializer Anatoly 2020-02-04 13:27:56 +0300
  • 8820988196 fix establishment slugification Kuroshini 2020-02-04 13:27:35 +0300
  • 056fbb4eed fix issue w/ transliterated name Kuroshini 2020-02-04 12:54:14 +0300
  • 6811a5b6c0 establishment slug from index_name Kuroshini 2020-02-04 12:41:49 +0300
  • 25e829e629 added filtering by establishment id in /api/back/collections/guides/all/ Anatoly 2020-02-04 12:11:56 +0300
  • 04c6948539 added endpoint /api/back/collections/guides/all/, revert pagination in /api/back/collections/guides/ Anatoly 2020-02-04 11:36:46 +0300
  • 9bfba9af70 refactored a little guide list view Anatoly 2020-02-04 10:50:52 +0300
  • 7cbfeb9845 added filtering by country code Anatoly 2020-02-04 10:28:03 +0300
  • 87686abbb7 disable counter for guide elements Anatoly 2020-02-04 10:03:21 +0300
  • 223f5217a2 sort positions Kuroshini 2020-02-03 21:23:02 +0300
  • 94272609bf show correct positions for establishment Kuroshini 2020-02-03 20:57:04 +0300
  • b1cf952679 positions by establishment type/subtype list Kuroshini 2020-02-03 20:00:17 +0300
  • 122680af0b Merge branch 'bug-country_code_filtration' into 'develop' Олег Хаятов 2020-02-03 16:33:09 +0000
  • 65ace7fb88 Added nullable dormantman 2020-02-03 19:13:43 +0300
  • fd6aced51e filtration by country code Kirill 2020-02-03 19:18:23 +0300
  • b4cdb2dc5b positions are binded to est type/subtype Kuroshini 2020-02-03 19:16:33 +0300
  • ab2affe305 fix transliterated name Kuroshini 2020-02-03 18:04:27 +0300
  • bf0a0b42a9 some fixes & migrations Kuroshini 2020-02-03 17:55:57 +0300
  • 400b5ac402 change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random Anatoly 2020-02-03 17:16:29 +0300
  • 4d52ec57c4 Merge remote-tracking branch 'origin/develop' into develop alex 2020-02-03 16:57:09 +0300
  • 2a9ef2c704 refactor location transfer 1 alex 2020-02-03 16:57:00 +0300
  • 28253d74c4 remove currency code Kuroshini 2020-02-03 16:11:11 +0300
  • b062d0b729 refactor plates Kuroshini 2020-02-03 16:09:25 +0300
  • 084db83c92 menu update/delete Kuroshini 2020-02-03 14:55:03 +0300
  • b1b3e923b7 create menu item for establishment Kuroshini 2020-02-03 14:37:10 +0300
  • 831b043a48 refactored serializers that retrieving phone numbers Anatoly 2020-02-03 14:13:45 +0300
  • 6c7b7ff19e fix permissions Anatoly 2020-02-03 13:14:00 +0300
  • a5bc5e98d1 refactored serializers that retrieving phone numbers Anatoly 2020-02-03 13:10:58 +0300
  • 15b8241213 refactored serializers that retrieving phone numbers Anatoly 2020-02-03 13:10:02 +0300
  • 3c56b0c061 refactor account transfer alex 2020-02-03 12:32:53 +0300