Commit Graph

  • a2395b807e User locale & city reading Kuroshini 2019-12-09 20:42:47 +0300
  • 7910c98c8a add wine_origins Kuroshini 2019-12-09 18:20:23 +0300
  • 9d557e4ce8 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2019-12-09 17:47:51 +0300
  • 6af7a7da5b add footer migrations and api Dmitriy Kuzmenko 2019-12-09 17:47:37 +0300
  • be793eed73 fix issue w/ tags binding Kuroshini 2019-12-09 17:40:05 +0300
  • d12ad93fe1 try to fix issue w/ news tag binding Kuroshini 2019-12-09 17:19:29 +0300
  • 6a3a40be4f Merge branch 'feature/permission_winery' into 'develop' d.kuzmenko 2019-12-09 14:05:48 +0000
  • a6728e3148 wine_origins for favorites establishments Kuroshini 2019-12-09 16:59:40 +0300
  • 0f11a47a79 rest category & rest cuisine for favs Kuroshini 2019-12-09 16:47:46 +0300
  • c3c5cfcac5 Merge branch 'develop' into feature/permission_winery Виктор Гладких 2019-12-09 16:36:17 +0300
  • 188f8877b4 Fix test Виктор Гладких 2019-12-09 16:35:38 +0300
  • 912431690d rename attrs #2 Kuroshini 2019-12-09 15:21:39 +0300
  • ea760fc674 rename attrs Kuroshini 2019-12-09 15:00:15 +0300
  • dc7a6a911a refactoring Anatoly 2019-12-09 14:29:54 +0300
  • d330aa5205 refactoring Anatoly 2019-12-09 13:34:17 +0300
  • 943dce90c7 Add migration littlewolf 2019-12-09 12:17:41 +0300
  • 3e0fad2139 add merge of migrations Dmitriy Kuzmenko 2019-12-09 12:14:55 +0300
  • 6bf40cc793 Merge branch 'fix/check_tags' into 'develop' d.kuzmenko 2019-12-09 09:08:02 +0000
  • f6cb62c49c Merge branch 'develop' into fix/check_tags Dmitriy Kuzmenko 2019-12-09 12:06:37 +0300
  • a52ffd443a Merge branch 'feature/add-city-search' into 'develop' d.kuzmenko 2019-12-09 09:04:18 +0000
  • dfe4ab92a6 Merge remote-tracking branch 'origin/develop' into feature/add-city-search Dmitriy Kuzmenko 2019-12-09 11:41:02 +0300
  • 1e0201b950 Add merge littlewolf 2019-12-09 11:33:14 +0300
  • c480089f30 Merge branch 'develop' into feature/fix-country-region-city-transfer littlewolf 2019-12-09 10:41:01 +0300
  • 38839f75f9 Fix account test Виктор Гладких 2019-12-09 09:59:17 +0300
  • bd567200c8 Merge branch 'develop' into feature/permission_winery Виктор Гладких 2019-12-09 09:40:33 +0300
  • 5cac9659e5 Clean code Виктор Гладких 2019-12-09 09:38:58 +0300
  • af7aef6d23 Add winery reviewer Виктор Гладких 2019-12-09 09:38:18 +0300
  • 7b22ac72ca Add subcommand to transfer AA country with regions, subregions and cities littlewolf 2019-12-07 01:53:05 +0300
  • 8451ccf17e add ordering & optimize serializer Kuroshini 2019-12-06 19:17:38 +0300
  • b5a113c875 user last visit middleware Kuroshini 2019-12-06 18:53:40 +0300
  • eb1cb011dc Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2019-12-06 18:17:21 +0300
  • 831cb4bc81 add home_page Dmitriy Kuzmenko 2019-12-06 18:17:16 +0300
  • f1fa8a58de small refactoring Anatoly 2019-12-06 17:37:33 +0300
  • 8af8cf92e9 added objects related statistic in Collection backoffice serializer Anatoly 2019-12-06 17:00:54 +0300
  • 8e63b969bf Merge branch 'develop' into feature/permission_winery Виктор Гладких 2019-12-06 16:58:44 +0300
  • e824b5ee65 winery permission Виктор Гладких 2019-12-06 16:51:57 +0300
  • bdb82d0fb0 add migration command Kuroshini 2019-12-06 16:40:39 +0300
  • 351d492012 command to remove relative news description images Kuroshini 2019-12-06 15:45:46 +0300
  • 17ca27c751 Temp fiz littlewolf 2019-12-06 15:28:58 +0300
  • 6a9356aaa6 fix merge conflicts Kuroshini 2019-12-06 15:10:48 +0300
  • 0c5140d359 Added current product exclude dormantman 2019-12-06 15:03:18 +0300
  • 1372538acf Merge branch 'fix/dublicate-products' of /home/dormantman/PycharmProjects/gm-backend with conflicts. dormantman 2019-12-05 18:10:24 +0300
  • e761642b37 Merge branch 'feature/fix-partner-get' into 'develop' d.kuzmenko 2019-12-06 11:34:22 +0000
  • 29d05929ff Merge branch 'fix/backoffice-slug-url' into 'develop' d.kuzmenko 2019-12-06 11:15:16 +0000
  • 99e2b060f8 Merge remote-tracking branch 'origin/develop' into develop alex 2019-12-06 14:12:59 +0300
  • e08296c52d address to product detail web api alex 2019-12-06 14:12:26 +0300
  • 91b528feb9 tags for establishments Kuroshini 2019-12-06 14:03:06 +0300
  • c272dc1255 increase JWT token lifetime Anatoly 2019-12-06 13:15:27 +0300
  • 7635eafb09 booking urls for mobile Kuroshini 2019-12-06 13:11:29 +0300
  • b659308729 exclude field from Establishment serializer Anatoly 2019-12-06 13:06:59 +0300
  • 8c8acd3e19 Models Виктор Гладких 2019-12-06 11:13:07 +0300
  • 48ae6a437d street_name_2 clear alex 2019-12-06 10:29:43 +0300
  • cbf998569a Merge branch 'develop' into feature/permission_winery Виктор Гладких 2019-12-06 09:46:29 +0300
  • 88b190d76d winery choice Виктор Гладких 2019-12-06 09:45:38 +0300
  • 5d76e8a02b fix address command alex 2019-12-06 08:20:23 +0300
  • c3c0032074 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2019-12-05 17:19:49 +0300
  • 73c66c7357 add_publick_mark Dmitriy Kuzmenko 2019-12-05 17:19:38 +0300
  • 202f5715f3 remove tag category from detail Kuroshini 2019-12-05 17:12:43 +0300
  • c62b4016f1 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2019-12-05 15:23:24 +0300
  • f06596b5b6 fix review Dmitriy Kuzmenko 2019-12-05 15:23:16 +0300
  • f9479dd7a6 calc center again Kuroshini 2019-12-05 14:30:41 +0300
  • aa8304acaf Revert "try another calc strategy" Kuroshini 2019-12-05 14:19:56 +0300
  • fe101f3cb0 try another calc strategy Kuroshini 2019-12-05 14:16:44 +0300
  • 3afb51d472 fix establishment admin page Anatoly 2019-12-05 14:11:46 +0300
  • 3e7922e0fc temp fix Kuroshini 2019-12-05 13:30:43 +0300
  • 66fc2fae99 Revert "possible fix center calculation" Kuroshini 2019-12-05 13:15:51 +0300
  • ca80f7a797 possible fix center calculation Kuroshini 2019-12-05 13:14:27 +0300
  • 1e0044cbd1 artisans tags for favs Kuroshini 2019-12-05 12:11:44 +0300
  • d114b93b14 fix es for products Anatoly 2019-12-05 09:48:09 +0300
  • 1d9ee76a5c fix es for establishments Anatoly 2019-12-05 09:43:55 +0300
  • bebd1283c0 Merge remote-tracking branch 'origin/fix/hide-unused-tags' into develop Kuroshini 2019-12-04 21:04:09 +0300
  • c0bc66c749 Hide unusable tags dormantman 2019-12-04 21:02:08 +0300
  • 1da7c40a9d fix merge Anatoly 2019-12-04 20:18:47 +0300
  • 9dc8e34e3a Merge branch 'develop' into feature/transfer-guide Anatoly 2019-12-04 20:16:21 +0300
  • 29ff10fb4b added wine origins Anatoly 2019-12-04 20:13:09 +0300
  • f44a4bb29d Establishments favs type Kuroshini 2019-12-04 19:37:05 +0300
  • e0ad819caa fix empty comments Kuroshini 2019-12-04 18:50:13 +0300
  • 6d80678564 Merge branch 'feature/eest_empl_options' into 'develop' d.kuzmenko 2019-12-04 15:47:42 +0000
  • 69b40f21b7 last comment for mobile establishment detail Kuroshini 2019-12-04 18:26:03 +0300
  • dee353199d add schedule to establishments list Kuroshini 2019-12-04 17:30:54 +0300
  • 234f21e03b Merge remote-tracking branch 'origin/develop' into fix/hide-excess-tags dormantman 2019-12-04 17:29:24 +0300
  • d0378ad14e Fix options Виктор Гладких 2019-12-04 17:27:51 +0300
  • 1ae11f0b61 System tags removed dormantman 2019-12-04 17:27:49 +0300
  • b2fb341c10 fix wines faceted search Kuroshini 2019-12-04 17:13:38 +0300
  • 72d52e5c19 Removed unusable destroy function dormantman 2019-12-04 15:51:03 +0300
  • 4202eb679b Corrections for tests dormantman 2019-12-04 15:48:54 +0300
  • 627f7562ec finalizing transfer guides Anatoly 2019-12-04 14:21:54 +0300
  • 552e08e242 opening_at for establishment Kuroshini 2019-12-04 13:52:39 +0300
  • c5992afec0 add opening_at to schedule search results Kuroshini 2019-12-04 13:50:55 +0300
  • a81f3f079a Changed url id to slug in back-office dormantman 2019-12-04 13:37:49 +0300
  • 9f5a1f9ce5 Merge branch 'tags_filter' into develop Dmitriy Kuzmenko 2019-12-04 12:46:17 +0300
  • 4d36fc0f0c fix fabric Dmitriy Kuzmenko 2019-12-04 12:38:07 +0300
  • 49d64d2878 Merge branch 'migrate/site-affilations' into 'develop' d.kuzmenko 2019-12-04 09:34:44 +0000
  • e7deab5bbc Merge branch 'develop' into migrate/site-affilations Виктор Гладких 2019-12-04 12:25:32 +0300
  • 96e08a0900 Migrate complete Виктор Гладких 2019-12-04 12:24:23 +0300
  • 7590a73c5d tags fix mtm alex 2019-12-04 09:23:21 +0300
  • f507994014 tags dynamic filters #5 (add wine-colors) Kuroshini 2019-12-04 00:49:46 +0300
  • 9f882ca656 tags dynamic filters #4 (boost search via ES) Kuroshini 2019-12-04 00:33:18 +0300
  • f9fb2aa17e tags dynamic filters #4 Kuroshini 2019-12-03 23:49:45 +0300
  • eaf5c41e1d tags dynamic filters #4 Kuroshini 2019-12-03 22:53:31 +0300