Виктор Гладких
|
caf11ed372
|
Merge branch 'develop' into feature/roles
|
2019-10-10 16:01:33 +03:00 |
|
Виктор Гладких
|
b390b1af26
|
Fix
|
2019-10-10 16:00:23 +03:00 |
|
Виктор Гладких
|
b83efb7cda
|
Fix migrations
|
2019-10-10 15:23:44 +03:00 |
|
Виктор Гладких
|
ab5a66afe2
|
Test change
|
2019-10-10 15:20:13 +03:00 |
|
Anatoly
|
f83b735eb3
|
changed files
|
2019-10-10 15:10:43 +03:00 |
|
Anatoly
|
e435d71e00
|
Merge branch 'feature/gm-192' of https://gl.id-east.ru/gm/gm-backend into feature/gm-192
|
2019-10-10 15:09:45 +03:00 |
|
Виктор Гладких
|
56c0927a52
|
Add country control
|
2019-10-10 14:58:19 +03:00 |
|
evgeniy-st
|
2aa51b93d3
|
hide es search
|
2019-10-10 14:43:24 +03:00 |
|
Kuroshini
|
74460b3060
|
Fix imports issue
|
2019-10-10 14:43:24 +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 |
|
evgeniy-st
|
074a5ec5ea
|
refactor news tags
|
2019-10-09 18:25:40 +03:00 |
|
Anatoly
|
f239e5def8
|
Merge branch 'feature/fix-auth-refactored-email' into feature/gm-192
# Conflicts:
# project/settings/base.py
|
2019-10-09 16:49:31 +03:00 |
|
Виктор Гладких
|
01dd728323
|
Refactor
|
2019-10-09 16:44:29 +03:00 |
|
Виктор Гладких
|
77839c7e8c
|
Merge branch 'develop' into feature/roles
|
2019-10-09 16:29:11 +03:00 |
|
Виктор Гладких
|
7ed976dec0
|
Test
|
2019-10-09 16:28:14 +03:00 |
|
Anatoly
|
74fa1fc014
|
Merge branch 'develop' into feature/gm-192
|
2019-10-09 16:21:50 +03:00 |
|
Anatoly
|
091491e19f
|
small fix
|
2019-10-09 15:57:35 +03:00 |
|
Anatoly
|
3f9dea30ff
|
Revert "remove duplicate migration"
This reverts commit 93894db7
|
2019-10-09 15:54:04 +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 |
|
evgeniy-st
|
a763bb8a3a
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:36:44 +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 |
|
Anatoly
|
05d3e3ff60
|
fix migrations
|
2019-10-09 15:33:05 +03:00 |
|
Kuroshini
|
f5a45fccf1
|
Fix migration
|
2019-10-09 15:32:22 +03:00 |
|
Anatoly
|
41db19b167
|
Merge branch 'feature/fix-auth-refactored-email' into feature/gm-148
|
2019-10-09 15:20:34 +03:00 |
|
evgeniy-st
|
095b4a4bd7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:11:26 +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 |
|
Виктор Гладких
|
48ca13803e
|
Pre test permission comment
|
2019-10-09 14:44:01 +03: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 |
|
Anatoly
|
2191a505a5
|
refactored EstablishmentBase serializer
|
2019-10-09 14:11:53 +03:00 |
|
evgeniy-st
|
3c3969bf64
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 14:00:16 +03:00 |
|
Anatoly
|
ca5f588466
|
fix elastic document, fix prefetch and select related
|
2019-10-09 12:53:35 +03: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 |
|
Виктор Гладких
|
eff7dfc452
|
Merge branch 'develop' into feature/roles
|
2019-10-09 10:44:04 +03:00 |
|
Anatoly
|
69d02e7a07
|
fix auth
|
2019-10-09 10:05:19 +03:00 |
|
Anatoly
|
33d2446c5c
|
Merge branch 'develop' into feature/gm-192
|
2019-10-08 15:39:31 +03:00 |
|
Anatoly
|
d321866dc2
|
gm-192: in progress
|
2019-10-08 15:38:35 +03:00 |
|
Виктор Гладких
|
eeba02c2ae
|
test role
|
2019-10-08 15:26:39 +03:00 |
|
evgeniy-st
|
e2e5faa3f9
|
Merge branch 'develop' into feature/gm-148
|
2019-10-08 14:41:52 +03:00 |
|
evgeniy-st
|
861daf8871
|
update search fields
|
2019-10-08 14:39:42 +03:00 |
|
Виктор Гладких
|
e66a6bcbfa
|
Fix models
|
2019-10-08 10:18:51 +03:00 |
|
Виктор Гладких
|
7925febc77
|
Models role
|
2019-10-08 09:57:47 +03:00 |
|
evgeniy-st
|
97dc881200
|
Merge branch 'develop' into feature/gm-148
|
2019-10-07 18:03:07 +03:00 |
|
evgeniy-st
|
3bf65472d9
|
Auto fuzziness with match query
|
2019-10-07 16:31:50 +03:00 |
|
Anatoly
|
8ac5a1970f
|
fixed carousel
|
2019-10-07 10:51:08 +03:00 |
|
Anatoly
|
15ef2295ca
|
migration fix
|
2019-10-07 09:55:24 +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 |
|
Anatoly
|
90ab1a2ab9
|
Revert "fix migrations"
This reverts commit 9a36b52e
|
2019-10-04 18:02:51 +03:00 |
|
Anatoly
|
d60d166031
|
added merge migration
|
2019-10-04 17:01:40 +03:00 |
|
Anatoly
|
059bcdb07d
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 15:55:58 +03:00 |
|
Kuroshini
|
4d55f80e6f
|
Added migration
|
2019-10-04 15:49:21 +03: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 |
|
Anatoly
|
9a36b52eec
|
fix migrations
|
2019-10-04 15:26:29 +03:00 |
|
Anatoly
|
c365711c05
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 14:31:03 +03:00 |
|
Anatoly
|
91790bbc39
|
refactored
|
2019-10-04 14:30:34 +03:00 |
|
evgeniy-st
|
175bd4f7b5
|
update establishment document
|
2019-10-04 14:07:50 +03:00 |
|
Anatoly
|
eaa1795f0c
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/authorization/tasks.py
|
2019-10-04 14:00:06 +03:00 |
|
Anatoly
|
af0e6af5c4
|
refactored email reconfirm view
|
2019-10-04 13:48:48 +03:00 |
|
Anatoly
|
b2f900d15d
|
gm-148: refactored
|
2019-10-04 13:25:42 +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 |
|
Anatoly
|
646eeb8972
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
|
2019-10-04 11:53:31 +03:00 |
|
Anatoly
|
4890e00b95
|
gm-148: refactored
|
2019-10-04 11:50:29 +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 |
|
Виктор Гладких
|
38be14b5ba
|
Merge branch 'develop' into feature/news-rating
|
2019-10-03 11:39:24 +03:00 |
|
Виктор Гладких
|
f90e1ceded
|
Add raiting
|
2019-10-03 11:37:59 +03:00 |
|
Anatoly
|
4796fce784
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/admin.py
|
2019-10-02 18:11:47 +03:00 |
|
Anatoly
|
296a09165d
|
added migration
|
2019-10-02 18:09:29 +03:00 |
|
Виктор Гладких
|
f0001eef93
|
Add get method in view
|
2019-10-02 17:58:22 +03:00 |
|
d.kuzmenko
|
750f141017
|
Merge branch 'feature/sending-news-email' into 'develop'
Feature/sending news email
See merge request gm/gm-backend!45
|
2019-10-02 14:17:29 +00:00 |
|
Anatoly
|
f693c36382
|
switched host email account, changed exception error
|
2019-10-02 17:16:19 +03:00 |
|
Anatoly
|
83ffb4dae1
|
Merge branch 'develop' into feature/gm-148
|
2019-10-02 16:22:11 +03:00 |
|
Anatoly
|
fec3e703ce
|
refactored collection views
|
2019-10-02 16:21:38 +03:00 |
|
Anatoly
|
e66b2f7f9f
|
refactored
|
2019-10-02 16:13:21 +03:00 |
|
Anatoly
|
ae4d6c3ccd
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
|
2019-10-02 15:46:35 +03:00 |
|