Dmitriy Kuzmenko
|
9a7052026b
|
add metadata
|
2019-08-29 14:51:55 +03:00 |
|
evgeniy-st
|
e3ad562680
|
update news model
|
2019-08-28 18:30:35 +03:00 |
|
Dmitriy Kuzmenko
|
967c08864d
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-08-28 18:12:09 +03:00 |
|
Dmitriy Kuzmenko
|
b2a105198f
|
fix translation
|
2019-08-28 18:11:56 +03:00 |
|
evgeniy-st
|
d9793b2056
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-08-28 18:03:09 +03:00 |
|
Dmitriy Kuzmenko
|
4a8053b231
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-08-28 17:54:12 +03:00 |
|
Dmitriy Kuzmenko
|
cb1ff8e410
|
add configuration
|
2019-08-28 17:53:52 +03:00 |
|
Anatoly
|
7a1d5e269c
|
refactored ImageSerializer
|
2019-08-28 17:25:16 +03:00 |
|
Anatoly
|
dbb0cbc05e
|
refactored endpoint to upload an image
|
2019-08-28 17:18:52 +03:00 |
|
evgeniy-st
|
c09b495bfd
|
update Establishment serializer
|
2019-08-28 16:31:02 +03:00 |
|
evgeniy-st
|
e5989273dc
|
Establishment add pagination
|
2019-08-28 15:41:17 +03:00 |
|
evgeniy-st
|
ba00bf1b00
|
Merge branch 'develop' into feature/establishment
|
2019-08-28 15:35:21 +03:00 |
|
evgeniy-st
|
1aef1a5bb1
|
Translation & establishment
|
2019-08-28 15:21:28 +03:00 |
|
Anatoly
|
4c448efc96
|
added field image_url to news list and collection list
|
2019-08-28 13:41:33 +03:00 |
|
Anatoly
|
6d95349a52
|
refactored logout endpoint
|
2019-08-28 13:14:57 +03:00 |
|
Anatoly
|
de0a1d6358
|
changed jwt login view (changed status code if user not found)
|
2019-08-28 12:58:33 +03:00 |
|
Anatoly
|
0db7b52df7
|
refactored remember flag in login
|
2019-08-28 12:54:17 +03:00 |
|
Anatoly
|
e22a54114b
|
refactored collection app
|
2019-08-28 12:22:13 +03:00 |
|
Anatoly
|
0f6147c1dc
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/collection/urls/common.py
|
2019-08-28 11:50:15 +03:00 |
|
Dmitriy Kuzmenko
|
253da87a99
|
URL refactoring
|
2019-08-28 11:35:38 +03:00 |
|
Dmitriy Kuzmenko
|
3d7727b4b4
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-08-28 10:15:29 +03:00 |
|
Dmitriy Kuzmenko
|
262e98b9e1
|
add awards
|
2019-08-28 10:15:17 +03:00 |
|
Anatoly
|
b5c50ff730
|
fixed serializers
|
2019-08-28 09:55:45 +03:00 |
|
evgeniy-st
|
f65b1caf9a
|
Fix redirect settings
|
2019-08-28 09:49:50 +03:00 |
|
Anatoly
|
a35fbc4456
|
added endpoint to upload an images
|
2019-08-27 19:03:52 +03:00 |
|
Anatoly
|
2172972216
|
refactored gallery app
|
2019-08-27 18:58:40 +03:00 |
|
Anatoly
|
ce260a69aa
|
Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"
This reverts commit 07333234
|
2019-08-27 18:18:58 +03:00 |
|
Anatoly
|
df2e60254e
|
fixed migrations
|
2019-08-27 17:50:24 +03:00 |
|
Anatoly
|
ee619922fa
|
fixed looped import
|
2019-08-27 17:26:43 +03:00 |
|
Anatoly
|
0733323486
|
added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections
|
2019-08-27 17:15:09 +03:00 |
|
Anatoly
|
0baeeef302
|
Merge branch 'develop' into feature/gallery
|
2019-08-27 17:12:24 +03:00 |
|
evgeniy-st
|
c04771ca58
|
recalculate price level preview version
|
2019-08-27 16:53:05 +03:00 |
|
evgeniy-st
|
6667047537
|
establishment admin conf
|
2019-08-27 14:23:41 +03:00 |
|
evgeniy-st
|
910027d10f
|
update establishment model, migrations
|
2019-08-27 14:23:11 +03:00 |
|
Anatoly
|
15c1950184
|
added application gallery
|
2019-08-27 13:02:54 +03:00 |
|
evgeniy-st
|
c942f00bd6
|
remove unused views
|
2019-08-27 12:36:48 +03:00 |
|
evgeniy-st
|
dcab146ede
|
Merge branch 'develop' into feature/establishment
|
2019-08-27 12:35:25 +03:00 |
|
evgeniy-st
|
f82784cd19
|
update establishment-list endpoint
|
2019-08-27 12:33:16 +03:00 |
|
evgeniy-st
|
245158c431
|
update SiteSettings serializer
|
2019-08-26 18:29:02 +03:00 |
|
evgeniy-st
|
21985eb8bc
|
Merge branch 'develop' into feature/establishment
|
2019-08-26 18:26:05 +03:00 |
|
evgeniy-st
|
f33fa21c0c
|
update site feautures
|
2019-08-26 18:12:15 +03:00 |
|
evgeniy-st
|
bb284420c4
|
initial app
|
2019-08-26 18:07:01 +03:00 |
|
Anatoly
|
5edcd0afe9
|
replace image field with svg_image field, added validator, and change serializer
|
2019-08-26 17:39:03 +03:00 |
|
Anatoly
|
f0a84a9847
|
remove pagination from - advertisement, collection, partner lists
|
2019-08-26 15:55:18 +03:00 |
|
Anatoly
|
da52f38b7f
|
added migrations, added ListAPI view endpoint
|
2019-08-26 15:27:33 +03:00 |
|
Anatoly
|
27468ded83
|
Merge branch 'develop' into feature/ad-blocks
|
2019-08-26 13:07:59 +03:00 |
|
Anatoly
|
6ac20fc4b2
|
uncommented endpoints for create/update/delete news app
|
2019-08-26 13:06:33 +03:00 |
|
Anatoly
|
6caea820da
|
added application advertisement
|
2019-08-26 12:40:26 +03:00 |
|
Anatoly
|
610ecb6f35
|
Merge remote-tracking branch 'origin/develop' into feature/news-image
|
2019-08-26 11:51:37 +03:00 |
|
Anatoly
|
93bd8a59c4
|
added image field to Country model
|
2019-08-26 11:50:54 +03:00 |
|