Commit Graph

330 Commits

Author SHA1 Message Date
a.feteleu
e75229b4d3 fix elastic settings 2019-10-30 20:35:15 +03:00
alex
4343060c74 Merge branch 'migration_fix' into HEAD 2019-10-30 15:49:32 +03:00
alex
8c3306628e news transfer 2019-10-30 15:48:32 +03:00
littlewolf
a67df32086 Fix establishment_mark 2019-10-30 12:55:44 +03:00
evgeniy-st
e371fdceea Merge branch 'develop' into migration_fix 2019-10-30 11:50:30 +03:00
Dmitriy Kuzmenko
c32b665b92 enable elastic 2019-10-29 17:17:24 +03:00
alex
adcc43309b fix settings 2019-10-29 08:26:52 +03:00
alex
4e868c2d8d transfer dishes 2019-10-29 08:25:03 +03:00
Dmitriy Kuzmenko
be31c75c19 disable elastic 2019-10-28 14:19:22 +03:00
Dmitriy Kuzmenko
853b0e047e add settings for dev server 2019-10-28 11:41:47 +03:00
Anatoly
37d745eeaa added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype 2019-10-26 18:54:22 +03:00
Anatoly
e3616ee7f8 change news_preview geometry string on 300x2260 2019-10-25 17:32:25 +03:00
Kuroshini
dd0b595132 Review fixes 2019-10-25 14:13:19 +03:00
Kuroshini
7f23f0e891 Establishment each hour reindexing 2019-10-25 14:13:19 +03:00
michail
d79946633e fix get_description for recipe.py 2019-10-25 13:17:35 +05:00
alex
95811c7437 return to localhost 2019-10-25 10:33:31 +03:00
alex
cd294961e0 Merge remote-tracking branch 'origin/develop' into feature/migration 2019-10-25 10:00:25 +03:00
Dmitriy Kuzmenko
66ddfb455b fix tests 2019-10-24 22:19:59 +03:00
Semyon Yekhmenin
2b9c9d14ef Added temporary stub for international news logic (hardcoded news id's) 2019-10-24 12:21:59 +00:00
alex
3ce7e186f7 migrate from legacy news 2019-10-24 14:01:38 +03:00
alex
0adac058c5 Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news
# Conflicts:
#	apps/gallery/models.py
#	requirements/base.txt
2019-10-24 13:11:05 +03:00
alex
647147bf03 Merge branch 'develop' into feature/migrate-news 2019-10-24 12:28:51 +03:00
Kuroshini
d5609e4cb8 Works now filter first part 2019-10-23 17:29:00 +03:00
Anatoly
7dbf594809 Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/account/tasks.py
2019-10-23 15:54:21 +03:00
Anatoly
fd2c1e0ca6 Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148
# Conflicts:
#	apps/news/models.py
#	apps/news/serializers.py
#	apps/news/views.py
#	project/settings/production.py
2019-10-23 15:37:14 +03:00
Anatoly
6a9f11e989 merge from develop 2019-10-23 15:31:04 +03:00
alex
636b15a30c mysql to docker-compose 2019-10-23 14:59:40 +03:00
Sergey Melihov
883f94c80a Merge branch 'feature/password-changed-notification' into 'develop'
Feature/password changed notification

See merge request gm/gm-backend!58
2019-10-23 11:51:15 +00:00
Anatoly
90e53d738d Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/main/models.py
#	apps/news/admin.py
#	apps/news/models.py
#	apps/news/serializers.py
#	apps/news/views.py
#	project/settings/base.py
#	project/settings/production.py
#	requirements/base.txt
2019-10-23 12:00:58 +03:00
evgeniy-st
766b6659f1 Models created: Product, OnlineProduct (proxy), ProductType, ProductSubtype 2019-10-23 11:31:45 +03:00
littlewolf
fed2aae7f1 Fix settings/base
Add transfer_data to location
2019-10-23 09:30:36 +03:00
littlewolf
f09bd5996a Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
#	project/settings/base.py
#	requirements/base.txt
2019-10-23 09:27:42 +03:00
evgeniy-st
45a3cd4b2b Merge branch 'develop' into feature/product 2019-10-22 15:58:51 +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
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
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
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
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
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
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
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
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
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
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
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
d2075a1bf8 Initial app Product 2019-09-20 12:13:26 +03:00
evgeniy-st
4de2ca4ef1 Recipe app&model 2019-09-19 11:57:58 +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
Anatoly
e572ff6445 increase cookies max-age 2019-09-16 15:50:45 +03:00
evgeniy-st
db5ff7afcd update settings, update establishment document 2019-09-16 11:21:14 +03:00
evgeniy-st
8e864d32b9 Merge branch 'develop' into feature/elasticsearch 2019-09-16 10:58:09 +03:00
Anatoly
30875958ea increase access token lifetime to 30 days and unregister unused models in admin page 2019-09-13 12:37:03 +03:00
Anatoly
075298f6ec refactored apps account, authorization, news, utils 2019-09-12 14:44:49 +03:00
Anatoly
ec2e87fe1a fixed settings for COOKIES, related to unable to login in admin page (CSRF ERROR) 2019-09-12 10:20:11 +03:00
Anatoly
06c7d790bb added redirect for ConfirmEmail and ResetPassword 2019-09-11 18:55:25 +03:00
Anatoly
2d102f0005 added cookie settings for local and development 2019-09-10 17:16:03 +03:00
Anatoly
b5707c6b26 Revert "added cookie settings for local and development"
This reverts commit 8e506bd5
2019-09-10 17:12:56 +03:00
Anatoly
8e506bd5e1 added cookie settings for local and development 2019-09-10 17:05:41 +03:00
Anatoly
7e468c539a change project settings 2019-09-10 15:35:24 +03:00
Anatoly
500e470b39 Added CORSMiddleware 2019-09-10 15:01:10 +03:00
evgeniy-st
9fab4454a0 Establishment index 2019-09-09 15:39:31 +03:00
Anatoly
1848bafd64 added new model favorites 2019-09-06 17:55:17 +03:00
evgeniy-st
99011ba15a Initial search indexes app 2019-09-06 14:52:52 +03:00
evgeniy-st
cfe1c982be update docker-compose, requirements, base settings 2019-09-06 14:27:14 +03:00
Anatoly
605c81b33c replace comment model from establishment app, added new app comment 2019-09-04 18:47:06 +03:00
Anatoly
cfc2d512ed added corsheaders to INSTALLED_APPS 2019-09-04 15:15:28 +03:00
Anatoly
892159ccb6 Merge remote-tracking branch 'origin/develop' into feature/authorization 2019-09-02 13:52:53 +03:00
evgeniy-st
a2ef5bbfd5 small refactor 2019-09-02 12:00:19 +03:00
Anatoly
3c7fc7a436 Merge remote-tracking branch 'origin/develop' into feature/authorization 2019-09-02 11:10:52 +03:00
Anatoly
e28435aba2 added preview image in establishment serializer 2019-09-01 18:11:09 +03:00
Anatoly
de8db655ed Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
#	apps/establishment/admin.py
#	apps/establishment/models.py
#	apps/establishment/serializers.py
2019-09-01 13:38:40 +03:00
Anatoly
e8d4626cdb Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
#	apps/establishment/models.py
2019-09-01 13:26:55 +03:00
Dmitriy Kuzmenko
fc4facbf83 add contacts for establishments 2019-09-01 12:35:09 +03:00
Anatoly
c39b5dbf1d Merge branch 'develop' into feature/authorization 2019-08-30 17:57:13 +03:00
Anatoly
f8b87c4788 added endpoint to change an email 2019-08-30 17:56:35 +03:00
evgeniy-st
7d7fa5e347 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-08-30 15:42:12 +03:00
evgeniy-st
2a8ffb16de Notification app & subscription 2019-08-30 15:40:53 +03:00
Anatoly
693577a524 Merge remote-tracking branch 'origin/develop' into feature/reviews 2019-08-30 12:03:19 +03:00
Anatoly
62ee83b1d4 refactored authorization 2019-08-30 11:53:19 +03:00
Anatoly
b7c1d6a48d added application review 2019-08-30 10:48:44 +03:00
Anatoly
3aa1e92046 added table EstablishmentSchedule, added application timetable, added table Timetable 2019-08-29 17:59:09 +03:00
Anatoly
c9fdf9074e small fix 2019-08-29 11:53:59 +03:00
Anatoly
57066048d6 added 95.213.204.126 to development allowed hosts 2019-08-29 11:41:14 +03:00
Anatoly
1213b39e0d Merge branch 'feature/authorization' into develop 2019-08-29 11:40:24 +03:00
Anatoly
39e833ec1d added custom JWT authentication 2019-08-29 09:43:31 +03:00
Dmitriy Kuzmenko
cb1ff8e410 add configuration 2019-08-28 17:53:52 +03:00
evgeniy-st
ba00bf1b00 Merge branch 'develop' into feature/establishment 2019-08-28 15:35:21 +03:00
evgeniy-st
1aef1a5bb1 Translation & establishment 2019-08-28 15:21:28 +03:00
Anatoly
0db7b52df7 refactored remember flag in login 2019-08-28 12:54:17 +03:00
evgeniy-st
f65b1caf9a Fix redirect settings 2019-08-28 09:49:50 +03:00
Anatoly
2172972216 refactored gallery app 2019-08-27 18:58:40 +03:00
Anatoly
ce260a69aa Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"
This reverts commit 07333234
2019-08-27 18:18:58 +03:00
Anatoly
0733323486 added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections 2019-08-27 17:15:09 +03:00
evgeniy-st
21985eb8bc Merge branch 'develop' into feature/establishment 2019-08-26 18:26:05 +03:00
evgeniy-st
5c5ae15836 update settings 2019-08-26 18:24:47 +03:00
evgeniy-st
bb284420c4 initial app 2019-08-26 18:07:01 +03:00
Anatoly
6caea820da added application advertisement 2019-08-26 12:40:26 +03:00
Anatoly
1de7a84d56 added new application partner, added new model Partner 2019-08-23 16:58:27 +03:00
Anatoly
1b051f72c0 added restriction for upload data 2019-08-23 13:33:47 +03:00
Dmitriy Kuzmenko
f86a94274d put cookies in request, refactored JWTViewMixin, change endpoint to get news list 2019-08-23 09:42:31 +03:00
evgeniy-st
e839094e28 Site settings and determine user location over ip 2019-08-22 14:23:02 +03:00
evgeniy-st
94fe15af35 added geoip2 2019-08-22 13:59:00 +03:00
Anatoly
d24c0cf407 added app collection, added new models 2019-08-21 09:58:45 +03:00
Anatoly
3f5d56fb7a added to login endpoint parameter "remember" in request body 2019-08-20 17:44:46 +03:00
Anatoly
a51a686600 added parameter to development settings; added "email_confirmed" flag to user admin page 2019-08-20 16:06:40 +03:00
Anatoly
047803bf43 added endpoint to account app; added "email_confirmed" field to User model; refactored auth app; 2019-08-20 15:43:59 +03:00
Anatoly
556e9ea564 version 0.0.21: added endpoints to reset password, added endpoint to finish signing up, move some tasks to celery, added templates 2019-08-20 11:10:07 +03:00
evgeniy-st
d87b9ca2d1 refactor urlpatterns 2019-08-19 16:56:28 +03:00
Anatoly
5564de5670 version 0.0.20: fixed translate annotator 2019-08-19 13:01:59 +03:00
Anatoly
663c003119 version 0.0.12: updated JWT views 2019-08-15 14:05:17 +03:00
Anatoly
d5a14ef8c2 version 0.0.11: added new model and CRUD endpoints to them; refactored auth app 2019-08-15 11:59:10 +03:00
Anatoly
033674c5b2 version 0.0.10: updated CORS config 2019-08-14 18:48:59 +03:00
Anatoly
e830e30c90 version 0.0.7: new model, added endpoint ot logout, refactored auth views and serializers 2019-08-14 11:27:48 +03:00
Dmitriy Kuzmenko
68f6e0bc9c version 0.0.6 new models and api for News 2019-08-13 15:23:00 +03:00
Anatoly
cc04a50709 version 0.0.5.12: refactored authorization app (added JWT support) 2019-08-13 14:14:18 +03:00
Anatoly
0a35f06ff5 version 0.0.5.11: refactored and setup CORS 2019-08-12 15:06:38 +03:00
Anatoly
60ea46592f version 0.0.5.9: change url to sign up with fb, add settings for django social auth 2019-08-12 09:49:49 +03:00
Anatoly
cfc6e05595 version 0.0.5.7: added method to reset password (until without confirmation) 2019-08-11 19:53:36 +03:00
Anatoly
4fbee551c3 version 0.0.5.6: added method to sign up 2019-08-10 19:18:55 +03:00
Anatoly
cb3fbcac93 version 0.0.5.4: added endpoints to login with username or email, refactored auth serializers, added project exceptions, refactored base settings 2019-08-09 22:10:13 +03:00
Anatoly
22f2de94f2 version 0.0.5.1: added integration with facebook, refactored a lot 2019-08-09 09:56:16 +03:00
Dmitriy Kuzmenko
2101a5ae5e version 0.0.5: add settings for development server 2019-08-08 17:35:29 +03:00
Dmitriy Kuzmenko
c5df0faa16 version 0.0.4: add app locations with models City, Regions, Address, Countries 2019-08-08 17:06:07 +03:00
Anatoly
a253ce0442 version 0.0.3: remove package modeltranslate, update settings, update requirements 2019-08-08 16:40:26 +03:00
Anatoly
76c6aef09c version 0.0.2: updated requirements list, updated settings, expanded the list of supported languages 2019-08-07 17:26:13 +03:00
Dmitriy Kuzmenko
fc2a689b6d version 0.0.1: add project, model user and api 2019-08-07 16:10:23 +03:00