littlewolf
|
b4a2893fcd
|
Add tests to guide
|
2019-09-23 15:27:38 +03:00 |
|
littlewolf
|
aedcd795a9
|
Fix establishment model
|
2019-09-23 14:21:05 +03:00 |
|
littlewolf
|
466c0f80d7
|
Add list read test
Add detail read test
|
2019-09-23 14:17:19 +03:00 |
|
Anatoly
|
2c43a37108
|
GM-125: Доработать авторизацию через FB
|
2019-09-23 12:49:14 +03:00 |
|
Anatoly
|
202aabf15e
|
GM-124: added establishment migration
|
2019-09-23 12:40:27 +03:00 |
|
Anatoly
|
217c11b970
|
GM-124: Доработать модель establishment-а
|
2019-09-23 12:29:08 +03:00 |
|
Anatoly
|
20766768d8
|
fixed establishment filter by geo
|
2019-09-23 10:12:14 +03:00 |
|
Anatoly
|
07d17d5bf1
|
refactored similar establishment endpoint
|
2019-09-20 16:55:04 +03:00 |
|
Anatoly
|
277c7ba2eb
|
added field old_password to endpoint for change user password
|
2019-09-20 16:08:23 +03:00 |
|
Dmitriy Kuzmenko
|
1e1b09660d
|
fix news_type
|
2019-09-20 15:55:37 +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 |
|
Anatoly
|
09c9d666b5
|
rename image_url to image, preview_image_url to preview_image
|
2019-09-20 14:42:34 +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 |
|
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 |
|
ВашÐВиктор ГладкихÐ
|
fd0a491e89
|
Merge branch 'develop' into feature/employee_crud
|
2019-09-19 10:10:31 +03:00 |
|
d.kuzmenko
|
aff68fe288
|
Merge branch 'feature/advertisements_update' into 'develop'
Feature/advertisements update
See merge request gm/gm-backend!8
|
2019-09-19 07:05:32 +00:00 |
|
Semyon Yekhmenin
|
e2e7734bf2
|
Feature/advertisements update
|
2019-09-19 07:05:32 +00:00 |
|
d.kuzmenko
|
22bdcbacea
|
Merge branch 'feature/employee_priority' into 'develop'
Added employee position priority
See merge request gm/gm-backend!9
|
2019-09-19 07:02:45 +00:00 |
|
Semyon Yekhmenin
|
f700491d42
|
Added employee position priority
|
2019-09-19 07:02:45 +00:00 |
|
Anatoly
|
540a819f94
|
gm-80: in progress
|
2019-09-18 18:46:24 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
a1ea35fce1
|
CRUD logic for employee
|
2019-09-18 18:12:49 +03:00 |
|