Semyon Yekhmenin
|
1332a8f65a
|
Login validation error message fix
|
2019-10-21 08:10:32 +00:00 |
|
evgeniy-st
|
2dbe65a169
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-21 10:31:06 +03:00 |
|
evgeniy-st
|
a9f995adbb
|
Merge branch 'feature/gm-192' into develop
|
2019-10-21 10:30:40 +03:00 |
|
michail
|
019a10db52
|
commit
|
2019-10-21 11:07:54 +05:00 |
|
evgeniy-st
|
21e3f76f5a
|
Backoffice Tag&TagCategory
|
2019-10-18 18:02:24 +03:00 |
|
Виктор Гладких
|
7a4005ec21
|
Merge branch 'develop' into feature/GM-176_standard_user
|
2019-10-18 14:54:37 +03:00 |
|
Kuroshini
|
b77c654c6c
|
Open now filter
|
2019-10-18 02:38:59 +03:00 |
|
Anatoly
|
cce0913245
|
change AWS_S3_CUSTOM_DOMAIN
|
2019-10-17 18:37:48 +03:00 |
|
evgeniy-st
|
1cbfb12594
|
Merge remote-tracking branch 'origin/develop' into feature/gm-148
|
2019-10-17 16:58:30 +03:00 |
|
Semyon Yekhmenin
|
1ff571b767
|
Feature/mobile features
|
2019-10-17 13:29:29 +00:00 |
|
Виктор Гладких
|
d6ffbf5332
|
Merge branch 'develop' into feature/GM-176_standard_user
|
2019-10-17 15:27:49 +03:00 |
|
Виктор Гладких
|
5a058c14f4
|
Add back for review
|
2019-10-17 15:26:26 +03:00 |
|
evgeniy-st
|
19b3502f58
|
revert auth backends
|
2019-10-17 14:34:31 +03:00 |
|
Anatoly
|
8a363498f5
|
change broker url
|
2019-10-17 14:28:39 +03:00 |
|
Anatoly
|
79b4b59478
|
enabling celery for development and stage settings
|
2019-10-17 13:49:29 +03:00 |
|
Anatoly
|
0c2b657244
|
small fix
|
2019-10-17 13:47:59 +03:00 |
|
Anatoly
|
26ff9963d8
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# requirements/base.txt
|
2019-10-17 13:43:24 +03:00 |
|
Anatoly
|
e2c27bd2e1
|
switched broker storage from rabbtimq to redis
|
2019-10-17 13:42:11 +03:00 |
|
Kuroshini
|
12a339cd1b
|
Show timetables list
|
2019-10-16 14:36:17 +03:00 |
|
Kuroshini
|
8dad3df4bf
|
Added route for mobile tags
|
2019-10-16 14:11:07 +03:00 |
|
evgeniy-st
|
c268575a04
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:33:44 +03:00 |
|
evgeniy-st
|
42ae1cbb87
|
fix tagcategory queryset
|
2019-10-15 18:13:37 +03:00 |
|
evgeniy-st
|
92529f4c5b
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 17:17:35 +03:00 |
|
evgeniy-st
|
60cdec99e0
|
refactor tags
|
2019-10-15 17:17:03 +03:00 |
|
Kuroshini
|
9c09f000fb
|
Password changed notification email
|
2019-10-15 16:32:47 +03:00 |
|
Anatoly
|
1764cfc08b
|
added urlpath to get establishment tags to all platform
|
2019-10-15 12:52:21 +03:00 |
|
Anatoly
|
f86b7d489f
|
fix merge
|
2019-10-15 12:23:13 +03:00 |
|
Anatoly
|
2d830b2821
|
Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
|
2019-10-15 12:08:23 +03:00 |
|
Anatoly
|
6f6717efdc
|
Merge branch 'develop' into feature/gm-192
# Conflicts:
# apps/account/views/common.py
# project/urls/back.py
|
2019-10-15 11:47:14 +03:00 |
|
Anatoly
|
2b35d3473b
|
fix settings
|
2019-10-14 18:23:03 +03:00 |
|
Anatoly
|
228cb72c36
|
Merge branch 'develop' into feature/gm-148
|
2019-10-14 18:19:46 +03:00 |
|
Kuroshini
|
6fa0051c93
|
Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
|
2019-10-14 15:53:40 +03:00 |
|
d.kuzmenko
|
1f6bf819e8
|
Merge branch 'feature/roles' into 'develop'
Feature/roles
See merge request gm/gm-backend!50
|
2019-10-14 07:09:18 +00:00 |
|
evgeniy-st
|
0d7104eace
|
Merge branch 'develop' into feature/gm-192
|
2019-10-11 16:44:54 +03:00 |
|
Anatoly
|
32d56ffe83
|
Merge branch 'develop' into feature/gm-148
|
2019-10-11 16:34:06 +03:00 |
|
Kuroshini
|
700695cdcc
|
Change route for changed email confirmation
|
2019-10-11 15:57:59 +03:00 |
|
littlewolf
|
f5c16fba9d
|
Tmp fix
|
2019-10-11 10:45:49 +03:00 |
|
Kuroshini
|
71528d8a28
|
Password reset confirmation mechanics
|
2019-10-10 20:49:35 +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 |
|
Виктор Гладких
|
dd4c7fa3eb
|
Merge branch 'develop' into feature/roles
|
2019-10-10 14:28:40 +03:00 |
|
evgeniy-st
|
074a5ec5ea
|
refactor news tags
|
2019-10-09 18:25:40 +03:00 |
|
Kuroshini
|
365f39ce65
|
News email detail link fix
|
2019-10-09 17:23:58 +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 |
|
Виктор Гладких
|
77839c7e8c
|
Merge branch 'develop' into feature/roles
|
2019-10-09 16:29:11 +03:00 |
|
Anatoly
|
74fa1fc014
|
Merge branch 'develop' into feature/gm-192
|
2019-10-09 16:21:50 +03:00 |
|
Anatoly
|
2d375a51cf
|
change Celery state for dev settings
|
2019-10-09 16:00:06 +03:00 |
|
Anatoly
|
41db19b167
|
Merge branch 'feature/fix-auth-refactored-email' into feature/gm-148
|
2019-10-09 15:20:34 +03:00 |
|
Anatoly
|
31f8b5abd1
|
refactored base settings
|
2019-10-09 15:19:46 +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 |
|
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 |
|
littlewolf
|
22d2396c6b
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# docker-compose.yml
# project/settings/base.py
|
2019-10-09 07:54:15 +03:00 |
|
Anatoly
|
d321866dc2
|
gm-192: in progress
|
2019-10-08 15:38:35 +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 |
|
Anatoly
|
ee93ad4a44
|
fix settings
|
2019-10-04 14:31:24 +03:00 |
|
Anatoly
|
c365711c05
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 14:31:03 +03:00 |
|
evgeniy-st
|
36922e1684
|
update settings
|
2019-10-04 14:04:08 +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 |
|
Kuroshini
|
53db4462f8
|
Added lastable booking availability checking method
|
2019-10-03 14:59:38 +03:00 |
|
Kuroshini
|
0408d93599
|
Squashed migrations && added lastable credentials
|
2019-10-03 13:41:45 +03:00 |
|
Виктор Гладких
|
38be14b5ba
|
Merge branch 'develop' into feature/news-rating
|
2019-10-03 11:39:24 +03:00 |
|
Anatoly
|
4796fce784
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/admin.py
|
2019-10-02 18:11:47 +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 |
|
Виктор Гладких
|
753471544e
|
Add app Rating
|
2019-10-02 14:17:06 +03:00 |
|
Anatoly
|
402bd32eda
|
gm-148: modified news gallery
|
2019-10-02 14:10:23 +03:00 |
|
littlewolf
|
9dcdb7575e
|
Switch application
Add application command
Update mixin
Add mixin to models
|
2019-10-02 11:41:14 +03:00 |
|
Anatoly
|
3234a71cde
|
gm-148: modified settings, added missing migration
|
2019-10-02 10:34:17 +03:00 |
|
Anatoly
|
b31e71d4ef
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/serializers.py
# project/settings/local.py
|
2019-10-02 10:20:14 +03:00 |
|
Anatoly
|
d9635a8599
|
gm-148: refactored
|
2019-10-02 10:16:32 +03:00 |
|
michail
|
c0149a0695
|
added country_code to news email template
|
2019-10-02 11:48:03 +05:00 |
|
michail
|
b96ed30a49
|
added news mail template and task without celery delay
|
2019-10-02 11:48:03 +05:00 |
|
Kuroshini
|
4c960c8abf
|
Booking (squashed commit)
|
2019-10-01 18:25:57 +03:00 |
|
Виктор Гладких
|
693d895aa4
|
Fix tests
|
2019-10-01 11:52:46 +03:00 |
|
littlewolf
|
e3d26b5dd1
|
Temp commit
|
2019-10-01 07:43:38 +03:00 |
|
littlewolf
|
277418bf72
|
Fix docker host
|
2019-09-30 13:56:12 +03:00 |
|
littlewolf
|
c03792d0e3
|
Add legacy database
Add requirements
|
2019-09-30 11:19:09 +03:00 |
|
Anatoly
|
7f79ce8945
|
gm-148: in progress
|
2019-09-27 17:48:27 +03:00 |
|
Anatoly
|
14ae75f088
|
gm-148: refactored news serializer
|
2019-09-26 18:38:57 +03:00 |
|
Anatoly
|
c4d8b89a8d
|
gm-127: finished
|
2019-09-26 14:19:01 +03:00 |
|
Anatoly
|
0e0d6e318e
|
GM-127: finished
|
2019-09-26 14:12:49 +03:00 |
|
Anatoly
|
207e35feb1
|
GM-127: in progress
|
2019-09-25 19:39:37 +03:00 |
|
evgeniy-st
|
009533d764
|
Tags & disable elasticsearch indexing
|
2019-09-23 16:06:40 +03:00 |
|
evgeniy-st
|
dc4b63d8b2
|
Refactor news
|
2019-09-23 15:35:37 +03:00 |
|
Anatoly
|
5f3947601a
|
rename url path collection to collections, delete property in M2M field
|
2019-09-20 15:11:33 +03:00 |
|
evgeniy-st
|
d2075a1bf8
|
Initial app Product
|
2019-09-20 12:13:26 +03:00 |
|
evgeniy-st
|
cace6a7d3b
|
Recipe list&detail api-endpoints
|
2019-09-19 14:22:40 +03:00 |
|
evgeniy-st
|
4de2ca4ef1
|
Recipe app&model
|
2019-09-19 11:57:58 +03:00 |
|
Dmitriy Kuzmenko
|
20fe40010c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-18 11:41:43 +03:00 |
|
Dmitriy Kuzmenko
|
e9bf129f82
|
add api locations for back office
|
2019-09-18 11:39:46 +03:00 |
|
Anatoly
|
784728d155
|
Facebook auth return user email; fixed URL in templates
|
2019-09-18 11:21:27 +03:00 |
|
Anatoly
|
69f1a5cf48
|
GM-73 added ordering
|
2019-09-17 17:16:21 +03:00 |
|
evgeniy-st
|
2abf2c7ffe
|
fix import
|
2019-09-17 11:02:32 +03:00 |
|
evgeniy-st
|
8ac46b7379
|
sentry settings for dev-server
|
2019-09-17 10:42:05 +03:00 |
|
Dmitriy Kuzmenko
|
a190f2ca88
|
fix settings for stage server
|
2019-09-16 17:27:42 +03:00 |
|