phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • fd0a491e89 Merge branch 'develop' into feature/employee_crud ВашÐВиктор ГладкихÐ 2019-09-19 10:10:31 +0300
  • aff68fe288 Merge branch 'feature/advertisements_update' into 'develop' d.kuzmenko 2019-09-19 07:05:32 +0000
  • e2e7734bf2 Feature/advertisements update Semyon Yekhmenin 2019-09-19 07:05:32 +0000
  • 22bdcbacea Merge branch 'feature/employee_priority' into 'develop' d.kuzmenko 2019-09-19 07:02:45 +0000
  • f700491d42 Added employee position priority Semyon Yekhmenin 2019-09-19 07:02:45 +0000
  • 540a819f94 gm-80: in progress Anatoly 2019-09-18 18:46:24 +0300
  • a1ea35fce1 CRUD logic for employee ВашÐВиктор ГладкихÐ 2019-09-18 18:12:49 +0300
  • 6269abbbf6 Merge branch 'feature/establishment_preview_image_crop_fix' into 'develop' d.kuzmenko 2019-09-18 13:52:10 +0000
  • bb5e294d6e Fixed preview image crop Semyon Yekhmenin 2019-09-18 13:52:09 +0000
  • 06c518501d fix migrations evgeniy-st 2019-09-18 16:42:06 +0300
  • 8e0b19b8b0 ES. Establishment type & subtypes evgeniy-st 2019-09-18 16:40:07 +0300
  • 4005fad64a Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-09-18 16:06:01 +0300
  • 4be007aade ES: geo spatial filter evgeniy-st 2019-09-18 16:05:42 +0300
  • 29b0c907f9 Merge branch 'feature/ordered_site_features' into 'develop' d.kuzmenko 2019-09-18 12:51:39 +0000
  • 28e8bac84e Added priority to site features Semyon Yekhmenin 2019-09-18 12:51:39 +0000
  • 3f55e001cc ES. Establishment. filter by collection_type evgeniy-st 2019-09-18 15:05:28 +0300
  • 6e7a617a67 Added field - vintage_year, absolute image_url to Carousel ListAPIView Anatoly 2019-09-18 13:14:57 +0300
  • af0c134957 Fixed docs Anatoly 2019-09-18 12:16:32 +0300
  • 4a3e028c3a Fixed reset password Anatoly 2019-09-18 11:50:28 +0300
  • 51d0ae0d60 Merge branch 'develop' into feature/elasticsearch-establishment-tags evgeniy-st 2019-09-18 11:47:55 +0300
  • 39b2fc49b5 ES Establishment tags. indexing & search evgeniy-st 2019-09-18 11:46:53 +0300
  • 20fe40010c Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2019-09-18 11:41:43 +0300
  • e9bf129f82 add api locations for back office Dmitriy Kuzmenko 2019-09-18 11:39:46 +0300
  • 61fc78eeb9 fixed cookie settings for stage server Anatoly 2019-09-18 11:28:00 +0300
  • 784728d155 Facebook auth return user email; fixed URL in templates Anatoly 2019-09-18 11:21:06 +0300
  • 2908286e6c price_level & toque_number settings evgeniy-st 2019-09-18 10:50:00 +0300
  • 6e4e1b214d Merge branch 'develop' into feature/elasticsearch-establishment-address evgeniy-st 2019-09-17 17:34:22 +0300
  • e67d7767a1 Elasticsearch: establishment address. Filter by country_id, country_code evgeniy-st 2019-09-17 17:33:07 +0300
  • ccc1660e1f Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop Dmitriy Kuzmenko 2019-09-17 17:16:48 +0300
  • c3717ecfd9 merge transportation Dmitriy Kuzmenko 2019-09-17 17:16:35 +0300
  • 69f1a5cf48 GM-73 added ordering Anatoly 2019-09-17 17:16:21 +0300
  • 6d873d66a2 Merge remote-tracking branch 'origin/feature/establishment_transportation_field' into develop Dmitriy Kuzmenko 2019-09-17 17:07:29 +0300
  • 75f75ba3fd Merge branch 'develop' into feature/gm-73 Anatoly 2019-09-17 15:37:07 +0300
  • 27a1998dbc GM-73: Логика похожих ресторанов Anatoly 2019-09-17 15:36:33 +0300
  • 4ee6306efb Add transportation text field to establishment model Kuroshini 2019-09-17 13:47:41 +0300
  • 2abf2c7ffe fix import evgeniy-st 2019-09-17 11:02:32 +0300
  • 8ac46b7379 sentry settings for dev-server evgeniy-st 2019-09-17 10:42:05 +0300
  • 7a021a1435 update establishment search view evgeniy-st 2019-09-16 17:56:51 +0300
  • a190f2ca88 fix settings for stage server Dmitriy Kuzmenko 2019-09-16 17:27:42 +0300
  • e572ff6445 increase cookies max-age Anatoly 2019-09-16 15:50:33 +0300
  • db5ff7afcd update settings, update establishment document evgeniy-st 2019-09-16 11:21:14 +0300
  • 8e864d32b9 Merge branch 'develop' into feature/elasticsearch evgeniy-st 2019-09-16 10:58:09 +0300
  • adbf5d57c5 update docker-compose file evgeniy-st 2019-09-16 10:46:34 +0300
  • 0043b1a8c1 Merge branch 'feature/gm-25' into develop Anatoly 2019-09-16 09:38:52 +0300
  • 306cb76e1c GM-25: Added comments Anatoly 2019-09-16 09:35:20 +0300
  • 555aa9a4e1 GM-25: Получение главной зоны Anatoly 2019-09-13 18:08:36 +0300
  • 30875958ea increase access token lifetime to 30 days and unregister unused models in admin page Anatoly 2019-09-13 12:36:54 +0300
  • 15f02b72ca add email and phone api for establishments Dmitriy Kuzmenko 2019-09-13 12:20:36 +0300
  • 10d9b52bec Merge remote-tracking branch 'origin/develop' into feature/backoffice Dmitriy Kuzmenko 2019-09-12 18:27:04 +0300
  • efac785248 add api for estab, social, plates, menu Dmitriy Kuzmenko 2019-09-12 18:24:21 +0300
  • 1e650b9b1f replace ImageFields to URLFields in User model, refactored serializers that included this fields Anatoly 2019-09-12 18:10:52 +0300
  • e4eedd8af2 Merge remote-tracking branch 'origin/feature/nearest_restaurants' into develop Anatoly 2019-09-12 17:36:52 +0300
  • f45ac7e7fe fixed establishment detail Anatoly 2019-09-12 17:33:55 +0300
  • c768228bc9 Merge branch 'feature/gm-26' into develop Anatoly 2019-09-12 16:18:57 +0300
  • 1ee21edb8e added endpoint to retrieve establishment tags Anatoly 2019-09-12 16:18:42 +0300
  • 075298f6ec refactored apps account, authorization, news, utils Anatoly 2019-09-12 14:44:49 +0300
  • bdc2c327f6 Registered path for nearest establishments Semyon 2019-09-12 14:25:03 +0300
  • 5943839eda Added view for nearest establishments Semyon 2019-09-12 14:24:48 +0300
  • ec2e87fe1a fixed settings for COOKIES, related to unable to login in admin page (CSRF ERROR) Anatoly 2019-09-12 10:20:11 +0300
  • a0ca5ab964 Merge branch 'feature/redirect' into develop Anatoly 2019-09-12 09:34:06 +0300
  • 2c41e532c8 fixed ChangePasswordView Anatoly 2019-09-12 09:33:09 +0300
  • 06c7d790bb added redirect for ConfirmEmail and ResetPassword Anatoly 2019-09-11 18:53:02 +0300
  • f8c795cd03 added redirect for ConfirmEmail and ResetPassword Anatoly 2019-09-11 18:53:02 +0300
  • 2622395006 add local docker conf override to gitignore Kuroshini 2019-09-11 17:06:01 +0300
  • cf884ed906 fixed UserSerializer, PasswordResetSerializer Anatoly 2019-09-11 12:07:30 +0300
  • 434df203da fixed account detail Anatoly 2019-09-10 18:03:01 +0300
  • 530ce38527 fixed account detail Anatoly 2019-09-10 17:53:50 +0300
  • 2d102f0005 added cookie settings for local and development Anatoly 2019-09-10 17:16:03 +0300
  • b5707c6b26 Revert "added cookie settings for local and development" Anatoly 2019-09-10 17:12:56 +0300
  • 8e506bd5e1 added cookie settings for local and development Anatoly 2019-09-10 17:05:41 +0300
  • 7e468c539a change project settings Anatoly 2019-09-10 15:35:24 +0300
  • cf1c10d6ec Revert "small refactoring favorites" a.feteleu 2019-09-10 12:19:00 +0000
  • c04d7b1bd3 remove unused dependencies Anatoly 2019-09-10 15:01:45 +0300
  • 500e470b39 Added CORSMiddleware Anatoly 2019-09-10 15:01:10 +0300
  • c58d3bae36 Tags indexing and search (by id) evgeniy-st 2019-09-10 12:58:39 +0300
  • a4d7430379 small refactoring favorites Anatoly 2019-09-10 12:19:21 +0300
  • 0647c46292 GM-68: Реализовать метод возвращения списка избранного для пользователя Anatoly 2019-09-10 12:00:32 +0300
  • 96ecdc69ca fixed UserSerializer Anatoly 2019-09-10 09:45:48 +0300
  • 40605ff123 change flag is_active after authorization Anatoly 2019-09-09 18:00:17 +0300
  • 89830ffdac small fix Anatoly 2019-09-09 17:12:03 +0300
  • 64b101516d GM-81: Доарботать механизм авторизации при невалидированном email и изменении email Anatoly 2019-09-09 15:45:51 +0300
  • 9fab4454a0 Establishment index evgeniy-st 2019-09-09 15:39:31 +0300
  • 87efc50d94 translated field into serializer evgeniy-st 2019-09-09 14:55:44 +0300
  • efe1539dad Refactored ImageSerializer Anatoly 2019-09-09 13:14:43 +0300
  • 808178d56c GM-70: Добавить пагинацию комментариев в карточке ресторанов Anatoly 2019-09-09 13:12:48 +0300
  • b326d7b8fd Overrided searchfilterbackend evgeniy-st 2019-09-09 12:00:53 +0300
  • 273f74f911 added flag in_favorites in establishment Anatoly 2019-09-09 11:37:57 +0300
  • 2f5240adfa GM-67: Внедрить передачу флага нахождения заведения в избранном пользователя Anatoly 2019-09-09 11:36:17 +0300
  • 7577ad330c union favorites create/destroy in one endpoint Anatoly 2019-09-09 10:47:38 +0300
  • 0f6786fb13 favorites refactoring Anatoly 2019-09-09 10:25:34 +0300
  • e6144d8f33 small fix Anatoly 2019-09-09 09:25:38 +0300
  • 1848bafd64 added new model favorites Anatoly 2019-09-06 17:55:17 +0300
  • 43804ae5ab some fixes evgeniy-st 2019-09-06 17:34:21 +0300
  • b6a3aa4264 update subscriber serializer evgeniy-st 2019-09-06 14:54:11 +0300
  • 99011ba15a Initial search indexes app evgeniy-st 2019-09-06 14:52:52 +0300
  • cfe1c982be update docker-compose, requirements, base settings evgeniy-st 2019-09-06 14:27:14 +0300
  • e1d6455e81 added field cropped_image to User model Anatoly 2019-09-06 13:47:37 +0300
  • 5449891394 added validation to UserSerializer Anatoly 2019-09-06 11:55:56 +0300
  • 20921719d3 refactored account Anatoly 2019-09-06 11:45:30 +0300
  • 742d700d3c refactored comments Anatoly 2019-09-06 11:06:02 +0300