Commit Graph

  • 880c387759 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-10-03 18:12:12 +0300
  • cb37b5733e update migration evgeniy-st 2019-10-03 18:10:29 +0300
  • 729a77866d update elasticsearch index evgeniy-st 2019-10-03 17:19:30 +0300
  • ea427d6451 Update module littlewolf 2019-10-03 16:35:54 +0300
  • 018d9f6557 added establishment and collection transfer.py files michail 2019-10-03 17:54:26 +0500
  • 53db4462f8 Added lastable booking availability checking method Kuroshini 2019-10-03 14:59:38 +0300
  • 6e9da70594 Merge branch 'develop' into feature/news-rating Виктор Гладких 2019-10-03 14:52:30 +0300
  • 9fd064fdec Add rating unique value Виктор Гладких 2019-10-03 14:51:17 +0300
  • 14cf7d7b1b Add rating value in news Виктор Гладких 2019-10-03 14:46:34 +0300
  • 0408d93599 Squashed migrations && added lastable credentials Kuroshini 2019-10-03 13:41:45 +0300
  • 4c734cc2ec Merge branch 'feature/translate-classes-carousel' into 'develop' e.stoyushko 2019-10-03 09:18:25 +0000
  • 295bda4b4f Add hours Виктор Гладких 2019-10-03 11:41:52 +0300
  • 38be14b5ba Merge branch 'develop' into feature/news-rating Виктор Гладких 2019-10-03 11:39:24 +0300
  • f90e1ceded Add raiting Виктор Гладких 2019-10-03 11:37:59 +0300
  • cf7184d7ac Switch transfer standard Add utils Add -d key littlewolf 2019-10-03 00:29:19 +0300
  • 288d6cd699 Tmp littlewolf 2019-10-02 18:18:32 +0300
  • 4796fce784 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-02 18:11:47 +0300
  • 296a09165d added migration Anatoly 2019-10-02 18:09:29 +0300
  • f0001eef93 Add get method in view Виктор Гладких 2019-10-02 17:58:22 +0300
  • 750f141017 Merge branch 'feature/sending-news-email' into 'develop' d.kuzmenko 2019-10-02 14:17:29 +0000
  • f693c36382 switched host email account, changed exception error Anatoly 2019-10-02 17:16:19 +0300
  • 83ffb4dae1 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-02 16:22:11 +0300
  • fec3e703ce refactored collection views Anatoly 2019-10-02 16:21:38 +0300
  • e66b2f7f9f refactored Anatoly 2019-10-02 16:13:21 +0300
  • 223447fc95 added model dicts to location/transfer.py michail 2019-10-02 18:11:16 +0500
  • ae4d6c3ccd Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-02 15:46:35 +0300
  • 8e3bb54508 added endpoint for retrieving collection detail information Anatoly 2019-10-02 15:09:19 +0300
  • 7b18d7e430 Model and admin Виктор Гладких 2019-10-02 14:50:30 +0300
  • e2a991df98 Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects michail 2019-10-02 16:31:06 +0500
  • c0384cf037 first michail 2019-10-02 16:30:39 +0500
  • 59320f4333 Add temp transfer options to apps.location littlewolf 2019-10-02 14:23:24 +0300
  • 753471544e Add app Rating Виктор Гладких 2019-10-02 14:17:06 +0300
  • 402bd32eda gm-148: modified news gallery Anatoly 2019-10-02 14:10:23 +0300
  • ca9475b182 refactor this feature evgeniy-st 2019-10-02 12:35:01 +0300
  • 9dcdb7575e Switch application Add application command Update mixin Add mixin to models littlewolf 2019-10-02 11:41:14 +0300
  • 5ec81f417a fix bug michail 2019-10-02 13:37:46 +0500
  • 393ecbb55c Merge remote-tracking branch 'origin/feature/sending-news-email' into feature/sending-news-email michail 2019-10-02 13:31:29 +0500
  • fb9e71cbdd fix querysets michail 2019-10-02 13:27:33 +0500
  • e611e3154d Push Виктор Гладких 2019-10-02 11:21:28 +0300
  • 0578768ebd Merge remote-tracking branch 'origin/develop' into feature/sending-news-email michail 2019-10-02 13:17:24 +0500
  • 8f66f5372d Merge branch 'develop' into feature/will-also-like-news evgeniy-st 2019-10-02 10:45:16 +0300
  • 3234a71cde gm-148: modified settings, added missing migration Anatoly 2019-10-02 10:34:17 +0300
  • b31e71d4ef Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-02 10:20:14 +0300
  • d9635a8599 gm-148: refactored Anatoly 2019-10-02 10:16:32 +0300
  • 02638a26fe added sending through celery michail 2019-10-02 12:09:45 +0500
  • c0149a0695 added country_code to news email template michail 2019-09-30 12:42:49 +0500
  • c28d1cf3a0 fix locale and country code in task michail 2019-09-30 12:18:18 +0500
  • b96ed30a49 added news mail template and task without celery delay michail 2019-09-30 12:10:45 +0500
  • 5474c2ff69 added news mail template and task without celery delay michail 2019-09-30 12:09:53 +0500
  • 6683d4a4ef First commit michail 2019-09-27 11:14:18 +0500
  • df6b221029 Review fixes Kuroshini 2019-10-01 21:32:24 +0300
  • 4cf0ce831b Raise error whether field's absent Kuroshini 2019-10-01 20:12:47 +0300
  • 393aa9ef28 Merge migrations after rebase Kuroshini 2019-10-01 18:30:49 +0300
  • 4c960c8abf Booking (squashed commit) Kuroshini 2019-10-01 18:24:33 +0300
  • 1247cefa3b Merge branch 'develop' into feature/refactor-address evgeniy-st 2019-10-01 18:07:59 +0300
  • 7ca6e49161 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-10-01 18:07:20 +0300
  • e42f4d061c refactor address evgeniy-st 2019-10-01 18:07:04 +0300
  • 266ace6912 Merge branch 'develop' into feature/sending-news-email Виктор Гладких 2019-10-01 17:52:28 +0300
  • 0c79548027 Fix Виктор Гладких 2019-10-01 17:51:27 +0300
  • 1f85f63d20 Fix celery Виктор Гладких 2019-10-01 17:45:57 +0300
  • 9793c0a49f Resend confirmation email method Kuroshini 2019-10-01 17:42:37 +0300
  • 9f280857ef change docker-compose for working celery Dmitriy Kuzmenko 2019-10-01 17:42:37 +0300
  • ee221d0938 Fix celery Виктор Гладких 2019-10-01 17:33:21 +0300
  • 516c4458ac Make model name translated Kuroshini 2019-10-01 17:11:24 +0300
  • a497230883 fix names of methods and fields of serializer michail 2019-10-01 17:42:14 +0500
  • f034377405 fix establishment serializer evgeniy-st 2019-10-01 15:11:14 +0300
  • 530333666a Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-10-01 13:04:16 +0300
  • 051957c7cf Refactor JSON Validation evgeniy-st 2019-10-01 13:03:59 +0300
  • 2106a2aee0 Merge branch 'feature/test_search_establishment' into 'develop' d.kuzmenko 2019-10-01 09:09:13 +0000
  • 693d895aa4 Fix tests Виктор Гладких 2019-10-01 11:52:46 +0300
  • e3d26b5dd1 Temp commit littlewolf 2019-10-01 07:43:38 +0300
  • 1798978cf7 Merge branch 'feature/establishment-award' into 'develop' e.stoyushko 2019-09-30 13:53:59 +0000
  • 33478580aa Review fixes Kuroshini 2019-09-30 16:40:46 +0300
  • aeebdd02c6 Merge branch 'develop' into feature/gm-148 Anatoly 2019-09-30 15:43:45 +0300
  • 501b8833ed gm-148: finish Anatoly 2019-09-30 15:40:28 +0300
  • 661a7b3b6f Add reqs to docker littlewolf 2019-09-30 15:10:27 +0300
  • beb031d0b6 Add slug to carousel serializer Kuroshini 2019-09-30 14:05:38 +0300
  • b1e09d806a Add ordering to timetable object Kuroshini 2019-09-30 14:00:34 +0300
  • 277418bf72 Fix docker host littlewolf 2019-09-30 13:56:12 +0300
  • 019ac97d19 Add vintage year to detail Kuroshini 2019-09-30 13:50:17 +0300
  • 310928d95c Fix import package issue Kuroshini 2019-09-30 12:46:58 +0300
  • c03792d0e3 Add legacy database Add requirements littlewolf 2019-09-30 11:19:09 +0300
  • 055e99dba2 added "on the same theme" news list and "you should read" news list michail 2019-09-30 13:17:38 +0500
  • b724e2eeb9 Merge branch 'feature/will-also-like-news' into 'develop' d.kuzmenko 2019-09-30 07:58:49 +0000
  • 8745c57f84 Merge branch 'bugfix/bunch-of-fixes' into 'develop' d.kuzmenko 2019-09-30 07:57:12 +0000
  • f1d60cc976 Merge branch 'feature/gm-135-elastic-for-news' into 'develop' d.kuzmenko 2019-09-30 07:43:53 +0000
  • 88df92a7a5 added country_code to news email template michail 2019-09-30 12:42:49 +0500
  • 5ef33c0d19 News search url Виктор Гладких 2019-09-30 10:19:09 +0300
  • 6d72c1abfd fix locale and country code in task michail 2019-09-30 12:18:18 +0500
  • 50b00e5b6d added news mail template and task without celery delay michail 2019-09-30 12:10:45 +0500
  • 90ae87a14e added news mail template and task without celery delay michail 2019-09-30 12:09:53 +0500
  • 78e1e448d9 News search Виктор Гладких 2019-09-30 10:09:46 +0300
  • d42bf43d19 Latest award for carousel Kuroshini 2019-09-27 22:56:44 +0300
  • 9aafe0d69d new establishment attribute Kuroshini 2019-09-27 16:00:08 +0300
  • 051ddb617d fix conflicts after rebase Kuroshini 2019-09-26 18:20:06 +0300
  • 98b0a9af5d latest award && test fix Kuroshini 2019-09-26 01:26:52 +0300
  • 4388fb7346 latest award for establishment Kuroshini 2019-09-25 22:00:05 +0300
  • 4d113a6916 Fix all test Kuroshini 2019-09-27 22:06:46 +0300
  • 1957ab6300 Pagination for ES results Kuroshini 2019-09-27 20:54:55 +0300
  • d71ed0c1de Fix lot/lat x/y mapping && address serialization Kuroshini 2019-09-27 19:44:00 +0300