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 |
|
Anatoly
|
1b051f72c0
|
added restriction for upload data
|
2019-08-23 13:33:47 +03:00 |
|
Anatoly
|
cea63f7d6b
|
Merge branch 'develop' into feature/collections
|
2019-08-23 13:27:30 +03:00 |
|
a.feteleu
|
be21cfaf77
|
Merge branch 'feature/news' into 'develop'
Feature/news
See merge request gm/gm-backend!1
|
2019-08-23 10:23:46 +00:00 |
|
Anatoly
|
e88fea10e7
|
added fields to model Collection, refactored Collection serializer,
|
2019-08-23 12:59:10 +03:00 |
|
Anatoly
|
aa37e0a233
|
Merge branch 'develop' into feature/collections
# Conflicts:
# apps/collection/views/common.py
|
2019-08-23 12:23:06 +03:00 |
|
Anatoly
|
eb07bff654
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-08-23 12:16:58 +03:00 |
|
Dmitriy Kuzmenko
|
0dba806f04
|
fixed method _put_data_in_cookies
|
2019-08-23 09:47:30 +03:00 |
|
Dmitriy Kuzmenko
|
f86a94274d
|
put cookies in request, refactored JWTViewMixin, change endpoint to get news list
|
2019-08-23 09:42:31 +03:00 |
|
evgeniy-st
|
ef441ec2c2
|
update response determine-site
|
2019-08-22 17:35:34 +03:00 |
|
Anatoly
|
6558c84be9
|
added filter collection by country code from cookies
|
2019-08-22 14:55:57 +03:00 |
|
Anatoly
|
9586a0adf4
|
added filter collection by country code from cookies
|
2019-08-22 14:53:49 +03:00 |
|
evgeniy-st
|
4cceb62d49
|
update Country model
|
2019-08-22 14:45:01 +03:00 |
|
evgeniy-st
|
8a08c9b326
|
Fix __str__ for Country model
|
2019-08-22 14:41:45 +03:00 |
|
evgeniy-st
|
c4ba375323
|
update Country model
|
2019-08-22 14:40:21 +03:00 |
|
evgeniy-st
|
948cff2ac0
|
fix string method for sitesettings
|
2019-08-22 14:29:23 +03:00 |
|
evgeniy-st
|
9bdbf569a4
|
Merge branch 'feature/define-site' into develop
|
2019-08-22 14:24:26 +03:00 |
|
evgeniy-st
|
e839094e28
|
Site settings and determine user location over ip
|
2019-08-22 14:23:02 +03:00 |
|
evgeniy-st
|
94fe15af35
|
added geoip2
|
2019-08-22 13:59:00 +03:00 |
|
evgeniy-st
|
46f13f5f76
|
update gitignore
|
2019-08-22 13:57:01 +03:00 |
|
Anatoly
|
414370ed73
|
fixed NewsList view
|
2019-08-22 12:14:18 +03:00 |
|
Anatoly
|
4910c23dcc
|
fixed CollectionListView
|
2019-08-21 17:00:47 +03:00 |
|
Anatoly
|
b72f9956cf
|
version 0.0.22 updated CollectionList get_queryset method
|
2019-08-21 16:57:35 +03:00 |
|
Anatoly
|
507bae7b0d
|
Merge branch 'develop' into feature/collections
|
2019-08-21 16:53:56 +03:00 |
|
Anatoly
|
57e7219276
|
Added field is_publish to model Collection, updated endpoint to get collection list
|
2019-08-21 16:53:45 +03:00 |
|
Anatoly
|
43dc3a805a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-08-21 12:10:35 +03:00 |
|
Anatoly
|
ecb6349696
|
added CRUD endpoints for collection app
|
2019-08-21 12:09:21 +03:00 |
|
evgeniy-st
|
8c46496bf1
|
determine user`s site
|
2019-08-21 12:05:51 +03:00 |
|