Anatoly
|
d9e45702ec
|
merge
|
2019-12-24 12:24:13 +03:00 |
|
Dmitriy Kuzmenko
|
63304aa2d1
|
add merge migrations
|
2019-12-23 17:16:33 +03:00 |
|
Dmitriy Kuzmenko
|
2580b9f218
|
Merge branch 'develop' into feature/collection-slugs
# Conflicts:
# requirements/base.txt
|
2019-12-23 16:57:24 +03:00 |
|
Ruslan Stepanov
|
8efd4e3c77
|
Fix slugify
|
2019-12-23 13:20:46 +00:00 |
|
Anatoly
|
cc7125b468
|
added image url to es
|
2019-12-23 09:19:16 +03:00 |
|
dormantman
|
2ca31cedfb
|
Added none condition to response
|
2019-12-20 16:59:14 +03:00 |
|
dormantman
|
0420fafabf
|
Added types to collection objects
|
2019-12-20 16:52:25 +03:00 |
|
Anatoly
|
2401763e6c
|
Merge branch 'develop' into feature/guides
|
2019-12-18 12:03:45 +03:00 |
|
Anatoly
|
54eee9565c
|
fix guide element label photo
|
2019-12-18 12:02:39 +03:00 |
|
Kuroshini
|
1131b02891
|
add collection migration & fix serializer according to the task
|
2019-12-17 21:53:42 +03:00 |
|
dormantman
|
c5bfdb9cde
|
Added some params
|
2019-12-17 21:49:46 +03:00 |
|
dormantman
|
5a18be4584
|
Added slugify to create collection
|
2019-12-17 21:49:46 +03:00 |
|
Anatoly
|
5032906483
|
revision collection view
|
2019-12-17 17:17:48 +03:00 |
|
Anatoly
|
387e164510
|
merged from develop, added merge migration and refactored a little bit
|
2019-12-17 15:20:55 +03:00 |
|
Anatoly
|
471239983e
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/views/back.py
# apps/transfer/models.py
|
2019-12-17 14:47:26 +03:00 |
|
Олег Хаятов
|
c456e43f80
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!180
|
2019-12-16 19:41:59 +00:00 |
|
dormantman
|
04bada1cd1
|
Fixed object names
|
2019-12-16 22:32:38 +03:00 |
|
Kuroshini
|
913da37b84
|
return collections dsc field
|
2019-12-16 22:26:38 +03:00 |
|
dormantman
|
1545ca9035
|
Added description field
|
2019-12-16 22:26:14 +03:00 |
|
Kuroshini
|
10ca6d8932
|
remove hardcode from migration
|
2019-12-16 22:13:25 +03:00 |
|
Олег Хаятов
|
1ce8686368
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!179
|
2019-12-16 19:10:33 +00:00 |
|
dormantman
|
b09d3af35f
|
Hardcode collection description migrate
|
2019-12-16 22:00:42 +03:00 |
|
dormantman
|
fb05243281
|
Change related_object field
|
2019-12-16 16:55:11 +03:00 |
|
dormantman
|
33ac0ad3e6
|
Delete useless import
|
2019-12-16 14:03:44 +03:00 |
|
Олег Хаятов
|
23522eb1f0
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!178
|
2019-12-16 11:02:27 +00:00 |
|
dormantman
|
c2a520b518
|
Reformat code style
|
2019-12-16 13:59:04 +03:00 |
|
dormantman
|
a9f5a5b98f
|
Deleted description field
|
2019-12-16 13:34:54 +03:00 |
|
dormantman
|
def1372317
|
Change ordering format
|
2019-12-16 01:02:21 +03:00 |
|
dormantman
|
b847de1183
|
Added collection migration
|
2019-12-16 01:01:56 +03:00 |
|
dormantman
|
4eff488369
|
Added description field
|
2019-12-13 21:39:09 +03:00 |
|
dormantman
|
525658f39b
|
Reformat ordering
|
2019-12-13 18:32:06 +03:00 |
|
dormantman
|
8f6dd7e5c1
|
Added related_object_ids
|
2019-12-13 16:17:35 +03:00 |
|
Anatoly
|
86257153ac
|
refactored guide ad label photos
|
2019-12-13 12:21:31 +03:00 |
|
dormantman
|
5c171c644c
|
Added mixins
|
2019-12-13 03:52:52 +03:00 |
|
dormantman
|
450ca4cf52
|
Added new field rank to collection
|
2019-12-13 03:50:12 +03:00 |
|
alex
|
3e83bdff59
|
pagination & ordering & country code
|
2019-12-12 15:34:36 +03:00 |
|
dormantman
|
e0a66f300b
|
Hide unnecessary fields
|
2019-12-11 18:07:04 +03:00 |
|
dormantman
|
a6b77e74b5
|
Remove unnecessary slash
|
2019-12-11 17:59:42 +03:00 |
|
dormantman
|
6cbfc38c9c
|
Added back collections method for collection detail
|
2019-12-11 17:58:39 +03:00 |
|
Anatoly
|
3bbd76a4f8
|
added endpoints
|
2019-12-10 18:50:12 +03:00 |
|
Anatoly
|
7d40471084
|
intermediate commit
|
2019-12-10 17:44:29 +03:00 |
|
Anatoly
|
ab82d9a2d6
|
refactoring guide and collection endpoints
|
2019-12-10 16:24:37 +03:00 |
|
Anatoly
|
8af8cf92e9
|
added objects related statistic in Collection backoffice serializer
|
2019-12-06 17:00:54 +03:00 |
|
Anatoly
|
1d9ee76a5c
|
fix es for establishments
|
2019-12-05 09:43:55 +03:00 |
|
Anatoly
|
9dc8e34e3a
|
Merge branch 'develop' into feature/transfer-guide
# Conflicts:
# apps/establishment/models.py
# apps/establishment/serializers/common.py
|
2019-12-04 20:16:21 +03:00 |
|
Anatoly
|
627f7562ec
|
finalizing transfer guides
|
2019-12-04 14:21:54 +03:00 |
|
Anatoly
|
076d14fd5b
|
added filter model
|
2019-12-02 13:51:48 +03:00 |
|
Anatoly
|
4e3a990ac6
|
added command to fix existed collections
|
2019-11-29 16:44:32 +03:00 |
|
Anatoly
|
eaeebae72a
|
in progress
|
2019-11-28 15:31:47 +03:00 |
|
Dmitriy Kuzmenko
|
2e17d7265d
|
add back api for collection
|
2019-11-20 16:29:46 +03:00 |
|