evgeniy-st
|
403a60623a
|
Merge branch 'develop' into feature/refactor-establishments
|
2019-09-27 10:05:15 +03:00 |
|
Anatoly
|
f1eec96ce8
|
Merge branch 'develop' into feature/gm-127
# Conflicts:
# apps/establishment/models.py
# apps/establishment/urls/common.py
|
2019-09-26 14:29:39 +03:00 |
|
Anatoly
|
c4d8b89a8d
|
gm-127: finished
|
2019-09-26 14:19:01 +03:00 |
|
Anatoly
|
0e0d6e318e
|
GM-127: finished
|
2019-09-26 14:12:49 +03:00 |
|
Виктор Гладких
|
40d9f2f2ed
|
check
|
2019-09-26 11:45:26 +03:00 |
|
Виктор Гладких
|
86d754f4bb
|
validate json translated field
|
2019-09-26 11:38:37 +03:00 |
|
d.kuzmenko
|
e0f71d2646
|
Merge branch 'feature/add-base-attributes-autouse' into 'develop'
Feature/add base attributes autouse
See merge request gm/gm-backend!24
|
2019-09-26 08:34:38 +00:00 |
|
d.kuzmenko
|
0e4b714d2f
|
Merge branch 'feature/update-establishment-slug-urls' into 'develop'
Feature/update establishment slug urls
See merge request gm/gm-backend!29
|
2019-09-26 08:32:27 +00:00 |
|
d.kuzmenko
|
218787bec1
|
Merge branch 'hotfix/favorites-create' into 'develop'
Fix favorites creation by slug
See merge request gm/gm-backend!27
|
2019-09-26 08:31:52 +00:00 |
|
littlewolf
|
3279fce339
|
Update tests
|
2019-09-26 11:19:06 +03:00 |
|
littlewolf
|
877d3d9e6a
|
Fix test
Add todo to fix error
|
2019-09-25 19:44:33 +03:00 |
|
Anatoly
|
207e35feb1
|
GM-127: in progress
|
2019-09-25 19:39:37 +03:00 |
|
littlewolf
|
cabee12fab
|
Add comment tests
Add favorite tests
|
2019-09-25 18:58:52 +03:00 |
|
littlewolf
|
07a0f8e295
|
Temp commit
|
2019-09-25 17:34:11 +03:00 |
|
evgeniy-st
|
f18c18110c
|
Refactor some establishment serializer
|
2019-09-25 15:32:45 +03:00 |
|
Kuroshini
|
f38924db42
|
Fix favorites creation by slug
|
2019-09-25 14:09:24 +03:00 |
|
littlewolf
|
a2ade761b4
|
Update web urls
|
2019-09-25 14:04:52 +03:00 |
|
Anatoly
|
8766388256
|
fixed similar establishments
|
2019-09-25 13:16:02 +03:00 |
|
Anatoly
|
90c9e321f7
|
fixed similar establishments
|
2019-09-25 13:05:07 +03:00 |
|
Anatoly
|
0e643a1dfa
|
Merge branch 'develop' of /home/a.feteleu/projects/gm-backend with conflicts.
|
2019-09-25 12:23:25 +03:00 |
|
littlewolf
|
a55695b120
|
Switch to decorator
Add update test
|
2019-09-24 20:12:09 +03:00 |
|
Kuroshini
|
1534c9b09c
|
Remove unique
(cherry picked from commit f793c20)
|
2019-09-24 14:51:51 +03:00 |
|
Kuroshini
|
65914659e5
|
Slugs serializers
|
2019-09-24 12:31:35 +03:00 |
|
Kuroshini
|
d224c77a01
|
Fix issues with test && recreate migrations
|
2019-09-24 12:06:11 +03:00 |
|
Kuroshini
|
73a858cc8c
|
Slugs feature migrations
|
2019-09-24 10:38:04 +03:00 |
|
Kuroshini
|
6420a676df
|
create slugs manually
|
2019-09-24 10:38:04 +03:00 |
|
Kuroshini
|
1ce71fdcdc
|
slugs for news & establishments
|
2019-09-24 10:38:04 +03:00 |
|
evgeniy-st
|
83fddd63c3
|
fix migration establishment
|
2019-09-23 16:41:20 +03:00 |
|
d.kuzmenko
|
524a2d814d
|
Merge branch 'feature/collection-tests-api-status' into 'develop'
Feature/collection tests api status
See merge request gm/gm-backend!17
|
2019-09-23 12:51:28 +00:00 |
|
d.kuzmenko
|
a0ff8eae56
|
Merge branch 'feature/establishment-tests-api-status' into 'develop'
Feature/establishment tests api status
See merge request gm/gm-backend!13
|
2019-09-23 12:20:13 +00:00 |
|
littlewolf
|
aedcd795a9
|
Fix establishment model
|
2019-09-23 14:21:05 +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 |
|
littlewolf
|
9f89deb23b
|
Fix establishment RUD serializer
|
2019-09-23 11:16:22 +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 |
|
littlewolf
|
eaac6ca885
|
Fix
|
2019-09-20 16:47:20 +03:00 |
|
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 |
|
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 |
|