Commit Graph

3231 Commits

Author SHA1 Message Date
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
0135b25635 update urls conf 2019-08-26 18:25:16 +03:00
evgeniy-st
5c5ae15836 update settings 2019-08-26 18:24:47 +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
Dmitriy Kuzmenko
0cb3971ea4 Merge remote-tracking branch 'origin/develop' into develop 2019-08-26 11:48:27 +03:00
Dmitriy Kuzmenko
966423ecec add Est app 2019-08-26 11:48:15 +03:00
Anatoly
d9f52891dc fixed auth exceptions 2019-08-26 10:53:22 +03:00
Anatoly
ae1971e76d Merge branch 'feature/partner' into develop 2019-08-23 17:06:53 +03:00
Anatoly
9c30affde4 added image field to PartnerList serializer 2019-08-23 17:06:37 +03:00
Anatoly
4e670b0a4a Merge branch 'feature/collections' into develop 2019-08-23 17:02:58 +03:00
Anatoly
9687a0ec3b added verbose names to collection app models 2019-08-23 17:02:18 +03:00
Anatoly
1de7a84d56 added new application partner, added new model Partner 2019-08-23 16:58:27 +03:00
Anatoly
6e12612192 Merge branch 'develop' into feature/partner 2019-08-23 16:34:24 +03:00
Anatoly
5090e7dfe1 Merge branch 'feature/collections' into develop 2019-08-23 16:30:49 +03:00
Anatoly
919c625bbc added flag on_top to model Collection, refactored CollectionList view 2019-08-23 16:30:28 +03:00
Anatoly
bb9d0653f1 added application partner 2019-08-23 16:19:44 +03:00
a.feteleu
570687a76b Merge branch 'feature/news' into 'develop'
Feature/news

See merge request gm/gm-backend!3
2019-08-23 12:49:25 +00:00
Dmitriy Kuzmenko
e2767af57d change ordering in NewsList view 2019-08-23 15:29:55 +03:00
Dmitriy Kuzmenko
1747525f0f added fields to model News, refactored NewsList queryset, added filters to NewsList view 2019-08-23 15:25:02 +03:00
Anatoly
1d18d654e3 updated reset-password method 2019-08-23 14:35:47 +03:00
Anatoly
2ebfc265e3 Merge branch 'feature/collections' into develop 2019-08-23 13:37:34 +03:00
Anatoly
97a0b6be97 change verbose name for model News 2019-08-23 13:35:14 +03:00
Anatoly
6c044469d6 Merge remote-tracking branch 'origin/develop' into feature/collections 2019-08-23 13:34:04 +03:00