phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,319 Commits 1 Branch 0 Tags 4.8 MiB
f3f06fcf09
Commit Graph

1124 Commits

Author SHA1 Message Date
Semyon Yekhmenin
890d1004e1 Added view for chosen tags 2019-10-24 07:44:47 +00:00
Kuroshini
bc50f118b8 Merge branch 'feature/tag-name-indexing' into develop 2019-10-23 18:09:41 +03:00
Kuroshini
b2341194bc fix serializer 2019-10-23 18:08:43 +03:00
Sergey Melihov
ab5b5801fd Merge branch 'feature/tag-name-indexing' into 'develop' 
tag category indexing name

See merge request gm/gm-backend!65
 2019-10-23 15:00:39 +00:00
Sergey Melihov
f3caf16d2c Merge branch 'changes-from-gm-148' into 'develop' 
Changes from gm 148

See merge request gm/gm-backend!63
 2019-10-23 14:57:34 +00:00
Anatoly
a8001c44b1 added validation rule to NewsBackOfficeGallerySerializer 2019-10-23 17:50:08 +03:00
Anatoly
1e3c80ad0c small fix 2019-10-23 17:40:42 +03:00
Kuroshini
07ac06f405 Update migration 2019-10-23 17:29:00 +03:00
Kuroshini
711d536c98 Update migration 2019-10-23 17:29:00 +03:00
Kuroshini
ce5987de95 Attach establishment timestamps as command 2019-10-23 17:29:00 +03:00
Kuroshini
d5609e4cb8 Works now filter first part 2019-10-23 17:29:00 +03:00
Kuroshini
47da9929cb Some fixes 2019-10-23 17:28:06 +03:00
Kuroshini
40357c20b6 Changes from gm-148 2019-10-23 17:28:06 +03:00
a.feteleu
b78c4f82fe Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-10-23 17:13:13 +03:00
Kuroshini
125c438f19 Review fix #2 2019-10-23 17:08:40 +03:00
a.feteleu
7e93aafc3f added merge migrations 2019-10-23 17:05:37 +03:00
evgeniy-st
a7a83a8755 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-10-23 17:03:52 +03:00
evgeniy-st
b1169675a8 fix CurrencySerializer 2019-10-23 17:03:24 +03:00
Anatoly
bd3a809d85 fix migrations 2019-10-23 16:48:45 +03:00
evgeniy-st
d8c99062ca fix singals 2019-10-23 16:28:42 +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
michail
cb3ad6bb96 added transfer for gallery app 2019-10-23 17:19:23 +05:00
Semyon Yekhmenin
81bd7b4912 Feature/currency sign 2019-10-23 11:58:33 +00: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
michail
110d0872da added transfer for partner app 2019-10-23 16:49:15 +05:00
Kuroshini
f46d4bd9f1 Review fix 2019-10-23 13:39:45 +03:00
Semyon Yekhmenin
538ae41d85 Establishments/slug/<slug> fix 2019-10-23 10:06:39 +00:00
michail
6c9ddfbc98 added transfer for recipe app 2019-10-23 14:42:08 +05:00
evgeniy-st
9c9c49d900 update slug fields 2019-10-23 12:25:50 +03:00
michail
8d0f4a8a00 added transfer for notification app 2019-10-23 14:17:34 +05:00
evgeniy-st
64692ae4b3 max length of slug is 255 2019-10-23 12:03:50 +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
evgeniy-st
154df2b720 Merge branch 'develop' into feature/product 2019-10-23 11:35:24 +03:00
evgeniy-st
766b6659f1 Models created: Product, OnlineProduct (proxy), ProductType, ProductSubtype 2019-10-23 11:31:45 +03:00
Anatoly
97823ea601 change title field in model Collection to translated JSON field (gm-165) 2019-10-23 11:25:04 +03:00
michail
1264ba963f edited get_username because nickname from legacy is not unique 2019-10-23 13:12:13 +05:00
michail
6dd4e1af33 Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects 2019-10-23 12:18:39 +05:00
michail
9e6d01b1bd prototype for transfer account 2019-10-23 12:18:25 +05: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
littlewolf
915683fa7b Remove comments 2019-10-23 09:16:39 +03:00
Kuroshini
4a0a305e2c tag category indexing name 2019-10-22 18:45:31 +03:00
Anatoly
3d68f1ba29 added imgae_url field to model Award (gm-183) 2019-10-22 18:20:34 +03:00
evgeniy-st
1b9df7c713 Merge branch 'develop' into feature/product 2019-10-22 17:12:59 +03:00
evgeniy-st
0c8959f4e7 Merge branch 'develop' into feature/gm-148 2019-10-22 17:11:22 +03:00
evgeniy-st
d1c9e649b7 Remove metadatacontent 2019-10-22 17:05:54 +03:00
Semyon Yekhmenin
939e4a26a0 Feature/cities by country 2019-10-22 13:00:22 +00:00
evgeniy-st
45a3cd4b2b Merge branch 'develop' into feature/product 2019-10-22 15:58:51 +03:00
Anatoly
071b634659 fixed EstablishmentFilter 2019-10-22 15:58:00 +03:00
Anatoly
4c9ea2e0e7 change field properties for Collection model 2019-10-22 15:45:58 +03:00
michail
5043462095 prototype 2019-10-22 17:11:45 +05:00
evgeniy-st
6c195bc185 Merge branch 'develop' into feature/gm-148 2019-10-21 20:26:31 +03:00
evgeniy-st
4ceb0e4d86 fix establishment migration 2019-10-21 20:22:47 +03:00
d.kuzmenko
18a2517fde Merge branch 'feature/GM-176_standard_user' into 'develop' 
Feature/gm 176 standard user

See merge request gm/gm-backend!54
 2019-10-21 14:50:47 +00:00
Semyon Yekhmenin
afc2127646 Updated news model with agenda and banner 2019-10-21 14:45:34 +00:00
littlewolf
786ee03d8e Fix 2019-10-21 17:24:30 +03:00
littlewolf
863762bdf2 Fix state 2019-10-21 17:23:50 +03:00
littlewolf
21f10d06f2 Fix state 2019-10-21 17:22:28 +03:00
evgeniy-st
55263e4059 remove merge migration 2019-10-21 16:51:01 +03:00
evgeniy-st
9c80811020 Merge branch 'develop' into feature/gm-148 2019-10-21 16:50:18 +03:00
evgeniy-st
19caf9faa6 Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148 2019-10-21 16:48:39 +03:00
evgeniy-st
94502cfc73 added priority field to tag model (f7facf826d) 2019-10-21 16:47:01 +03:00
evgeniy-st
f96a1d4aa2 Revert "Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field." 
This reverts commit f7facf826d.
 2019-10-21 16:42:08 +03:00
Виктор Гладких
23b46e69ed Fix test location 2019-10-21 16:28:32 +03:00
Виктор Гладких
d1d092e49d Fix news tests 2019-10-21 16:21:14 +03:00
Виктор Гладких
87708df084 Fix test establishment 2019-10-21 16:11:28 +03:00
Виктор Гладких
adbc22f1f6 Fix comment test 2019-10-21 16:03:19 +03:00
Виктор Гладких
196d335213 Fix 2019-10-21 15:47:06 +03:00
Виктор Гладких
f65af6f7cf Merge branch 'feature/GM-176_standard_user' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/GM-176_standard_user 2019-10-21 15:44:54 +03:00
Виктор Гладких
4f02fef456 Fix migrate 2019-10-21 15:44:20 +03:00
michail
4d3ecb65f2 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects 2019-10-21 17:32:02 +05:00
michail
e7107cfd04 fixes of news 2019-10-21 17:31:44 +05:00
Виктор Гладких
ee93cf9ff6 Fix migrate 2019-10-21 15:15:19 +03:00
Виктор Гладких
264e7bcb2a Fix conflict 2019-10-21 14:43:14 +03:00
Kuroshini
cc5249674d merge migrations 2019-10-21 14:39:23 +03:00
Виктор Гладких
019c22a0c8 Fix test 2019-10-21 14:39:04 +03:00
littlewolf
3f85aa84cc Remove tmp code 2019-10-21 14:19:01 +03:00
Виктор Гладких
3720ac2b8e Fix collection test 2019-10-21 12:17:12 +03:00
Виктор Гладких
f338906736 Fix location tests 2019-10-21 11:44:47 +03:00
Виктор Гладких
c8b3f922e9 Fix location tests 2019-10-21 11:08:30 +03: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
evgeniy-st
1cd586662a fix tagcategory binding serializer 2019-10-21 10:12:30 +03:00
littlewolf
7ebd338331 Tmp template fix 2019-10-21 09:59:59 +03:00
michail
c6750400ba fix IntegerField to ForeignKey 2019-10-21 11:16:11 +05:00
michail
ec55f7915f Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects 2019-10-21 11:08:05 +05:00
michail
019a10db52 commit 2019-10-21 11:07:54 +05:00
littlewolf
0a24b80917 Add title method 2019-10-20 19:08:14 +03:00
littlewolf
8965cf0460 Add news serializer 2019-10-20 17:59:18 +03:00
Semyon
f7facf826d Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field. 2019-10-18 18:37:24 +03:00
evgeniy-st
21e3f76f5a Backoffice Tag&TagCategory 2019-10-18 18:02:24 +03:00
Anatoly
7be7315cef added filters and endpoint to get winery list 2019-10-18 18:00:57 +03:00
Виктор Гладких
5772558c4b Fix 2019-10-18 16:04:21 +03:00
Виктор Гладких
7a4005ec21 Merge branch 'develop' into feature/GM-176_standard_user 2019-10-18 14:54:37 +03:00
Виктор Гладких
c44f8c39c1 Fix tests news 2019-10-18 13:05:42 +03:00
Виктор Гладких
2e2ed19118 Fix establishment tests 2019-10-18 12:14:10 +03:00
Kuroshini
3bc9dd7347 Open now filter (typo fix) 2019-10-18 02:56:49 +03:00
Kuroshini
b77c654c6c Open now filter 2019-10-18 02:38:59 +03:00
Kuroshini
4b5b34de20 add preview image url (fix typo) 2019-10-17 23:28:13 +03:00
Kuroshini
5f2501c712 add preview image url 2019-10-17 23:25:49 +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
Виктор Гладких
64ac59ee99 Add permission to view ReviewRUDView 2019-10-17 16:20:25 +03:00
Виктор Гладких
c012f969af Add RestaurantReviewer role 2019-10-17 16:17:17 +03: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
9661de4810 Establishment types 2019-10-17 15:17:29 +03:00
Kuroshini
d2e34e5d49 Timetable search results 2019-10-17 15:10:26 +03:00
Виктор Гладких
c80b53a0fc reviewer manager 2019-10-17 15:04:08 +03:00
Kuroshini
1998e3dc57 Change establishment schedule ES fields type 2019-10-17 14:59:35 +03:00
Kuroshini
2c5c067b53 try to remove weekday_display 2019-10-17 14:56:31 +03:00
Kuroshini
97fc8dce15 add schedule to search results 2019-10-17 14:45:33 +03:00
Kuroshini
c59811e037 Revert "Revert "add schedule to search results"" 
This reverts commit acea297
 2019-10-17 14:34:49 +03:00
Kuroshini
acea297c94 Revert "add schedule to search results" 
This reverts commit c8c66e7
 2019-10-17 14:33:20 +03:00
Kuroshini
c8c66e7d1b add schedule to search results 2019-10-17 14:32:10 +03:00
Anatoly
26ff9963d8 Merge branch 'develop' into feature/gm-148 
# Conflicts:
#	requirements/base.txt
 2019-10-17 13:43:24 +03:00
Kuroshini
6a85e52abc Rename variable 2019-10-17 12:30:40 +03:00
Semyon Yekhmenin
5176a455c1 Added method for getting coordinates and city by ip 2019-10-17 07:03:48 +00:00
Kuroshini
40f1cc1e22 Add lookup for categories 2019-10-16 20:56:56 +03:00
Kuroshini
9fc4a8703c Search establishment by working time (added lookup) 2019-10-16 19:13:33 +03:00
Kuroshini
2f656c459d Search establishment by working time (added fields to serializer) 2019-10-16 19:09:38 +03:00
Kuroshini
ed03f0f40f Search establishment by working time 2019-10-16 19:05:16 +03:00
Виктор Гладких
766fdcdad5 Add reviewer manager 2019-10-16 15:18:31 +03:00
Kuroshini
6d7341377b Show timetables list (remove pagination) 2019-10-16 14:46:36 +03:00
Kuroshini
c2c9f33b57 Show timetables list (only necessary fields) 2019-10-16 14:44:55 +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
Виктор Гладких
5ad3776fe3 establishment manager 2019-10-16 12:14:13 +03:00
Виктор Гладких
9fd89bf812 Add establishment manager role 2019-10-16 11:40:51 +03:00
Виктор Гладких
3271a6fed9 Establishment manager 2019-10-16 11:02:26 +03:00
Виктор Гладких
04a6bbea19 Add content page manager 2019-10-16 10:43:06 +03:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +03:00
littlewolf
e1b031caf3 Tmp commit 2019-10-16 07:05:05 +03:00
Kuroshini
e0bce99ca9 Fix issue with copies 2019-10-15 21:40:55 +03:00
evgeniy-st
a0e24a26a0 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-15 18:53:25 +03:00
evgeniy-st
ccf6e12e3f remove tag category from establishment type 2019-10-15 18:52:32 +03:00
evgeniy-st
c09b1eb295 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-15 18:44:24 +03:00
evgeniy-st
3a54b70093 update tag on document index 2019-10-15 18:43:08 +03:00
evgeniy-st
c268575a04 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-15 18:33:44 +03:00
evgeniy-st
bde81b3700 update ES documents 2019-10-15 18:32:16 +03:00
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
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
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
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
Anatoly
868a3c1b78 added merge migration 2019-10-11 16:36:34 +03:00
Anatoly
32d56ffe83 Merge branch 'develop' into feature/gm-148 2019-10-11 16:34:06 +03:00
d.kuzmenko
35532a32f4 Merge branch 'bugfix/account-change' into 'develop' 
Don't change email until user confirms it

See merge request gm/gm-backend!51
 2019-10-11 13:20:13 +00:00
Виктор Гладких
f441896d6a Migrate data 2019-10-11 16:00:23 +03:00
Anatoly
ddb3eec679 finished endpoint to get tags by establishment type and subtype 2019-10-11 15:41:31 +03:00
Виктор Гладких
d9fc88e7c6 Merge branch 'develop' into feature/roles 2019-10-11 14:50:18 +03:00
Виктор Гладких
a6c56a4bf1 Fix and refactor 2019-10-11 14:49:32 +03:00
Kuroshini
0816a847ac Some booking fixes 2019-10-11 14:36:25 +03:00
Kuroshini
114d159449 fix tests 2019-10-11 13:46:08 +03:00
michail
51b63335d7 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects 2019-10-11 15:41:32 +05:00
michail
7bcd2edab6 Added transfer.py into timetable. 
Edited transfer.py for collection and location.
 2019-10-11 15:41:09 +05:00
Anatoly
bdb9348916 Merge branch 'bugfix/gm-205' into feature/gm-148 
# Conflicts:
#	apps/establishment/models.py
 2019-10-11 13:31:33 +03:00
Anatoly
0b9fd8b1dc Merge branch 'bugfix/gm-205' into develop 2019-10-11 13:20:45 +03:00
littlewolf
6142508421 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects 2019-10-11 10:46:00 +03:00
littlewolf
f5c16fba9d Tmp fix 2019-10-11 10:45:49 +03:00
Anatoly
a25d846028 fixed bug with duplicated records in similar establishments 2019-10-10 21:02:56 +03:00
Kuroshini
71528d8a28 Password reset confirmation mechanics 2019-10-10 20:49:35 +03:00
Kuroshini
c920628574 Don't change email until user confirms it 2019-10-10 17:42:29 +03:00
Виктор Гладких
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
michail
839491c740 added Pages, PageTexts, PageCounters and PageMetadata models into 
transfer/models.py
 2019-10-10 17:55:28 +05:00
michail
b2b8798c6c Edited transfer.py for news, partner, reviews, comment. 
Added transfer.py for recipe.
 2019-10-10 17:46:52 +05: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
littlewolf
0e474a16ea Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects 2019-10-10 09:04:01 +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
michail
4cc9fabd73 edited transfer.py for notification, account, establishment 2019-10-09 17:43:48 +05: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
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
littlewolf
e8c48e99c6 Add key to transfer 
Add queryset to transfer
Add models and fields get to transfer
 2019-10-09 07:49:44 +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
michail
03b22d79db edited Address in location/transfer.py 2019-10-08 14:01:40 +05:00
michail
bc7d4ef5a5 comment location/transfer.py 2019-10-08 12:24:57 +05:00
Виктор Гладких
e66a6bcbfa Fix models 2019-10-08 10:18:51 +03:00
Виктор Гладких
7925febc77 Models role 2019-10-08 09:57:47 +03:00
littlewolf
ab768311f0 Update tables structure 2019-10-07 22:23:01 +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
michail
4e96d09513 added transfer.py to account, comment and review 2019-10-07 14:34:24 +05: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
michail
511312bb28 added transfer.py to partner 2019-10-04 16:20:04 +05: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
michail
ad17a2ad7a new relations template 2019-10-04 13:18:43 +05: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
littlewolf
4ce0eb284d Update transfer structure in location 2019-10-04 08:16:56 +03:00
littlewolf
b581ead8ae Add relation fields 2019-10-04 07:50:19 +03:00
littlewolf
90dd896f13 Load app models 
Load legacy models
 2019-10-04 00:14:16 +03:00
littlewolf
673acb4bb9 Add sort 
Move dependencies to model
Add data_type to model
 2019-10-03 23:19:40 +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