Commit Graph

Select branches

Hide Pull Requests

develop

Mono Color

• be31c75c19 disable elastic Dmitriy Kuzmenko 2019-10-28 14:19:22 +0300
• 3628283105 Booking pre-payment more info Kuroshini 2019-10-16 14:11:07 +0300
• ed09ee78cc small refactoring Anatoly 2019-10-28 13:11:07 +0300
• 65e7c965e4 added migrations Anatoly 2019-10-28 12:46:10 +0300
• 64b7d1469b Merge branch 'develop' into feature/products Anatoly 2019-10-28 12:36:36 +0300
• fe76fa64b5 Merge remote-tracking branch 'origin/develop' into develop Anatoly 2019-10-28 12:34:42 +0300
• 2ebeffcf3e Merge branch 'develop' of /home/a.feteleu/projects/gm-backend with conflicts. Anatoly 2019-10-28 12:34:37 +0300
• d12df5c8e1 added WineAppellation model Anatoly 2019-10-28 12:33:48 +0300
• 853b0e047e add settings for dev server Dmitriy Kuzmenko 2019-10-28 11:41:47 +0300
• 4e0f3c9a4d with address alex 2019-10-28 10:59:28 +0300
• 49dbc9c72e Merge remote-tracking branch 'origin/migrate-location-app' into origin/feature/migrate-etablishment alex 2019-10-28 10:22:33 +0300
• 7feed3ac8f Move address transfer to dictionaries littlewolf 2019-10-28 10:14:11 +0300
• 3622ac22b9 Add migrations littlewolf 2019-10-28 10:13:43 +0300
• 7d556df8d5 Add address serializer littlewolf 2019-10-28 10:13:01 +0300
• 281d57996e fix null timezone alex 2019-10-28 09:24:56 +0300
• 25d58a8bc5 Fix and add city transfer littlewolf 2019-10-28 07:19:17 +0300
• 255b1ad5f1 Fix queryset conditions littlewolf 2019-10-28 00:15:37 +0300
• 0d30543664 Fix regions with subregions littlewolf 2019-10-27 21:43:34 +0300
• f146829d10 Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/feature/migrate-etablishment alex 2019-10-27 20:55:34 +0300
• 07f226604e Fix regions without subregion littlewolf 2019-10-27 20:31:41 +0300
• e41b539ed7 added wine region Anatoly 2019-10-27 18:42:51 +0300
• 0db2638eb8 Fix country queryset littlewolf 2019-10-27 17:23:04 +0300
• 3b68a4dc19 establishment fin fix 1 alex 2019-10-27 16:47:08 +0300
• 25a2edf17d establishment fin alex 2019-10-27 16:23:30 +0300
• 7eb241ffed Tmp commit littlewolf 2019-10-27 12:47:45 +0300
• 16f06ce2f1 fix news slug alex 2019-10-26 22:02:38 +0300
• 490fae3c00 Merge branch 'origin/feature/migration' into origin/feature/migrate-etablishment alex 2019-10-26 20:47:49 +0300
• 37d745eeaa added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype Anatoly 2019-10-26 18:54:22 +0300
• 8bcf4c9ca0 Add child regions littlewolf 2019-10-26 09:35:09 +0300
• cd724de65f Move countries to dictionaries littlewolf 2019-10-26 09:19:34 +0300
• 06b12f9427 Add country transfer littlewolf 2019-10-26 09:18:45 +0300
• 7e757aa63f Merge branch 'origin/feature/migration' into migrate-location-app littlewolf 2019-10-26 08:45:12 +0300
• e72e92244b Update country serializer littlewolf 2019-10-26 08:42:00 +0300
• dad4c5f5a3 Booking pre-payment Kuroshini 2019-10-16 14:11:07 +0300
• e3616ee7f8 change news_preview geometry string on 300x2260 Anatoly 2019-10-25 17:31:59 +0300
• e0ada64f96 Merge branch 'feature/employee_position_index_name' into 'develop' d.kuzmenko 2019-10-25 13:41:53 +0000
• e1e0f1e997 Added index_name in employee position Semyon Yekhmenin 2019-10-25 13:41:53 +0000
• 7d0acba51b added to same_theme and should_read preview_image_url, added UniqueConstraint to NewsGallery model Anatoly 2019-10-25 16:18:16 +0300
• 174e580c20 Merge branch 'feature/search-by-type' into develop evgeniy-st 2019-10-25 16:07:38 +0300
• d4fe5ebd2d search by type & subtype evgeniy-st 2019-10-25 16:06:52 +0300
• e9683ed668 Merge branch 'feature/fix_role' into 'develop' d.kuzmenko 2019-10-25 13:06:38 +0000
• fb770f8e2a Fix merge Виктор Гладких 2019-10-25 15:56:02 +0300
• a38fed847a Fix roles Виктор Гладких 2019-10-25 15:51:07 +0300
• b7831b9739 Fix IsContentPageManager Виктор Гладких 2019-10-25 15:25:35 +0300
• 0015e16959 Merge branch 'feature/scheduled-establishment-reindexing' into 'develop' d.kuzmenko 2019-10-25 12:16:00 +0000
• 4eaa600fc1 Fix all tests Kuroshini 2019-10-16 14:11:07 +0300
• dd0b595132 Review fixes Kuroshini 2019-10-16 14:11:07 +0300
• 7f23f0e891 Establishment each hour reindexing Kuroshini 2019-10-16 14:11:07 +0300
• 9129d44708 Merge branch 'feature/country_name_in_site_settings' into 'develop' d.kuzmenko 2019-10-25 10:54:01 +0000
• 91f6503a26 Added country name to site settings Semyon Yekhmenin 2019-10-25 10:54:01 +0000
• 3e34dcda91 Merge remote-tracking branch 'origin/origin/feature/migration' into origin/feature/migration michail 2019-10-25 15:43:05 +0500
• 76d6e22fb9 added transfer for advertisement michail 2019-10-25 15:42:54 +0500
• 7f4b46dbf8 Fix country admin Виктор Гладких 2019-10-25 12:42:01 +0300
• abe8eae655 Tmp littlewolf 2019-10-25 12:27:38 +0300
• fc2e31a856 Merge branch 'feature/migration' into origin/feature/migrate-etablishment alex 2019-10-25 12:12:26 +0300
• 0f595ee40b merge migrations alex 2019-10-25 12:07:02 +0300
• 09647fa4d3 start transfer_data alex 2019-10-25 12:03:43 +0300
• d79946633e fix get_description for recipe.py michail 2019-10-25 13:17:35 +0500
• 72713badff remove print from tests Dmitriy Kuzmenko 2019-10-25 11:04:40 +0300
• 046d0c5fe6 Fix country and comment role Виктор Гладких 2019-10-25 10:59:31 +0300
• 95811c7437 return to localhost alex 2019-10-25 10:33:31 +0300
• c33ea42b8e Merge branch 'develop' into feature/fix_role Виктор Гладких 2019-10-25 10:15:38 +0300
• 851ba7f9dd Test edit Виктор Гладких 2019-10-25 10:14:50 +0300
• bf375f3370 Remove errors Add version to timezonefinder littlewolf 2019-10-25 10:01:30 +0300
• cd294961e0 Merge remote-tracking branch 'origin/develop' into feature/migration alex 2019-10-25 10:00:25 +0300
• 95b5d4ad99 Merge branch 'develop' into migrate-location-app littlewolf 2019-10-25 09:54:03 +0300
• c61d5321a9 Tmp commit littlewolf 2019-10-25 09:52:35 +0300
• 106ddb044e Add country transfer littlewolf 2019-10-25 07:48:29 +0300
• 66ddfb455b fix tests Dmitriy Kuzmenko 2019-10-24 22:19:59 +0300
• 81cdaa5c89 added image_url & preview_image_url to NewsDocument Anatoly 2019-10-24 19:53:09 +0300
• 2864576c0c fix TimeZoneChoiceField evgeniy-st 2019-10-24 17:09:08 +0300
• 287578eb9e base models and funcs alex 2019-10-24 17:08:00 +0300
• 7ac7df9ea3 Fix test news Виктор Гладких 2019-10-24 16:48:29 +0300
• 84fb0aec70 change field parameter in model Guide (gm-241) Anatoly 2019-10-24 16:41:41 +0300
• f484219ec7 Merge branch 'feature/develop_ci' into 'develop' d.kuzmenko 2019-10-24 13:23:00 +0000
• 8a8986246f Merge branch 'bugfix/kuroshini' into develop evgeniy-st 2019-10-24 16:19:10 +0300
• 128488b5ee some bugfixes evgeniy-st 2019-10-24 16:17:37 +0300
• 2cf0a94ccb Fix migr Виктор Гладких 2019-10-24 16:14:18 +0300
• 449bf0f28c comment duplicate method alex 2019-10-24 16:11:26 +0300
• df52c8a582 Add merged migrations Виктор Гладких 2019-10-24 15:34:35 +0300
• a667655c09 pprint alex 2019-10-24 15:32:47 +0300
• a93a2ccc6a Fix Виктор Гладких 2019-10-24 15:28:53 +0300
• 6335abe1ea states dict fix alex 2019-10-24 15:24:31 +0300
• d09ca51d48 Merge branch 'feature/international_news_stub' into 'develop' d.kuzmenko 2019-10-24 12:21:59 +0000
• 2b9c9d14ef Added temporary stub for international news logic (hardcoded news id's) Semyon Yekhmenin 2019-10-24 12:21:59 +0000
• 8c5d59e6bf Revert "return fields" Kuroshini 2019-10-24 15:16:51 +0300
• 0dde77a64b Fix search_index news Виктор Гладких 2019-10-24 15:12:15 +0300
• 5826fb2475 mysql to docker-compose fix exception alex 2019-10-24 14:49:59 +0300
• b121e0ef8a Merge branch 'develop' into feature/develop_ci Виктор Гладких 2019-10-24 14:25:39 +0300
• 241453668c Merge branch 'return_news_images_in_search_request' into 'develop' d.kuzmenko 2019-10-24 11:23:11 +0000
• 2bbfbde879 Merge branch 'develop' into feature/develop_ci Виктор Гладких 2019-10-24 14:14:57 +0300
• 55ea169dce return fields Kuroshini 2019-10-16 14:11:07 +0300
• b6283863f4 Merge branch 'feature/establishment_currency' into 'develop' d.kuzmenko 2019-10-24 11:06:58 +0000
• 74b2b52ee1 Added currency to establishment model Semyon Yekhmenin 2019-10-24 11:06:58 +0000
• 3ce7e186f7 migrate from legacy news alex 2019-10-24 14:01:38 +0300
• 0adac058c5 Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news alex 2019-10-24 13:11:05 +0300
• 153a032853 Merge branch 'develop' into feature/develop_ci Виктор Гладких 2019-10-24 12:46:10 +0300
• 636bc43a35 remove playlist from news model evgeniy-st 2019-10-24 12:38:44 +0300
• 647147bf03 Merge branch 'develop' into feature/migrate-news alex 2019-10-24 12:28:51 +0300
• 7b10a71cf6 Merge remote-tracking branch 'origin/develop' into develop Anatoly 2019-10-24 12:18:19 +0300