Commit Graph

  • 7fa52d770e added missing migration for app news Anatoly 2019-10-24 12:17:58 +0300
  • 947d19df68 Merge branch 'develop' into feature/develop_ci Виктор Гладких 2019-10-24 12:15:41 +0300
  • 6c4f1a2e40 Fix news serializer evgeniy-st 2019-10-24 12:08:44 +0300
  • 0edc2fae38 Clean news serializer evgeniy-st 2019-10-24 12:03:41 +0300
  • 1bc2864479 Fix merge Виктор Гладких 2019-10-24 11:49:14 +0300
  • 3d301cb931 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop a.feteleu 2019-10-24 11:34:12 +0300
  • 2756529c7f fix migrations in userroles a.feteleu 2019-10-24 11:34:00 +0300
  • 02d26b052d Merge branch 'feature/chosen_tags_view' into 'develop' Sergey Melihov 2019-10-24 07:44:47 +0000
  • 890d1004e1 Added view for chosen tags Semyon Yekhmenin 2019-10-24 07:44:47 +0000
  • f45f69e0e5 add deploy Виктор Гладких 2019-10-24 09:47:29 +0300
  • bc50f118b8 Merge branch 'feature/tag-name-indexing' into develop Kuroshini 2019-10-23 18:09:41 +0300
  • b2341194bc fix serializer Kuroshini 2019-10-16 14:11:07 +0300
  • ab5b5801fd Merge branch 'feature/tag-name-indexing' into 'develop' Sergey Melihov 2019-10-23 15:00:39 +0000
  • f3caf16d2c Merge branch 'changes-from-gm-148' into 'develop' Sergey Melihov 2019-10-23 14:57:34 +0000
  • a8001c44b1 added validation rule to NewsBackOfficeGallerySerializer Anatoly 2019-10-23 17:50:08 +0300
  • 1e3c80ad0c small fix Anatoly 2019-10-23 17:40:42 +0300
  • 18062e60a5 elastic Виктор Гладких 2019-10-23 17:36:13 +0300
  • 5a0ea251ca elastic Виктор Гладких 2019-10-23 17:35:33 +0300
  • 07ac06f405 Update migration Kuroshini 2019-10-16 14:11:07 +0300
  • 711d536c98 Update migration Kuroshini 2019-10-16 14:11:07 +0300
  • ce5987de95 Attach establishment timestamps as command Kuroshini 2019-10-16 14:11:07 +0300
  • d5609e4cb8 Works now filter first part Kuroshini 2019-10-16 14:11:07 +0300
  • 47da9929cb Some fixes Kuroshini 2019-10-16 14:11:07 +0300
  • 40357c20b6 Changes from gm-148 Kuroshini 2019-10-16 14:11:07 +0300
  • 2e99431bdd elastic Виктор Гладких 2019-10-23 17:25:28 +0300
  • 1092ec1884 delete celery, redis Виктор Гладких 2019-10-23 17:24:21 +0300
  • b78c4f82fe Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop a.feteleu 2019-10-23 17:13:13 +0300
  • 40e64eafe7 delete celery, redis Виктор Гладких 2019-10-23 17:08:44 +0300
  • 125c438f19 Review fix #2 Kuroshini 2019-10-16 14:11:07 +0300
  • 7e93aafc3f added merge migrations a.feteleu 2019-10-23 17:05:37 +0300
  • a7a83a8755 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-10-23 17:03:52 +0300
  • b1169675a8 fix CurrencySerializer evgeniy-st 2019-10-23 17:03:24 +0300
  • d1e40101b4 delete celery, redis Виктор Гладких 2019-10-23 16:59:11 +0300
  • 1f44f21ede delete celery, redis Виктор Гладких 2019-10-23 16:52:12 +0300
  • bd3a809d85 fix migrations Anatoly 2019-10-23 16:47:57 +0300
  • d8c99062ca fix singals evgeniy-st 2019-10-23 16:28:42 +0300
  • 649fcc6793 delete celery, redis Виктор Гладких 2019-10-23 16:25:57 +0300
  • 2058ad09c6 Merge branch 'feature/gm-148' into 'develop' a.feteleu 2019-10-23 13:08:00 +0000
  • 72a84d39db Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects alex 2019-10-23 16:07:05 +0300
  • 938279bd7a mysql to docker-compose.mysql alex 2019-10-23 16:06:54 +0300
  • 5668da8e79 delete celery, redis Виктор Гладких 2019-10-23 16:03:50 +0300
  • 7dbf594809 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-23 15:54:21 +0300
  • 052ff07ac7 delete celery, redis Виктор Гладких 2019-10-23 15:47:51 +0300
  • 7613f67f91 delete celery, redis Виктор Гладких 2019-10-23 15:44:58 +0300
  • fd2c1e0ca6 Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148 Anatoly 2019-10-23 15:37:14 +0300
  • 9588c7cd88 delete celery, redis Виктор Гладких 2019-10-23 15:35:23 +0300
  • 6a9f11e989 merge from develop Anatoly 2019-10-23 15:31:04 +0300
  • 2be7f88124 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects michail 2019-10-23 17:19:43 +0500
  • cb3ad6bb96 added transfer for gallery app michail 2019-10-23 17:19:23 +0500
  • 46fdf3e55d delete celery, redis Виктор Гладких 2019-10-23 15:15:03 +0300
  • 636b15a30c mysql to docker-compose alex 2019-10-23 14:59:40 +0300
  • 1174d4e281 Merge branch 'feature/currency_sign' into 'develop' d.kuzmenko 2019-10-23 11:58:33 +0000
  • 81bd7b4912 Feature/currency sign Semyon Yekhmenin 2019-10-23 11:58:33 +0000
  • 883f94c80a Merge branch 'feature/password-changed-notification' into 'develop' Sergey Melihov 2019-10-23 11:51:15 +0000
  • 110d0872da added transfer for partner app michail 2019-10-23 16:49:15 +0500
  • 28a4665042 Merge branch 'feature/establishment_by_slug_by_country_fix' into develop evgeniy-st 2019-10-23 14:22:37 +0300
  • 05cccf85ea add deploy Виктор Гладких 2019-10-23 14:22:03 +0300
  • 239ebc1dd6 add deploy Виктор Гладких 2019-10-23 14:11:02 +0300
  • f46d4bd9f1 Review fix Kuroshini 2019-10-16 14:11:07 +0300
  • 5afc257c13 Merge branch 'feature/establishment_by_slug_by_country_fix' into 'develop' e.stoyushko 2019-10-23 10:06:39 +0000
  • 538ae41d85 Establishments/slug/<slug> fix Semyon Yekhmenin 2019-10-23 10:06:39 +0000
  • 083c8a7eaa same queryset for Establishment list and detail views evgeniy-st 2019-10-23 13:00:39 +0300
  • 6c9ddfbc98 added transfer for recipe app michail 2019-10-23 14:42:08 +0500
  • 6f2a2e537d Merge branch 'develop' into feature/establishment_by_slug_by_country_fix evgeniy-st 2019-10-23 12:35:22 +0300
  • 9c9c49d900 update slug fields evgeniy-st 2019-10-23 12:25:50 +0300
  • 8d0f4a8a00 added transfer for notification app michail 2019-10-23 14:17:34 +0500
  • c1b5174518 add deploy Виктор Гладких 2019-10-23 12:15:00 +0300
  • ed551ea1ab add deploy Виктор Гладких 2019-10-23 12:14:21 +0300
  • 64692ae4b3 max length of slug is 255 evgeniy-st 2019-10-23 12:03:50 +0300
  • 4d1d16637e add deploy Виктор Гладких 2019-10-23 12:01:46 +0300
  • 90e53d738d Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-23 12:00:58 +0300
  • 1b218a5c07 Fix fab Виктор Гладких 2019-10-23 11:51:25 +0300
  • 7ed853e7a4 Fix fab Виктор Гладких 2019-10-23 11:44:59 +0300
  • 154df2b720 Merge branch 'develop' into feature/product evgeniy-st 2019-10-23 11:35:24 +0300
  • 766b6659f1 Models created: Product, OnlineProduct (proxy), ProductType, ProductSubtype evgeniy-st 2019-10-23 11:31:45 +0300
  • 97823ea601 change title field in model Collection to translated JSON field (gm-165) Anatoly 2019-10-23 11:25:04 +0300
  • d6a9fa6ac0 pwd Виктор Гладких 2019-10-23 11:18:26 +0300
  • fd65c98660 pwd Виктор Гладких 2019-10-23 11:12:53 +0300
  • 1264ba963f edited get_username because nickname from legacy is not unique michail 2019-10-23 13:12:13 +0500
  • 1755c192b6 pwd Виктор Гладких 2019-10-23 11:10:15 +0300
  • 5c7af176fd pwd Виктор Гладких 2019-10-23 11:09:11 +0300
  • cddab519e4 pwd Виктор Гладких 2019-10-23 11:07:01 +0300
  • dd7a578a12 pwd Виктор Гладких 2019-10-23 11:04:52 +0300
  • 78209a1101 pwd Виктор Гладких 2019-10-23 11:02:43 +0300
  • 89c949c12c Fix Виктор Гладких 2019-10-23 10:59:04 +0300
  • 0961d3ee73 Fix Виктор Гладких 2019-10-23 10:57:08 +0300
  • fea2764bde Fix Виктор Гладких 2019-10-23 10:51:09 +0300
  • f11a194eb2 Fix Виктор Гладких 2019-10-23 10:49:41 +0300
  • 19facc3b94 Fix Виктор Гладких 2019-10-23 10:46:56 +0300
  • 9383c806b0 Fix Виктор Гладких 2019-10-23 10:45:29 +0300
  • 1887806fec Fix commit Виктор Гладких 2019-10-23 10:40:59 +0300
  • 778162922e Test runner Виктор Гладких 2019-10-23 10:39:10 +0300
  • 6dd4e1af33 Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects michail 2019-10-23 12:18:39 +0500
  • 9e6d01b1bd prototype for transfer account michail 2019-10-23 12:18:25 +0500
  • fed2aae7f1 Fix settings/base Add transfer_data to location littlewolf 2019-10-23 09:30:36 +0300
  • f09bd5996a Merge branch 'develop' into feature/migrate-city-objects littlewolf 2019-10-23 09:27:42 +0300
  • 915683fa7b Remove comments littlewolf 2019-10-23 09:16:29 +0300
  • 4a0a305e2c tag category indexing name Kuroshini 2019-10-16 14:11:07 +0300
  • 3d68f1ba29 added imgae_url field to model Award (gm-183) Anatoly 2019-10-22 18:20:01 +0300
  • 1b9df7c713 Merge branch 'develop' into feature/product evgeniy-st 2019-10-22 17:12:59 +0300