Commit Graph

  • 2f656c459d Search establishment by working time (added fields to serializer) Kuroshini 2019-10-16 19:09:38 +0300
  • ed03f0f40f Search establishment by working time Kuroshini 2019-10-16 19:05:16 +0300
  • 32de6f7705 Readme Виктор Гладких 2019-10-16 15:54:15 +0300
  • 766fdcdad5 Add reviewer manager Виктор Гладких 2019-10-16 15:18:31 +0300
  • 6d7341377b Show timetables list (remove pagination) Kuroshini 2019-10-16 14:46:36 +0300
  • c2c9f33b57 Show timetables list (only necessary fields) Kuroshini 2019-10-16 14:44:55 +0300
  • 12a339cd1b Show timetables list Kuroshini 2019-10-16 14:36:17 +0300
  • 8dad3df4bf Added route for mobile tags Kuroshini 2019-10-16 14:11:07 +0300
  • 5ad3776fe3 establishment manager Виктор Гладких 2019-10-16 12:14:13 +0300
  • 9fd89bf812 Add establishment manager role Виктор Гладких 2019-10-16 11:40:51 +0300
  • 3271a6fed9 Establishment manager Виктор Гладких 2019-10-16 11:02:26 +0300
  • 04a6bbea19 Add content page manager Виктор Гладких 2019-10-16 10:43:06 +0300
  • 86692019d1 Add Country admin to views Виктор Гладких 2019-10-16 10:14:23 +0300
  • e1b031caf3 Tmp commit littlewolf 2019-10-16 07:05:05 +0300
  • e0bce99ca9 Fix issue with copies Kuroshini 2019-10-15 21:40:55 +0300
  • a0e24a26a0 Merge branch 'feature/gm-192' into feature/gm-148 evgeniy-st 2019-10-15 18:53:25 +0300
  • ccf6e12e3f remove tag category from establishment type evgeniy-st 2019-10-15 18:52:32 +0300
  • c09b1eb295 Merge branch 'feature/gm-192' into feature/gm-148 evgeniy-st 2019-10-15 18:44:24 +0300
  • 3a54b70093 update tag on document index evgeniy-st 2019-10-15 18:43:08 +0300
  • c268575a04 Merge branch 'feature/gm-192' into feature/gm-148 evgeniy-st 2019-10-15 18:33:44 +0300
  • bde81b3700 update ES documents evgeniy-st 2019-10-15 18:32:16 +0300
  • 9d4c483f51 clean models (tags) evgeniy-st 2019-10-15 18:25:09 +0300
  • 42ae1cbb87 fix tagcategory queryset evgeniy-st 2019-10-15 18:13:37 +0300
  • f7eb534570 Merge branch 'feature/gm-192' into feature/gm-148 evgeniy-st 2019-10-15 17:48:40 +0300
  • c94ad3f017 comment some code evgeniy-st 2019-10-15 17:48:01 +0300
  • 92529f4c5b Merge branch 'feature/gm-192' into feature/gm-148 evgeniy-st 2019-10-15 17:17:35 +0300
  • 60cdec99e0 refactor tags evgeniy-st 2019-10-15 17:17:03 +0300
  • 9c09f000fb Password changed notification email Kuroshini 2019-10-15 16:32:47 +0300
  • 322cfcd89d Fix test Виктор Гладких 2019-10-15 15:33:28 +0300
  • 9acef83894 Add country admin Виктор Гладких 2019-10-15 15:23:42 +0300
  • ff7df815f4 Fix country_id Виктор Гладких 2019-10-15 15:20:44 +0300
  • e8d0045cec Merge branch 'develop' into feature/GM-176_standard_user Виктор Гладких 2019-10-15 15:17:15 +0300
  • 449eae060d Merge branch 'feature/gm-192' into feature/gm-148 Anatoly 2019-10-15 12:52:38 +0300
  • 1764cfc08b added urlpath to get establishment tags to all platform Anatoly 2019-10-15 12:52:21 +0300
  • f86b7d489f fix merge Anatoly 2019-10-15 12:23:13 +0300
  • 5562a9e7c9 Fixed establishments/slug/<slug>, added filtering by country code Semyon Yekhmenin 2019-10-15 12:16:23 +0300
  • 2d830b2821 Merge branch 'feature/gm-192' into feature/gm-148 Anatoly 2019-10-15 12:08:23 +0300
  • ba1ce67444 Fix limit littlewolf 2019-10-15 12:07:37 +0300
  • 09865db08a Tmp commit to debug littlewolf 2019-10-15 12:05:30 +0300
  • 4d908d0bbb Add field converter littlewolf 2019-10-15 12:02:17 +0300
  • 47a4d28cf0 Add fields map for simple field Add fields map for tuple field Refactoring code littlewolf 2019-10-15 10:38:51 +0300
  • 8cae39cbb6 Tmp fix littlewolf 2019-10-14 16:30:26 +0300
  • 6f6717efdc Merge branch 'develop' into feature/gm-192 Anatoly 2019-10-15 11:47:14 +0300
  • 54cfccbcbe the fix of types fields in all apps michail 2019-10-15 13:23:31 +0500
  • dc12a184a1 the fix types of news fields michail 2019-10-15 12:46:06 +0500
  • 43531d88dc Country id Виктор Гладких 2019-10-15 10:05:31 +0300
  • 07bb0f1b8f Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-14 18:24:58 +0300
  • 2b35d3473b fix settings Anatoly 2019-10-14 18:23:03 +0300
  • 228cb72c36 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-14 18:19:46 +0300
  • 275c5b467c fixa Виктор Гладких 2019-10-14 18:15:17 +0300
  • 8d2d5b87ac Fix migrate SQL Виктор Гладких 2019-10-14 17:56:51 +0300
  • 01a32f66e8 Fix location migrate sql Виктор Гладких 2019-10-14 17:38:37 +0300
  • 1bd3cc9170 1 Виктор Гладких 2019-10-14 17:32:34 +0300
  • 1a70ea2e99 Merge branch 'bugfix/account-confirm-pass' into 'develop' a.feteleu 2019-10-14 13:55:00 +0000
  • fb4cf25dce Fix empty email after creating account Kuroshini 2019-10-14 16:43:59 +0300
  • 8eaf611d7e Reverting migration Kuroshini 2019-10-14 16:02:02 +0300
  • 6fa0051c93 Revert "Password reset confirmation mechanics" Kuroshini 2019-10-14 15:53:40 +0300
  • 0656e2ae32 Confirmed email for user standard Виктор Гладких 2019-10-14 15:48:31 +0300
  • 7b4553663c Fix Виктор Гладких 2019-10-14 15:45:41 +0300
  • b3eac3666b Standart user, guest. Виктор Гладких 2019-10-14 14:48:13 +0300
  • a223832241 Relational integers to ForeignKey michail 2019-10-14 15:48:26 +0500
  • 8ca27c7f87 Added transfer.py into main app. Added legacy models into transfer/models.py michail 2019-10-14 14:30:13 +0500
  • 469f7bdf4c added prefetch select related Anatoly 2019-10-14 12:24:26 +0300
  • 9e237d4657 removed endpoint to display a list of tags by establishment id, added instead filter to filter tags by establishment id Anatoly 2019-10-14 11:40:03 +0300
  • 47993a7155 added endpoint ot get list of tag categories with tags by establishment type Anatoly 2019-10-14 10:22:17 +0300
  • 1f6bf819e8 Merge branch 'feature/roles' into 'develop' d.kuzmenko 2019-10-14 07:09:18 +0000
  • 2d41b9142b Merge remote-tracking branch 'origin/feature/gm-192' into feature/gm-192 Anatoly 2019-10-11 18:26:26 +0300
  • cb762ce746 added param to attr for Establoishment model and small refactoring, boost queries Anatoly 2019-10-11 18:26:13 +0300
  • 1f44777a15 Fix Виктор Гладких 2019-10-11 17:04:55 +0300
  • e9ad418976 Revert migrate location Виктор Гладких 2019-10-11 16:57:59 +0300
  • 0d7104eace Merge branch 'develop' into feature/gm-192 evgeniy-st 2019-10-11 16:44:54 +0300
  • 868a3c1b78 added merge migration Anatoly 2019-10-11 16:36:34 +0300
  • 32d56ffe83 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-11 16:34:06 +0300
  • 35532a32f4 Merge branch 'bugfix/account-change' into 'develop' d.kuzmenko 2019-10-11 13:20:13 +0000
  • f441896d6a Migrate data Виктор Гладких 2019-10-11 16:00:23 +0300
  • 700695cdcc Change route for changed email confirmation Kuroshini 2019-10-11 15:57:59 +0300
  • ddb3eec679 finished endpoint to get tags by establishment type and subtype Anatoly 2019-10-11 15:41:31 +0300
  • d9fc88e7c6 Merge branch 'develop' into feature/roles Виктор Гладких 2019-10-11 14:50:18 +0300
  • a6c56a4bf1 Fix and refactor Виктор Гладких 2019-10-11 14:49:32 +0300
  • 0816a847ac Some booking fixes Kuroshini 2019-10-11 14:29:01 +0300
  • 114d159449 fix tests Kuroshini 2019-10-11 13:46:08 +0300
  • 51b63335d7 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects michail 2019-10-11 15:41:32 +0500
  • 7bcd2edab6 Added transfer.py into timetable. Edited transfer.py for collection and location. michail 2019-10-11 15:41:09 +0500
  • bdb9348916 Merge branch 'bugfix/gm-205' into feature/gm-148 Anatoly 2019-10-11 13:31:33 +0300
  • 0b9fd8b1dc Merge branch 'bugfix/gm-205' into develop Anatoly 2019-10-11 13:20:45 +0300
  • 6142508421 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects littlewolf 2019-10-11 10:46:00 +0300
  • f5c16fba9d Tmp fix littlewolf 2019-10-11 10:45:49 +0300
  • a25d846028 fixed bug with duplicated records in similar establishments Anatoly 2019-10-10 21:02:56 +0300
  • 71528d8a28 Password reset confirmation mechanics Kuroshini 2019-10-10 20:49:35 +0300
  • c920628574 Don't change email until user confirms it Kuroshini 2019-10-10 17:42:29 +0300
  • caf11ed372 Merge branch 'develop' into feature/roles Виктор Гладких 2019-10-10 16:01:33 +0300
  • b390b1af26 Fix Виктор Гладких 2019-10-10 16:00:23 +0300
  • 839491c740 added Pages, PageTexts, PageCounters and PageMetadata models into transfer/models.py michail 2019-10-10 17:55:28 +0500
  • b2b8798c6c Edited transfer.py for news, partner, reviews, comment. Added transfer.py for recipe. michail 2019-10-10 17:46:52 +0500
  • b83efb7cda Fix migrations Виктор Гладких 2019-10-10 15:23:44 +0300
  • ab5a66afe2 Test change Виктор Гладких 2019-10-10 15:20:13 +0300
  • f83b735eb3 changed files Anatoly 2019-10-10 15:10:43 +0300
  • e435d71e00 Merge branch 'feature/gm-192' of https://gl.id-east.ru/gm/gm-backend into feature/gm-192 Anatoly 2019-10-10 15:09:45 +0300
  • 56c0927a52 Add country control Виктор Гладких 2019-10-10 14:58:19 +0300
  • 2aa51b93d3 hide es search evgeniy-st 2019-10-10 14:42:42 +0300