Commit Graph

3231 Commits

Author SHA1 Message Date
littlewolf
4e495fa47d Remove debug 2019-09-20 16:42:35 +03:00
littlewolf
e39bc835fd Fix class name 2019-09-20 16:41:24 +03:00
littlewolf
0d7b26bbb2 Add update tests 2019-09-20 16:40:53 +03:00
littlewolf
85fef10eb3 Fix establishment tests 2019-09-20 16:28:23 +03:00
littlewolf
aaff7fd3ba Add schedule tests 2019-09-20 16:22:41 +03:00
littlewolf
2d8b30c3ee Add patch test to plates class 2019-09-20 16:10:51 +03:00
Anatoly
277c7ba2eb added field old_password to endpoint for change user password 2019-09-20 16:08:23 +03:00
littlewolf
7f973bbf52 Merge branch 'develop' into feature/establishment-tests-api-status 2019-09-20 16:00:39 +03:00
littlewolf
df0afc5653 Fix plates RUD view 2019-09-20 16:00:16 +03:00
littlewolf
2f74c63fd9 Fix plate tests
Add menu tests
2019-09-20 15:58:23 +03:00
Dmitriy Kuzmenko
1e1b09660d fix news_type 2019-09-20 15:55:37 +03:00
littlewolf
014931d2c4 Add plate tests
Add is_publish to serializer
Add TODO for is_publish
2019-09-20 15:39:53 +03:00
Anatoly
193ecfba7a fixed comments 2019-09-20 15:38:20 +03:00
Anatoly
5f3947601a rename url path collection to collections, delete property in M2M field 2019-09-20 15:11:33 +03:00
littlewolf
e616d3970c Add class to test childs 2019-09-20 14:55:34 +03:00
littlewolf
ee93905556 Add phone tests 2019-09-20 14:49:04 +03:00
Anatoly
09c9d666b5 rename image_url to image, preview_image_url to preview_image 2019-09-20 14:42:34 +03:00
littlewolf
00d8f09881 Add email tests 2019-09-20 14:42:00 +03:00
littlewolf
49d2070544 Add establishment tests 2019-09-20 14:31:02 +03:00
Anatoly
2089ca067a chane FK to URLField in Collection model, added properties to field collections in Establishment model 2019-09-20 14:22:39 +03:00
Anatoly
413c93bead fixed problem with image, refactored favorites, collection 2019-09-20 13:35:59 +03:00
evgeniy-st
d2075a1bf8 Initial app Product 2019-09-20 12:13:26 +03:00
Sergey Melihov
2a79018f76 Merge branch 'feature/employee_crud' into 'develop'
Feature/employee crud

See merge request gm/gm-backend!11
2019-09-20 06:39:20 +00:00
evgeniy-st
e5f4c27495 Fix establishment search 2019-09-19 18:27:47 +03:00
evgeniy-st
2cb4d22a94 Add in_favorites into models 2019-09-19 18:18:19 +03:00
ВашÐВиктор ГладкихÐ
4a08abbfd9 employee test crd 2019-09-19 18:02:43 +03:00
Dmitriy Kuzmenko
b23a79775d add merge for migrations 2019-09-19 17:57:30 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Anatoly
2ce69eb003 added establishment tag identifier to TagListAPIView 2019-09-19 17:10:18 +03:00
ВашÐВиктор ГладкихÐ
d3238f50c2 add login test 2019-09-19 17:06:38 +03:00
Anatoly
00925b7e0a fixed tag list 2019-09-19 17:02:27 +03:00
Anatoly
1db37a7cee fixed tag list 2019-09-19 16:56:00 +03:00
Anatoly
8d94279dbc fixed migration for app advertisement, added choice to PlatformMixin 2019-09-19 16:46:33 +03:00
ВашÐВиктор ГладкихÐ
356ea9465b add get_tokkens and add cookies 2019-09-19 16:25:57 +03:00
ВашÐВиктор ГладкихÐ
3095b5940f modify base test for route 'employees' 2019-09-19 15:40:07 +03:00
ВашÐВиктор ГладкихÐ
4e47a5b7a4 add base test for route 'employees' 2019-09-19 15:33:23 +03:00
evgeniy-st
c85ec699f0 Merge branch 'feature/recipe' into develop 2019-09-19 14:56:26 +03:00
evgeniy-st
c26ca72f72 added in_favorites to recipe endpoints 2019-09-19 14:55:50 +03:00
Anatoly
306a6010e8 added merge migration 2019-09-19 14:37:01 +03:00
Anatoly
5f42039068 Merge branch 'feature/gm-80' into develop 2019-09-19 14:34:47 +03:00
Anatoly
24f364084e gm-80: refactored 2019-09-19 14:34:36 +03:00
Anatoly
a09d6b28f1 Merge branch 'feature/gm-80' into develop
# Conflicts:
#	apps/establishment/serializers/back.py
2019-09-19 14:32:10 +03:00
Anatoly
09450a1ae5 gm-80: complete 2019-09-19 14:30:32 +03:00
evgeniy-st
cace6a7d3b Recipe list&detail api-endpoints 2019-09-19 14:22:40 +03:00
evgeniy-st
297f5daba8 Merge branch 'develop' into feature/recipe 2019-09-19 12:56:23 +03:00
evgeniy-st
140172a17d merge migrations 2019-09-19 12:55:58 +03:00
evgeniy-st
4de2ca4ef1 Recipe app&model 2019-09-19 11:57:58 +03:00
Anatoly
38ba443b47 gm-80: complete 2019-09-19 11:26:54 +03:00
d.kuzmenko
9620d35ade Merge branch 'feature/employee_crud' into 'develop'
Feature/employee crud

See merge request gm/gm-backend!10
2019-09-19 07:16:31 +00:00