Commit Graph

Select branches

Hide Pull Requests

develop

Mono Color

• 0da58133fc Fix news patch Kuroshini 2019-12-26 18:34:59 +0300
• 02d0112d8b add export for guides Dmitriy Kuzmenko 2019-12-26 18:11:48 +0300
• 396921fa75 fix GM-318 alex 2019-12-26 16:02:17 +0300
• 7648e478f5 allow city main image changing Kuroshini 2019-12-26 15:00:05 +0300
• 2651ad1a29 Add order littlewolf 2019-12-26 14:19:26 +0300
• 668bc92b97 fix print alex 2019-12-26 10:45:17 +0300
• 0152538333 author for review text alex 2019-12-26 10:33:27 +0300
• 1189b6ff58 see changes Anatoly 2019-12-26 10:24:08 +0300
• cbe03b2f5a Merge branch 'develop' into feature/guides Anatoly 2019-12-25 22:16:48 +0300
• 986936fdf5 Merge remote-tracking branch 'origin/feature/guides' into feature/guides Anatoly 2019-12-25 22:15:22 +0300
• d9df886b98 added guide type field, added tasks, refactored GuideElement model, added endpoint, Anatoly 2019-12-25 22:14:35 +0300
• ac2dc2344e try to fix issue w/ news elastic update Kuroshini 2019-12-25 18:50:59 +0300
• f3c48281d4 back office news reformat Kuroshini 2019-12-25 18:09:45 +0300
• 61eca800fc Merge branch 'review_users' into 'develop' d.kuzmenko 2019-12-25 12:54:11 +0000
• d173664750 rm comments alex 2019-12-25 15:35:55 +0300
• d7c7880860 add counter for public_mark and change Guid serializer Dmitriy Kuzmenko 2019-12-25 15:19:43 +0300
• cd194b79bd fix artisans chosen tags Kuroshini 2019-12-25 14:05:48 +0300
• 432873da31 fix main_image for news Kuroshini 2019-12-25 13:48:04 +0300
• bc0db915be author for review text alex 2019-12-25 09:15:36 +0300
• 8a34ef6477 Merge remote-tracking branch 'origin/develop' into review_users alex 2019-12-25 09:15:13 +0300
• 670da807af Fix fake country flag littlewolf 2019-12-24 14:10:47 +0300
• 92e5f7a40b signals for text field alex 2019-12-24 13:40:27 +0300
• 65746b1cd0 Merge branch 'develop' into feature/guides Anatoly 2019-12-24 12:33:39 +0300
• 62e12d8570 Merge remote-tracking branch 'origin/feature/fix-country-region-city-transfer' into feature/fix-country-region-city-transfer Anatoly 2019-12-24 12:25:42 +0300
• d9e45702ec merge Anatoly 2019-12-24 12:24:13 +0300
• 858b6f3544 Merge branch 'develop' into feature/fix-country-region-city-transfer Anatoly 2019-12-24 12:10:16 +0300
• d4c2af9d65 Fix country littlewolf 2019-12-24 11:53:46 +0300
• 069a2ad2a8 review text author model alex 2019-12-24 11:35:20 +0300
• 0c2dacb3bf Merge branch 'develop' into feature/fix-country-region-city-transfer littlewolf 2019-12-24 11:03:08 +0300
• 18d6c10120 footer links alex 2019-12-24 10:29:48 +0300
• db5c879459 refactored method to get similar list on entities (see todo: establishment/models.py) Anatoly 2019-12-23 17:53:48 +0300
• f0ed1c0a8c Merge branch 'feature/carousel_international_news' into 'develop' Олег Хаятов 2019-12-23 14:39:45 +0000
• 28331e5274 Implemented filtering carousel entries by country code when country code specified and international carousel when not Semyon Yekhmenin 2019-12-23 14:39:45 +0000
• 63304aa2d1 add merge migrations Dmitriy Kuzmenko 2019-12-23 17:16:33 +0300
• cd7ba1996d Merge branch 'feature/collection-slugs' into 'develop' d.kuzmenko 2019-12-23 14:09:27 +0000
• 6e35713772 add merge migrations Dmitriy Kuzmenko 2019-12-23 17:07:49 +0300
• 2580b9f218 Merge branch 'develop' into feature/collection-slugs Dmitriy Kuzmenko 2019-12-23 16:57:24 +0300
• 56ed5432e3 Merge branch 'fix/file-upload-size' into 'develop' d.kuzmenko 2019-12-23 13:50:35 +0000
• dd11a4aef8 Merge branch 'feature/subscription-types' into 'develop' d.kuzmenko 2019-12-23 13:50:09 +0000
• 3ff7246bea Feature/subscription types Semyon Yekhmenin 2019-12-23 13:50:09 +0000
• cb8f0fe2d9 Merge branch 'feature/news_event_model_update' into 'develop' d.kuzmenko 2019-12-23 13:45:47 +0000
• 9e19a8fc97 Feature/news event model update Semyon Yekhmenin 2019-12-23 13:45:47 +0000
• 6a68042178 Merge branch 'feature/permission_liquor' into 'develop' d.kuzmenko 2019-12-23 13:40:13 +0000
• 8efd4e3c77 Fix slugify Ruslan Stepanov 2019-12-23 13:20:46 +0000
• e4dada0d1d news transfer fix add tags alex 2019-12-23 16:01:47 +0300
• 14b8d16e90 news transfer fix alex 2019-12-23 15:54:58 +0300
• cbca13093f fix news type alex 2019-12-23 15:43:27 +0300
• 1c04703c77 fix test and news type alex 2019-12-23 15:39:54 +0300
• 50d0997569 Merge remote-tracking branch 'origin/bug/bind-author-news' into develop Kuroshini 2019-12-23 15:17:32 +0300
• 1849166bae Fix author bug dormantman 2019-12-23 15:12:27 +0300
• 8083965619 Merge branch 'fix/qs_for_site_feature' into 'develop' d.kuzmenko 2019-12-23 11:59:29 +0000
• 31fa1dacce Add qs to SiteFeatures views Виктор Гладких 2019-12-23 14:54:42 +0300
• 61c1f92c2c change serializer for news photo binding Kuroshini 2019-12-23 13:56:10 +0300
• 6f9cec2450 fix swagger Kuroshini 2019-12-23 13:54:10 +0300
• 3b661f24ca fix issues w/ tags Kuroshini 2019-12-23 13:51:29 +0300
• 56309f2a10 Update fake country flag littlewolf 2019-12-23 13:14:48 +0300
• f576825a71 Merge branch 'develop' into feature/guides Anatoly 2019-12-23 13:11:05 +0300
• 2fb338bc59 refactored method to get similar list on entities (see todo: establishment/models.py) Anatoly 2019-12-23 12:59:39 +0300
• 7452f0bef0 intermediate commit Anatoly 2019-12-23 12:38:13 +0300
• f6dac3cbcd fix news test alex 2019-12-23 12:33:31 +0300
• 9e7a950088 Set code style dormantman 2019-12-23 12:13:13 +0300
• 7525e6ceef Merge branch 'nes_transfer' into develop alex 2019-12-23 11:55:05 +0300
• 17fdc7705e news transfer fin alex 2019-12-23 11:53:34 +0300
• a6bcbdddc1 fix es image url Anatoly 2019-12-23 09:44:29 +0300
• cc7125b468 added image url to es Anatoly 2019-12-20 18:34:33 +0300
• 56b2b243da Merge remote-tracking branch 'origin/develop' into nes_transfer alex 2019-12-23 08:28:28 +0300
• f565e188f1 Merge branch 'panels' into develop Dmitriy Kuzmenko 2019-12-22 20:34:29 +0300
• f010c97433 add export for panel Dmitriy Kuzmenko 2019-12-22 20:33:51 +0300
• 1247b4c577 indexing working time Kuroshini 2019-12-20 22:28:57 +0300
• d97972a3ef fix tags indexing (final) Kuroshini 2019-12-20 22:07:19 +0300
• 35673f9ad0 fix tags indexing #2 Kuroshini 2019-12-20 21:59:49 +0300
• 1771b02afd fix tags indexing Kuroshini 2019-12-20 21:57:46 +0300
• 0f0a3f9577 hardcoded tags Kuroshini 2019-12-20 21:10:28 +0300
• ee8d133248 Example for tags creation Kuroshini 2019-12-20 20:11:58 +0300
• 215f36eb9b Add unused subregions littlewolf 2019-12-20 19:35:59 +0300
• dd07769b9b remove label fields from tags Kuroshini 2019-12-20 19:25:14 +0300
• 660c8e791b tags translation Kuroshini 2019-12-20 19:08:53 +0300
• d1699e001e tag models translations in interface dictionary Kuroshini 2019-12-20 18:01:46 +0300
• 72e5d723db added default image for type/subtype Anatoly 2019-12-20 17:26:55 +0300
• 5afd0884ee Merge branch 'feature/collection-object-types' into 'develop' Олег Хаятов 2019-12-20 14:02:54 +0000
• 2ca31cedfb Added none condition to response dormantman 2019-12-20 16:59:14 +0300
• 0420fafabf Added types to collection objects dormantman 2019-12-20 16:52:25 +0300
• 2499c0406d news transfer serializer alex 2019-12-20 16:19:04 +0300
• 0993f0a451 Revert "Fix collections back url" Kuroshini 2019-12-20 16:04:23 +0300
• 796914fbe6 Merge branch 'fix/collections-url' into 'develop' Олег Хаятов 2019-12-20 12:41:25 +0000
• dbc928a2f5 Fix collections back url dormantman 2019-12-20 15:35:17 +0300
• 8e20424b78 bo creation & modification news info Kuroshini 2019-12-20 14:32:01 +0300
• 769a71b5eb Fix littlewolf 2019-12-20 13:52:20 +0300
• 80759c24e7 Fix number littlewolf 2019-12-20 13:19:56 +0300
• aa7ebf4d4c Merge remote-tracking branch 'origin/develop' into develop littlewolf 2019-12-20 13:04:30 +0300
• 2b8e158954 Merge branch 'feature/add-accounts-csv' into develop littlewolf 2019-12-20 13:04:04 +0300
• 7a5897e0bb Add slash Add docs littlewolf 2019-12-20 13:02:28 +0300
• 35b7846ca1 refactored methods for getting similar establishments Anatoly 2019-12-20 12:57:48 +0300
• 821526d631 remove incorrect check for establishment, set schedule attr property as blank=True, refactored timetable model Anatoly 2019-12-20 12:36:11 +0300
• 3dd76503a5 Merge branch 'develop' into feature/fix-country-region-city-transfer littlewolf 2019-12-20 11:55:23 +0300
• 819e4366f7 Fix locatioin Add decorator to log littlewolf 2019-12-20 11:52:40 +0300
• 36834835cd added filters to location views Anatoly 2019-12-20 11:05:02 +0300
• 71fb3249b0 add chenge to panel admin Dmitriy Kuzmenko 2019-12-20 10:02:59 +0300
• 93c9daf6c4 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2019-12-20 10:01:33 +0300
• f69d7d6e71 add chenge to panel admin Dmitriy Kuzmenko 2019-12-20 10:01:22 +0300