Commit Graph

  • 4d310515ab Merge branch 'develop' into feature/est_transporation GladkihViktor 2019-11-02 17:55:08 +0300
  • 56b3d0dcc2 Update transportation GladkihViktor 2019-11-02 17:54:24 +0300
  • 7de6043861 filter for tag Dmitriy Kuzmenko 2019-11-02 17:19:59 +0300
  • f3f06fcf09 filter for tag Dmitriy Kuzmenko 2019-11-02 17:06:13 +0300
  • 0f8425f363 Tags by category Kuroshini 2019-10-16 14:11:07 +0300
  • e69f272a63 Fix time format for frontend Kuroshini 2019-10-16 14:11:07 +0300
  • ea830379fc Fix image url GladkihViktor 2019-11-02 14:31:12 +0300
  • 4f67c295d1 Carousel link evgeniy-st 2019-11-02 12:11:03 +0300
  • dcea8b2a69 small fix evgeniy-st 2019-11-02 12:05:18 +0300
  • 11d06b7b97 update Carousel model_name evgeniy-st 2019-11-02 12:00:09 +0300
  • 1747f6e95c fix filter old_estab Dmitriy Kuzmenko 2019-11-02 10:24:24 +0300
  • 20b9b9affd fix filter old_estab Dmitriy Kuzmenko 2019-11-02 10:11:47 +0300
  • 4059446a3c add filter by exist Establishments Dmitriy Kuzmenko 2019-11-02 10:04:32 +0300
  • 4108de5931 add filter for transfer establishment by fr Dmitriy Kuzmenko 2019-11-02 09:17:18 +0300
  • 4e76fc966e added fix link for establishment preview_image Anatoly 2019-11-01 18:43:41 +0300
  • 5928ee1884 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2019-11-01 18:21:03 +0300
  • 0d7187e330 change get image in carusel Dmitriy Kuzmenko 2019-11-01 18:20:48 +0300
  • fdd5c0bace added fix link for establishment preview_image, run - ./manage.py transfer --fix_establishment_preview_image Anatoly 2019-11-01 18:10:45 +0300
  • 660eb347c5 add filter by country for carusel Dmitriy Kuzmenko 2019-11-01 18:10:12 +0300
  • aab76d219f Merge remote-tracking branch 'origin/develop' into develop alex 2019-11-01 17:38:09 +0300
  • 7acc8592a8 country for carousel alex 2019-11-01 17:37:53 +0300
  • effe468777 add active to carusel Dmitriy Kuzmenko 2019-11-01 16:56:37 +0300
  • 4a38bec2a7 added migrations and added migration wine colors Anatoly 2019-11-01 16:48:49 +0300
  • 8787a6b944 Fix Виктор Гладких 2019-11-01 16:27:09 +0300
  • afdc0154c6 Fix Виктор Гладких 2019-11-01 16:24:17 +0300
  • c51cfc1aa4 Fix publish collect Виктор Гладких 2019-11-01 16:18:33 +0300
  • e9b0d0f91b Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop a.feteleu 2019-11-01 15:57:13 +0300
  • a36e05d96f added csrf trust origins a.feteleu 2019-11-01 15:56:51 +0300
  • 8970a1ebc7 Merge branch 'feature/chosen_tags_groups_by_country' into 'develop' e.stoyushko 2019-11-01 12:54:24 +0000
  • d17790dc34 Added filtering chosen tags by country Semyon Yekhmenin 2019-11-01 12:54:24 +0000
  • 74aaab0e93 Merge branch 'bugfix/booking-subsscriver-fix' into 'develop' e.stoyushko 2019-11-01 12:46:44 +0000
  • e3670c051e Fix note mandatory && subscriber creation Kuroshini 2019-10-16 14:11:07 +0300
  • 2cd69e02cb Fix note mandatory && subscriber creation Kuroshini 2019-10-16 14:11:07 +0300
  • 975063b3f8 Merge branch 'feature/collect' into 'develop' d.kuzmenko 2019-11-01 12:27:19 +0000
  • 5e65bff2ba Fix Виктор Гладких 2019-11-01 15:19:42 +0300
  • f5a9763edf Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop michail 2019-11-01 17:15:16 +0500
  • 42cd311dc4 Carousel is parsed evgeniy-st 2019-11-01 15:12:35 +0300
  • 09e0a36313 added image url to partner model michail 2019-11-01 17:08:53 +0500
  • 445d76df75 boost name and name_translated in es search evgeniy-st 2019-11-01 14:56:07 +0300
  • a06c499d5a Merge branch 'feature/collect' into 'develop' d.kuzmenko 2019-11-01 11:41:37 +0000
  • e6f9e388aa intermediate commit Anatoly 2019-11-01 14:38:29 +0300
  • 1df89b6c48 Merge branch 'develop' into feature/collect Виктор Гладких 2019-11-01 14:31:30 +0300
  • 96aad4ff42 Fix country code Виктор Гладких 2019-11-01 14:28:01 +0300
  • 84cefefa0b fix add_establishment_description alex 2019-11-01 14:14:16 +0300
  • d1113364a9 intermediate commit Anatoly 2019-11-01 14:09:54 +0300
  • 0fc951696c Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-11-01 12:58:15 +0300
  • 0e04b9d044 update toque calculating evgeniy-st 2019-11-01 12:57:57 +0300
  • 11f091c069 fix develop settings Dmitriy Kuzmenko 2019-11-01 12:36:53 +0300
  • 8d8cd09d64 fix develop settings Dmitriy Kuzmenko 2019-11-01 12:32:48 +0300
  • e4c9d8f9bc fix develop settings Dmitriy Kuzmenko 2019-11-01 12:30:07 +0300
  • 41e48cb0e9 Merge branch 'feature/fix-country-transfer' into develop littlewolf 2019-11-01 12:13:11 +0300
  • 0352615200 Fix country_code svg littlewolf 2019-11-01 12:12:51 +0300
  • 623934438f fixed svg path Anatoly 2019-11-01 12:00:51 +0300
  • 78a8a5d699 intermediate commit Anatoly 2019-11-01 11:53:32 +0300
  • 04afd4d913 update country time_format and __str__ method evgeniy-st 2019-11-01 11:34:48 +0300
  • 6f8361cb83 Merge branch 'develop' into features/migrate-wine Anatoly 2019-11-01 11:16:06 +0300
  • 383032b2af Merge remote-tracking branch 'origin/develop' into develop alex 2019-11-01 10:48:56 +0300
  • b3bd2a7141 add_establishment_social command alex 2019-11-01 10:48:46 +0300
  • 03feb13166 Merge branch 'feature/collect' into 'develop' d.kuzmenko 2019-11-01 07:36:40 +0000
  • b7b2e7fb25 Merge branch 'feature/booking-prepayment' into 'develop' e.stoyushko 2019-11-01 07:30:14 +0000
  • 7c530bb43b Merge branch 'feature/time-format-for-front' into 'develop' e.stoyushko 2019-11-01 07:23:49 +0000
  • 954d515a5a Merge branch 'develop' into feature/collect Виктор Гладких 2019-11-01 10:18:36 +0300
  • dbee524a31 Add Виктор Гладких 2019-11-01 10:17:12 +0300
  • 54f2290bbd exit Виктор Гладких 2019-11-01 10:16:05 +0300
  • 4be8582e7c Merge branch 'maigrate-carousel' into develop alex 2019-11-01 08:44:46 +0300
  • 68182e837c carousel fin alex 2019-11-01 08:41:56 +0300
  • be464c3651 Fix db littlewolf 2019-11-01 08:12:07 +0300
  • e2e95256d8 Merge branch 'feature/fix-country-transfer' into develop littlewolf 2019-11-01 08:11:30 +0300
  • 4cdcc8988b Merge remote-tracking branch 'origin/develop' into maigrate-carousel alex 2019-11-01 07:39:11 +0300
  • 972e456f20 recalculate toque_number for other countries evgeniy-st 2019-10-31 19:21:06 +0300
  • 47b7a7bde1 Merge branch 'feature/recalculate-toque-number' into develop evgeniy-st 2019-10-31 19:10:25 +0300
  • 6d34e406db recalculate toque number evgeniy-st 2019-10-31 19:09:57 +0300
  • 76288a4524 Merge branch 'feature/tag-index-name' into 'develop' a.feteleu 2019-10-31 16:03:54 +0000
  • a8861238ac Time format for country Kuroshini 2019-10-16 14:11:07 +0300
  • 5d43e2fd5b refactor models Anatoly 2019-10-31 18:44:30 +0300
  • 3c88d4f1f5 carousel serializer alex 2019-10-31 18:31:15 +0300
  • 26e04719c3 Index name for tags Kuroshini 2019-10-16 14:11:07 +0300
  • f237c37840 Merge remote-tracking branch 'origin/develop' into maigrate-carousel alex 2019-10-31 17:56:15 +0300
  • 1946bddad2 start carousel alex 2019-10-31 17:55:19 +0300
  • fe586755e3 small fix Anatoly 2019-10-31 17:54:56 +0300
  • dd38e6e5de refactor models Anatoly 2019-10-31 17:53:37 +0300
  • 1abe280ef7 Add unique collection Виктор Гладких 2019-10-31 17:51:23 +0300
  • 2ae68e60e4 Add flag updates with command python manage.py transfer --update_country_flag littlewolf 2019-10-31 17:47:31 +0300
  • a44081c2e7 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-10-31 17:38:07 +0300
  • b87f21c630 update transfer tz field evgeniy-st 2019-10-31 17:34:59 +0300
  • 4460559541 Merge branch 'fix-subquery' into 'develop' e.stoyushko 2019-10-31 14:23:25 +0000
  • 55e68ec336 fix establishment mark alex 2019-10-31 17:19:07 +0300
  • 7b4837f4f3 Add Виктор Гладких 2019-10-31 17:04:25 +0300
  • 989e80ece6 First Виктор Гладких 2019-10-31 16:57:12 +0300
  • 30a58473c3 using a fallback language for translation evgeniy-st 2019-10-31 16:11:46 +0300
  • 6c8deb5f80 Merge branch 'feature/geo-subtypes' into 'develop' e.stoyushko 2019-10-31 11:52:10 +0000
  • 453a4f5cac remove celerybeat-schedule from git evgeniy-st 2019-10-31 14:46:42 +0300
  • af0768b4cc Merge branch 'develop' into fix-subquery evgeniy-st 2019-10-31 14:45:22 +0300
  • 2c9d579a54 Update models.py e.stoyushko 2019-10-31 11:42:57 +0000
  • 0d399cc44e add_establishment_mark command alex 2019-10-31 12:29:40 +0300
  • 7be3c2b93f add_establishment_description command alex 2019-10-31 12:02:52 +0300
  • 6fe8252025 need refactoring, put temporary solution TagBaseSerializer TagCategoryBaseSerializer Anatoly 2019-10-31 11:04:53 +0300
  • 20785770e1 Add transfer_language littlewolf 2019-10-31 10:05:39 +0300
  • c8554772f1 Fix review published_at Add old_id Add description to establishment littlewolf 2019-10-31 10:04:49 +0300
  • fea93f50f7 fix image_url for establishment alex 2019-10-31 09:40:50 +0300