Commit Graph

45 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
d7c7880860 add counter for public_mark and change Guid serializer 2019-12-25 15:19:43 +03:00
Kuroshini
660c8e791b tags translation 2019-12-20 19:08:53 +03:00
Anatoly
b659308729 exclude field from Establishment serializer 2019-12-06 13:06:59 +03:00
Anatoly
1da7c40a9d fix merge 2019-12-04 20:18:47 +03:00
Anatoly
9dc8e34e3a Merge branch 'develop' into feature/transfer-guide
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/serializers/common.py
2019-12-04 20:16:21 +03:00
Kuroshini
9f882ca656 tags dynamic filters #4 (boost search via ES) 2019-12-04 00:33:18 +03:00
Dmitriy Kuzmenko
b6d0815ed0 add news author migration 2019-12-03 09:59:11 +03:00
Anatoly
52872ce364 updated 2019-11-29 14:09:00 +03:00
Виктор Гладких
420c673afd Fix 2019-11-25 16:52:27 +03:00
Anatoly
9b61ff3114 added COOKIE_DOMAIN parameter to settings 2019-11-23 14:58:49 +03:00
Dmitriy Kuzmenko
c83c07b9e1 add site features inline admin 2019-11-22 18:33:39 +03:00
Виктор Гладких
e0352b7d93 Back news permissions 2019-11-22 15:46:59 +03:00
alex
0fe7c50e5b logging 2019-11-19 17:50:04 +03:00
alex
a8cc734d20 back user api 2019-11-19 17:48:20 +03:00
Kuroshini
a305c6ba83 try to fix tag categories
(cherry picked from commit 376d22c)
2019-11-17 23:44:15 +03:00
Dmitriy Kuzmenko
45b0b93068 add new migrations for tags 2019-11-16 22:49:38 +03:00
littlewolf
4e72487558 Add rating.views_count transfer 2019-11-14 20:54:14 +03:00
Kuroshini
a3b944ed1e New ES index 2019-11-13 18:43:30 +03:00
Виктор Гладких
13db34237b Add tag for product 2019-11-12 17:36:48 +03:00
Anatoly
358407e786 merged develop 2019-11-11 12:01:16 +03:00
Anatoly
c67109d9f8 Merge branch 'develop' into features/migrate-wine
# Conflicts:
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/models.py
#	project/settings/base.py
2019-11-11 11:35:03 +03:00
Виктор Гладких
ba6d18d202 Fix account migration 2019-11-07 17:01:26 +03:00
Anatoly
87dacfec7f refactored product app, see changes 2019-11-05 18:04:34 +03:00
Anatoly
6a9f11e989 merge from develop 2019-10-23 15:31:04 +03: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
Anatoly
e2c27bd2e1 switched broker storage from rabbtimq to redis 2019-10-17 13:42:11 +03:00
Anatoly
ee93ad4a44 fix settings 2019-10-04 14:31:24 +03:00
Anatoly
4890e00b95 gm-148: refactored 2019-10-04 11:50:29 +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
Виктор Гладких
693d895aa4 Fix tests 2019-10-01 11:52:46 +03:00
evgeniy-st
009533d764 Tags & disable elasticsearch indexing 2019-09-23 16:06:40 +03:00
evgeniy-st
9fab4454a0 Establishment index 2019-09-09 15:39:31 +03:00
evgeniy-st
99011ba15a Initial search indexes app 2019-09-06 14:52:52 +03:00
evgeniy-st
a2ef5bbfd5 small refactor 2019-09-02 12:00:19 +03:00
evgeniy-st
2a8ffb16de Notification app & subscription 2019-08-30 15:40:53 +03:00
Anatoly
39e833ec1d added custom JWT authentication 2019-08-29 09:43:31 +03:00
evgeniy-st
f65b1caf9a Fix redirect settings 2019-08-28 09:49:50 +03:00
evgeniy-st
e839094e28 Site settings and determine user location over ip 2019-08-22 14:23:02 +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
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
cfc6e05595 version 0.0.5.7: added method to reset password (until without confirmation) 2019-08-11 19:53:36 +03:00
Dmitriy Kuzmenko
fc2a689b6d version 0.0.1: add project, model user and api 2019-08-07 16:10:23 +03:00