evgeniy-st
|
9d4c483f51
|
clean models (tags)
|
2019-10-15 18:25:09 +03:00 |
|
evgeniy-st
|
42ae1cbb87
|
fix tagcategory queryset
|
2019-10-15 18:13:37 +03:00 |
|
evgeniy-st
|
f7eb534570
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 17:48:40 +03:00 |
|
evgeniy-st
|
c94ad3f017
|
comment some code
|
2019-10-15 17:48:01 +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 |
|
Виктор Гладких
|
322cfcd89d
|
Fix test
|
2019-10-15 15:33:28 +03:00 |
|
Виктор Гладких
|
9acef83894
|
Add country admin
|
2019-10-15 15:23:42 +03:00 |
|
Виктор Гладких
|
ff7df815f4
|
Fix country_id
|
2019-10-15 15:20:44 +03:00 |
|
Виктор Гладких
|
e8d0045cec
|
Merge branch 'develop' into feature/GM-176_standard_user
|
2019-10-15 15:17:15 +03:00 |
|
Anatoly
|
449eae060d
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 12:52:38 +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 |
|
Semyon Yekhmenin
|
5562a9e7c9
|
Fixed establishments/slug/<slug>, added filtering by country code
|
2019-10-15 12:16:23 +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 |
|
littlewolf
|
ba1ce67444
|
Fix limit
|
2019-10-15 12:07:37 +03:00 |
|
littlewolf
|
09865db08a
|
Tmp commit to debug
|
2019-10-15 12:05:49 +03:00 |
|
littlewolf
|
4d908d0bbb
|
Add field converter
|
2019-10-15 12:05:49 +03:00 |
|
littlewolf
|
47a4d28cf0
|
Add fields map for simple field
Add fields map for tuple field
Refactoring code
|
2019-10-15 12:05:49 +03:00 |
|
littlewolf
|
8cae39cbb6
|
Tmp fix
|
2019-10-15 12:05:49 +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 |
|
michail
|
54cfccbcbe
|
the fix of types fields in all apps
|
2019-10-15 13:23:31 +05:00 |
|
michail
|
dc12a184a1
|
the fix types of news fields
|
2019-10-15 12:46:06 +05:00 |
|
Виктор Гладких
|
43531d88dc
|
Country id
|
2019-10-15 10:05:31 +03:00 |
|
Anatoly
|
07bb0f1b8f
|
Merge branch 'develop' into feature/gm-148
|
2019-10-14 18:24:58 +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 |
|
Виктор Гладких
|
275c5b467c
|
fixa
|
2019-10-14 18:15:17 +03:00 |
|
Виктор Гладких
|
8d2d5b87ac
|
Fix migrate SQL
|
2019-10-14 17:56:51 +03:00 |
|
Виктор Гладких
|
01a32f66e8
|
Fix location migrate sql
|
2019-10-14 17:38:37 +03:00 |
|
Виктор Гладких
|
1bd3cc9170
|
1
|
2019-10-14 17:32:34 +03:00 |
|
a.feteleu
|
1a70ea2e99
|
Merge branch 'bugfix/account-confirm-pass' into 'develop'
Реверт фичи с паролем
See merge request gm/gm-backend!56
|
2019-10-14 13:55:00 +00:00 |
|
Kuroshini
|
fb4cf25dce
|
Fix empty email after creating account
|
2019-10-14 16:43:59 +03:00 |
|
Kuroshini
|
8eaf611d7e
|
Reverting migration
|
2019-10-14 16:02:02 +03:00 |
|
Kuroshini
|
6fa0051c93
|
Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
|
2019-10-14 15:53:40 +03:00 |
|
Виктор Гладких
|
0656e2ae32
|
Confirmed email for user standard
|
2019-10-14 15:48:31 +03:00 |
|
Виктор Гладких
|
7b4553663c
|
Fix
|
2019-10-14 15:45:41 +03:00 |
|
Виктор Гладких
|
b3eac3666b
|
Standart user, guest.
|
2019-10-14 14:48:13 +03:00 |
|
michail
|
a223832241
|
Relational integers to ForeignKey
|
2019-10-14 15:48:26 +05:00 |
|
michail
|
8ca27c7f87
|
Added transfer.py into main app.
Added legacy models into transfer/models.py
|
2019-10-14 14:30:13 +05:00 |
|
Anatoly
|
469f7bdf4c
|
added prefetch select related
|
2019-10-14 12:24:26 +03:00 |
|
Anatoly
|
9e237d4657
|
removed endpoint to display a list of tags by establishment id, added instead filter to filter tags by establishment id
|
2019-10-14 11:40:03 +03:00 |
|
Anatoly
|
47993a7155
|
added endpoint ot get list of tag categories with tags by establishment type
|
2019-10-14 10:22:17 +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 |
|
Anatoly
|
2d41b9142b
|
Merge remote-tracking branch 'origin/feature/gm-192' into feature/gm-192
|
2019-10-11 18:26:26 +03:00 |
|
Anatoly
|
cb762ce746
|
added param to attr for Establoishment model and small refactoring, boost queries
|
2019-10-11 18:26:13 +03:00 |
|
Виктор Гладких
|
1f44777a15
|
Fix
|
2019-10-11 17:04:55 +03:00 |
|
Виктор Гладких
|
e9ad418976
|
Revert migrate location
|
2019-10-11 16:57:59 +03:00 |
|
evgeniy-st
|
0d7104eace
|
Merge branch 'develop' into feature/gm-192
|
2019-10-11 16:44:54 +03:00 |
|