Commit Graph

644 Commits

Author SHA1 Message Date
Kuroshini
c920628574 Don't change email until user confirms it 2019-10-10 17:42:29 +03:00
evgeniy-st
bb41f00451 hide es search 2019-10-10 14:42:42 +03:00
Kuroshini
bd7ba611fc Fix imports issue 2019-10-10 14:28:42 +03:00
Kuroshini
365f39ce65 News email detail link fix 2019-10-09 17:23:58 +03:00
Anatoly
a77b7f9c10 Revert "remove duplicate migration"
This reverts commit 40570a07
2019-10-09 15:42:46 +03:00
Anatoly
495b0a7563 Merge remote-tracking branch 'origin/develop' into develop 2019-10-09 15:36:50 +03:00
Anatoly
40570a0746 Revert "remove duplicate migration"
This reverts commit 93894db7
2019-10-09 15:36:43 +03:00
evgeniy-st
3ccd94f0b5 Merge remote-tracking branch 'origin/feature/booking' into develop 2019-10-09 15:36:26 +03:00
Kuroshini
f5a45fccf1 Fix migration 2019-10-09 15:32:22 +03:00
evgeniy-st
e9c4d62b58 remove bin/manage 2019-10-09 15:26:31 +03:00
e.stoyushko
1969af044c Merge branch 'feature/booking' into 'develop'
Feature/booking

See merge request gm/gm-backend!6
2019-10-09 12:00:32 +00:00
e.stoyushko
f3eda60868 Update urls.py 2019-10-09 11:43:09 +00:00
e.stoyushko
0cfc48e537 Update admin.py 2019-10-09 11:34:14 +00:00
e.stoyushko
c6c0ba47c5 Merge branch 'feature/news-mail' into 'develop'
Feature/news mail

See merge request gm/gm-backend!48
2019-10-09 09:47:50 +00:00
e.stoyushko
b573038980 Update tasks.py 2019-10-09 09:46:23 +00:00
evgeniy-st
861daf8871 update search fields 2019-10-08 14:39:42 +03:00
evgeniy-st
3bf65472d9 Auto fuzziness with match query 2019-10-07 16:31:50 +03:00
Kuroshini
d3ac747d88 News email #3 2019-10-05 18:36:29 +03:00
Kuroshini
73646eb05f News email #2 2019-10-05 18:08:58 +03:00
Kuroshini
90b8dafba9 News email #1 2019-10-04 20:24:48 +03:00
Kuroshini
4d55f80e6f Added migration 2019-10-04 15:49:21 +03:00
d.kuzmenko
cc51e36457 Merge branch 'feature/news-rating' into 'develop'
Feature/news rating

See merge request gm/gm-backend!47
2019-10-04 12:43:34 +00:00
Виктор Гладких
aa9288d41c Merge branch 'develop' into feature/news-rating 2019-10-04 15:41:25 +03:00
Виктор Гладких
f93d0095f4 Fix rating 2019-10-04 15:40:18 +03:00
Виктор Гладких
9f9c1064bd Fix rating 2019-10-04 15:39:14 +03:00
evgeniy-st
175bd4f7b5 update establishment document 2019-10-04 14:07:50 +03:00
evgeniy-st
2b4638b1fa Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-10-04 14:04:20 +03:00
evgeniy-st
36922e1684 update settings 2019-10-04 14:04:08 +03:00
Anatoly
af0e6af5c4 refactored email reconfirm view 2019-10-04 13:48:48 +03:00
evgeniy-st
9fb05f0407 Merge branch 'feature/es' into develop 2019-10-04 12:11:12 +03:00
evgeniy-st
a73cba4dcf Merge branch 'develop' into feature/es 2019-10-04 12:06:53 +03:00
evgeniy-st
50a9622f78 News search 2019-10-04 12:05:13 +03:00
d.kuzmenko
f9247477f9 Merge branch 'feature/news-rating' into 'develop'
Feature/news rating

See merge request gm/gm-backend!46
2019-10-04 08:33:13 +00:00
evgeniy-st
24f84ae8be update tag filter 2019-10-04 11:16:01 +03:00
Виктор Гладких
b42e9781a1 Fix code 2019-10-04 10:20:36 +03:00
Виктор Гладких
2e0da3a15f Merge branch 'develop' into feature/news-rating 2019-10-04 10:16:05 +03:00
Виктор Гладких
ca38f369f7 Fix 2019-10-04 10:15:07 +03:00
Kuroshini
3f6aa21005 Fix issue w/ Lastable service 2019-10-03 20:41:26 +03:00
Kuroshini
3da57b72fc Lastable naive realization 2019-10-03 19:26:09 +03:00
evgeniy-st
8b9f6ed864 another fix migraztion 2019-10-03 18:21:04 +03:00
evgeniy-st
880c387759 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-10-03 18:12:12 +03:00
evgeniy-st
cb37b5733e update migration 2019-10-03 18:10:29 +03:00
evgeniy-st
729a77866d update elasticsearch index 2019-10-03 17:19:30 +03:00
Kuroshini
53db4462f8 Added lastable booking availability checking method 2019-10-03 14:59:38 +03:00
Виктор Гладких
6e9da70594 Merge branch 'develop' into feature/news-rating 2019-10-03 14:52:30 +03:00
Виктор Гладких
9fd064fdec Add rating unique value 2019-10-03 14:51:17 +03:00
Виктор Гладких
14cf7d7b1b Add rating value in news 2019-10-03 14:46:34 +03:00
Kuroshini
0408d93599 Squashed migrations && added lastable credentials 2019-10-03 13:41:45 +03:00
e.stoyushko
4c734cc2ec Merge branch 'feature/translate-classes-carousel' into 'develop'
Feature/translate classes carousel

See merge request gm/gm-backend!44
2019-10-03 09:18:25 +00:00
Виктор Гладких
295bda4b4f Add hours 2019-10-03 11:41:52 +03:00