Commit Graph

  • de3933aa88 Merge branch 'bug/establishment_optimize' into 'develop' Anton Gorbunov 2020-01-16 08:11:48 +0000
  • ca3d8a411c format condition a.gorbunov 2020-01-16 08:11:29 +0000
  • 37a6ea8d1e Merge branch 'bug/establishment_optimize' into 'develop' Anton Gorbunov 2020-01-16 07:56:50 +0000
  • 9ea7c25085 logs and save extension for preview a.gorbunov 2020-01-16 07:56:34 +0000
  • 87d16ef866 Merge branch 'bug/establishment_optimize' into 'develop' Anton Gorbunov 2020-01-16 07:30:00 +0000
  • f09b5c2367 fix condition for optimize establishment preview image a.gorbunov 2020-01-16 07:29:36 +0000
  • cc00d804b1 Merge branch 'bug/establishment_optimize' into 'develop' Anton Gorbunov 2020-01-16 07:14:08 +0000
  • 78da617682 fix optimize establishment preview images a.gorbunov 2020-01-16 07:13:31 +0000
  • 04987fdbd9 Merge branch 'bug/establishment_optimize' into 'develop' Anton Gorbunov 2020-01-16 07:06:19 +0000
  • e6dec3a1f0 fix optimize establishment preview images a.gorbunov 2020-01-16 06:51:39 +0000
  • 6e61587b27 refactor admin panel, remove unused field from model NavBarPermission Anatoly 2020-01-15 23:19:17 +0300
  • abf9cd684a Change description dormantman 2020-01-15 23:06:38 +0300
  • fedf1400fd add M2M site feature relations to NavBarPermission model Anatoly 2020-01-15 22:45:58 +0300
  • f86357e041 fix comments Anatoly 2020-01-15 22:31:17 +0300
  • 6461ffda4d Added short to label_translated dormantman 2020-01-15 21:45:29 +0300
  • 4b45cab976 employees trigram search for back-office Kuroshini 2020-01-15 20:49:33 +0300
  • 7a7d7a70b0 fix naming issue Kuroshini 2020-01-15 19:15:32 +0300
  • fab351d800 distillery_type #3 Kuroshini 2020-01-15 18:21:21 +0300
  • 9b40d8e48e distillery_type #2 Kuroshini 2020-01-15 18:02:19 +0300
  • a468f264e0 fix similarity rules Anatoly 2020-01-15 17:50:24 +0300
  • 59f7f8d2d4 distillery_type Kuroshini 2020-01-15 17:49:57 +0300
  • 7ce25a41c8 Merge remote-tracking branch 'origin/develop' into develop alex 2020-01-15 17:06:18 +0300
  • f15ac47102 subscription_type list for user alex 2020-01-15 17:06:09 +0300
  • c0273773bc refactored a little similarity rules Anatoly 2020-01-15 17:00:01 +0300
  • 129201d3a9 add slug for backoffice establishments Kuroshini 2020-01-15 16:51:42 +0300
  • 0607a56739 Revert "possible fix for similar distilleries" Kuroshini 2020-01-15 16:46:53 +0300
  • 59c9c06d64 fix transfer location Anatoly 2020-01-15 16:46:03 +0300
  • 21978639bd possible fix for similar distilleries Kuroshini 2020-01-15 16:40:29 +0300
  • 677d67cbc5 Merge remote-tracking branch 'origin/develop' into develop alex 2020-01-15 15:03:48 +0300
  • 63cc029ce3 subscriptions read only alex 2020-01-15 15:03:38 +0300
  • 1ba660b5fd add verification code to confirm email template Anatoly 2020-01-15 14:48:50 +0300
  • 8f206f2a9c remove city gallery Anatoly 2020-01-15 14:20:33 +0300
  • 42885e8b4c International carousel Kuroshini 2020-01-15 13:45:15 +0300
  • 7533579172 Added short weekday to tag filters dormantman 2020-01-15 13:24:53 +0300
  • 8cb0f51802 fix transfer command transfer_city_gallery, add field image to City model, fix serializer CityDetailSerializer Anatoly 2020-01-15 13:22:42 +0300
  • 32ad122d9a set priority in Feature model as blank, and remove uniqueness constrait Anatoly 2020-01-15 13:15:27 +0300
  • e4123d3ce9 preview_image to establishment and product type and subtype alex 2020-01-15 10:47:18 +0300
  • 48e15a047a Merge branch 'bug/news_optimize' into 'develop' Anton Gorbunov 2020-01-15 07:02:42 +0000
  • 7bc998ca94 fix regex for find images a.gorbunov 2020-01-15 06:57:59 +0000
  • 0b92451129 Merge branch 'bug/news_optimize' into 'develop' Anton Gorbunov 2020-01-15 06:50:29 +0000
  • 210070b7cf fix regex for find images a.gorbunov 2020-01-15 06:45:42 +0000
  • 19b9e636c1 phones for cascade establishment alex 2020-01-15 09:20:09 +0300
  • 660a46b895 Added short weekday to model dormantman 2020-01-15 01:10:52 +0300
  • 67ab06022f Added short translated weekday for timetable dormantman 2020-01-15 01:01:27 +0300
  • 0cf62353be fix role field alex 2020-01-14 22:06:53 +0300
  • 9bd40b0191 Merge remote-tracking branch 'origin/develop' into develop alex 2020-01-14 22:04:25 +0300
  • 1c4e141383 fix import error for role serializer alex 2020-01-14 22:04:11 +0300
  • 24f0c25a3d Merge branch 'feature/auto-username' into develop Kuroshini 2020-01-14 22:01:57 +0300
  • 42190e0e28 Fix for front auth dormantman 2020-01-14 21:57:57 +0300
  • 2492000ae6 try to fix issue w/ filters Kuroshini 2020-01-14 21:30:21 +0300
  • da9f393a52 try to fix issue w/ filters Kuroshini 2020-01-14 21:28:23 +0300
  • d2c03b0f37 Merge remote-tracking branch 'origin/feature/auto-username' into develop dormantman 2020-01-14 21:17:17 +0300
  • 6541070d1c Merge branch 'develop' into feature/navigation-bar Anatoly 2020-01-14 19:06:59 +0300
  • 5c95c4923f refactored roles, refactored response for User detail view Anatoly 2020-01-14 18:40:30 +0300
  • 49673d64af Added automatic username creation dormantman 2020-01-14 18:20:57 +0300
  • c110dc3b96 optimize collection images a.gorbunov 2020-01-14 06:23:08 +0000
  • 440a263ea5 verbose news optimize command fix Kuroshini 2020-01-14 17:34:33 +0300
  • 3f19699e1d supress issues w/ news images compression Kuroshini 2020-01-14 17:32:13 +0300
  • 80dec0b6ee compress images with data transfer Kuroshini 2020-01-14 17:20:41 +0300
  • 6dda459cc8 Fixed user authenticated dormantman 2020-01-14 17:18:41 +0300
  • 710eb274ed remove debug info. Cleanup code. Set default quality a.gorbunov 2020-01-13 10:19:47 +0300
  • 77cca6c6d7 resize photos Kuroshini 2020-01-10 17:47:23 +0300
  • ba4c6901f9 quality calculate a.gorbunov 2020-01-10 16:36:21 +0300
  • e70e1d0a67 thumbnail alias for images in news description a.gorbunov 2020-01-09 18:36:28 +0300
  • 0672bcaef9 command for optimize news images anton 2020-01-09 11:07:03 +0300
  • d3d4578bc7 Auto creating subscriber dormantman 2020-01-14 17:13:45 +0300
  • b2d70ddbf0 Merge branch 'bug/similar_products' into 'develop' Олег Хаятов 2020-01-14 14:06:09 +0000
  • 7c9d9e8ed1 filter by location a.gorbunov 2020-01-14 13:51:01 +0000
  • 9edd3fef18 cleanup code a.gorbunov 2020-01-14 13:48:55 +0000
  • 5e5d2832cd fix sort by product type a.gorbunov 2020-01-14 13:39:25 +0000
  • a447dfa471 Added method subscribe with code dormantman 2020-01-14 15:59:50 +0300
  • 9aeedff81e Merge branch 'develop' into phone_list Dmitriy Kuzmenko 2020-01-14 15:59:46 +0300
  • b5eb5e89b8 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2020-01-14 15:41:13 +0300
  • 11b55e9f4c change chosen tag functional Dmitriy Kuzmenko 2020-01-14 15:40:49 +0300
  • 1ed384ded2 fix issue w/ tags translations Kuroshini 2020-01-14 14:44:15 +0300
  • bc1a9ac496 add merge migrations Dmitriy Kuzmenko 2020-01-14 10:56:49 +0300
  • 387f96b8bf Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2020-01-14 10:53:53 +0300
  • fb00c7c3a3 add chosen tag Dmitriy Kuzmenko 2020-01-14 10:53:43 +0300
  • da1fa9d83a Added agenda creating dormantman 2020-01-13 18:59:01 +0300
  • c1186dd597 added field - "distillery_types" to ES, change country field properties in TagCategory model Anatoly 2020-01-13 17:07:42 +0300
  • 35d9f37fab fix serializer alex 2020-01-13 15:47:50 +0300
  • 605a3e12e1 phone_list field create and update alex 2020-01-13 15:44:51 +0300
  • f93337def3 Merge branch 'feature/news-subscription' into develop Kuroshini 2020-01-13 15:38:16 +0300
  • fdb0892377 Update unsubscribe url dormantman 2020-01-13 15:32:40 +0300
  • ada48b34aa Revert "try to boost translations fetch" Kuroshini 2020-01-13 15:01:17 +0300
  • 34a246abab try to boost translations fetch Kuroshini 2020-01-13 14:58:55 +0300
  • 3506f6b2f0 Change templates dormantman 2020-01-13 14:34:11 +0300
  • 85f49b5cf6 Merge branch 'feature/news-subscription' into develop Kuroshini 2020-01-13 14:05:41 +0300
  • 9999096320 Added actions mailing dormantman 2020-01-13 14:01:58 +0300
  • 469a246f49 Added subscribes notification dormantman 2020-01-13 13:36:49 +0300
  • 9b2ad2a6dd try new email settings for dev Kuroshini 2020-01-13 13:37:11 +0300
  • 2deb4b3b7f some code improvements Kuroshini 2020-01-13 12:47:07 +0300
  • 114304b3c9 Reformat builder method dormantman 2020-01-13 12:28:30 +0300
  • bb7cd98b98 Added news locale check dormantman 2020-01-13 12:24:48 +0300
  • f048cf2e17 Mailing fixed dormantman 2020-01-13 12:08:43 +0300
  • 6c47fb404b Fix news mailing dormantman 2020-01-13 11:53:54 +0300
  • 3d030c91fe Merge remote-tracking branch 'origin/develop' into develop Kuroshini 2020-01-13 12:12:15 +0300
  • 28c674702c fix news state update Kuroshini 2020-01-13 12:12:01 +0300
  • d6345f27e2 establishment menu currency id alex 2020-01-13 11:56:04 +0300
  • b2f3e1f96b added field - "distillery_types" in establishment list, detail and similar list view Anatoly 2020-01-13 11:50:54 +0300