Commit Graph

  • 74460b3060 Fix imports issue Kuroshini 2019-10-10 14:28:42 +0300
  • bb41f00451 hide es search evgeniy-st 2019-10-10 14:42:42 +0300
  • bd7ba611fc Fix imports issue Kuroshini 2019-10-10 14:28:42 +0300
  • dd4c7fa3eb Merge branch 'develop' into feature/roles Виктор Гладких 2019-10-10 14:28:40 +0300
  • 0e474a16ea Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects littlewolf 2019-10-10 09:04:01 +0300
  • 074a5ec5ea refactor news tags evgeniy-st 2019-10-09 18:25:40 +0300
  • 365f39ce65 News email detail link fix Kuroshini 2019-10-09 17:23:49 +0300
  • f239e5def8 Merge branch 'feature/fix-auth-refactored-email' into feature/gm-192 Anatoly 2019-10-09 16:49:31 +0300
  • 01dd728323 Refactor Виктор Гладких 2019-10-09 16:44:29 +0300
  • 77839c7e8c Merge branch 'develop' into feature/roles Виктор Гладких 2019-10-09 16:29:11 +0300
  • 7ed976dec0 Test Виктор Гладких 2019-10-09 16:28:14 +0300
  • 74fa1fc014 Merge branch 'develop' into feature/gm-192 Anatoly 2019-10-09 16:21:50 +0300
  • 2d375a51cf change Celery state for dev settings Anatoly 2019-10-09 16:00:06 +0300
  • 091491e19f small fix Anatoly 2019-10-09 15:57:35 +0300
  • 3f9dea30ff Revert "remove duplicate migration" Anatoly 2019-10-09 15:54:04 +0300
  • 2445e9f111 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-09 15:49:29 +0300
  • 4cc9fabd73 edited transfer.py for notification, account, establishment michail 2019-10-09 17:43:48 +0500
  • a77b7f9c10 Revert "remove duplicate migration" Anatoly 2019-10-09 15:42:46 +0300
  • 495b0a7563 Merge remote-tracking branch 'origin/develop' into develop Anatoly 2019-10-09 15:36:50 +0300
  • a763bb8a3a Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-09 15:36:44 +0300
  • 40570a0746 Revert "remove duplicate migration" Anatoly 2019-10-09 15:36:43 +0300
  • 3ccd94f0b5 Merge remote-tracking branch 'origin/feature/booking' into develop evgeniy-st 2019-10-09 15:36:26 +0300
  • f5d84d433e Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148 Anatoly 2019-10-09 15:33:16 +0300
  • 05d3e3ff60 fix migrations Anatoly 2019-10-09 15:33:05 +0300
  • f5a45fccf1 Fix migration Kuroshini 2019-10-09 15:31:58 +0300
  • f3db0ffe22 Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-09 15:27:11 +0300
  • e9c4d62b58 remove bin/manage evgeniy-st 2019-10-09 15:26:31 +0300
  • 4dfceff02d Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148 evgeniy-st 2019-10-09 15:21:11 +0300
  • 93894db7aa remove duplicate migration evgeniy-st 2019-10-09 15:20:51 +0300
  • 41db19b167 Merge branch 'feature/fix-auth-refactored-email' into feature/gm-148 Anatoly 2019-10-09 15:20:34 +0300
  • 31f8b5abd1 refactored base settings Anatoly 2019-10-09 15:19:46 +0300
  • 095b4a4bd7 Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-09 15:11:26 +0300
  • 1969af044c Merge branch 'feature/booking' into 'develop' e.stoyushko 2019-10-09 12:00:32 +0000
  • 48ca13803e Pre test permission comment Виктор Гладких 2019-10-09 14:44:01 +0300
  • f3eda60868 Update urls.py e.stoyushko 2019-10-09 11:43:09 +0000
  • 0cfc48e537 Update admin.py e.stoyushko 2019-10-09 11:34:14 +0000
  • 2191a505a5 refactored EstablishmentBase serializer Anatoly 2019-10-09 14:11:53 +0300
  • 3c3969bf64 Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-09 14:00:16 +0300
  • ca5f588466 fix elastic document, fix prefetch and select related Anatoly 2019-10-09 12:53:35 +0300
  • c6c0ba47c5 Merge branch 'feature/news-mail' into 'develop' e.stoyushko 2019-10-09 09:47:50 +0000
  • b573038980 Update tasks.py e.stoyushko 2019-10-09 09:46:23 +0000
  • eff7dfc452 Merge branch 'develop' into feature/roles Виктор Гладких 2019-10-09 10:44:04 +0300
  • 69d02e7a07 fix auth Anatoly 2019-10-09 10:05:19 +0300
  • 22d2396c6b Merge branch 'develop' into feature/migrate-city-objects littlewolf 2019-10-09 07:54:15 +0300
  • e8c48e99c6 Add key to transfer Add queryset to transfer Add models and fields get to transfer littlewolf 2019-10-08 22:02:08 +0300
  • 33d2446c5c Merge branch 'develop' into feature/gm-192 Anatoly 2019-10-08 15:39:31 +0300
  • d321866dc2 gm-192: in progress Anatoly 2019-10-08 15:38:35 +0300
  • eeba02c2ae test role Виктор Гладких 2019-10-08 15:26:39 +0300
  • e2e5faa3f9 Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-08 14:41:52 +0300
  • 861daf8871 update search fields evgeniy-st 2019-10-08 14:39:42 +0300
  • 03b22d79db edited Address in location/transfer.py michail 2019-10-08 14:01:40 +0500
  • bc7d4ef5a5 comment location/transfer.py michail 2019-10-08 12:24:57 +0500
  • e66a6bcbfa Fix models Виктор Гладких 2019-10-08 10:18:51 +0300
  • 7925febc77 Models role Виктор Гладких 2019-10-08 09:57:47 +0300
  • ab768311f0 Update tables structure littlewolf 2019-10-07 22:23:01 +0300
  • 97dc881200 Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-07 18:03:07 +0300
  • 3bf65472d9 Auto fuzziness with match query evgeniy-st 2019-10-07 16:31:50 +0300
  • 4e96d09513 added transfer.py to account, comment and review michail 2019-10-07 14:34:24 +0500
  • 8ac5a1970f fixed carousel Anatoly 2019-10-07 10:51:08 +0300
  • 15ef2295ca migration fix Anatoly 2019-10-07 09:55:24 +0300
  • d3ac747d88 News email #3 Kuroshini 2019-10-05 18:36:29 +0300
  • 73646eb05f News email #2 Kuroshini 2019-10-05 18:08:58 +0300
  • 90b8dafba9 News email #1 Kuroshini 2019-10-04 20:24:48 +0300
  • 90ab1a2ab9 Revert "fix migrations" Anatoly 2019-10-04 18:02:51 +0300
  • d60d166031 added merge migration Anatoly 2019-10-04 17:01:40 +0300
  • 059bcdb07d Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-04 15:55:58 +0300
  • 4d55f80e6f Added migration Kuroshini 2019-10-04 15:49:21 +0300
  • cc51e36457 Merge branch 'feature/news-rating' into 'develop' d.kuzmenko 2019-10-04 12:43:34 +0000
  • aa9288d41c Merge branch 'develop' into feature/news-rating Виктор Гладких 2019-10-04 15:41:25 +0300
  • f93d0095f4 Fix rating Виктор Гладких 2019-10-04 15:40:18 +0300
  • 9f9c1064bd Fix rating Виктор Гладких 2019-10-04 15:39:14 +0300
  • 9a36b52eec fix migrations Anatoly 2019-10-04 15:26:29 +0300
  • ee93ad4a44 fix settings Anatoly 2019-10-04 14:31:24 +0300
  • c365711c05 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-04 14:31:03 +0300
  • 91790bbc39 refactored Anatoly 2019-10-04 14:30:34 +0300
  • 511312bb28 added transfer.py to partner michail 2019-10-04 16:20:04 +0500
  • 175bd4f7b5 update establishment document evgeniy-st 2019-10-04 14:07:50 +0300
  • 2b4638b1fa Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-10-04 14:04:20 +0300
  • 36922e1684 update settings evgeniy-st 2019-10-04 14:04:08 +0300
  • eaa1795f0c Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-04 14:00:06 +0300
  • af0e6af5c4 refactored email reconfirm view Anatoly 2019-10-04 13:48:48 +0300
  • b2f900d15d gm-148: refactored Anatoly 2019-10-04 13:25:42 +0300
  • 9fb05f0407 Merge branch 'feature/es' into develop evgeniy-st 2019-10-04 12:11:12 +0300
  • a73cba4dcf Merge branch 'develop' into feature/es evgeniy-st 2019-10-04 12:06:53 +0300
  • 50a9622f78 News search evgeniy-st 2019-10-04 12:05:13 +0300
  • 646eeb8972 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-04 11:53:31 +0300
  • 4890e00b95 gm-148: refactored Anatoly 2019-10-04 11:50:29 +0300
  • f9247477f9 Merge branch 'feature/news-rating' into 'develop' d.kuzmenko 2019-10-04 08:33:13 +0000
  • ad17a2ad7a new relations template michail 2019-10-04 13:18:43 +0500
  • 24f84ae8be update tag filter evgeniy-st 2019-10-04 11:16:01 +0300
  • b42e9781a1 Fix code Виктор Гладких 2019-10-04 10:20:36 +0300
  • 2e0da3a15f Merge branch 'develop' into feature/news-rating Виктор Гладких 2019-10-04 10:16:05 +0300
  • ca38f369f7 Fix Виктор Гладких 2019-10-04 10:15:07 +0300
  • 4ce0eb284d Update transfer structure in location littlewolf 2019-10-04 08:16:56 +0300
  • b581ead8ae Add relation fields littlewolf 2019-10-04 07:50:19 +0300
  • 90dd896f13 Load app models Load legacy models littlewolf 2019-10-04 00:14:16 +0300
  • 673acb4bb9 Add sort Move dependencies to model Add data_type to model littlewolf 2019-10-03 23:19:40 +0300
  • 3f6aa21005 Fix issue w/ Lastable service Kuroshini 2019-10-03 20:41:26 +0300
  • 3da57b72fc Lastable naive realization Kuroshini 2019-10-03 19:26:09 +0300
  • 8b9f6ed864 another fix migraztion evgeniy-st 2019-10-03 18:21:04 +0300