Anatoly
|
39e833ec1d
|
added custom JWT authentication
|
2019-08-29 09:43:31 +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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
evgeniy-st
|
6cba003960
|
Site features
|
2019-08-21 11:37:22 +03:00 |
|
Anatoly
|
95040a74d0
|
added migrations for app collection
|
2019-08-21 11:05:57 +03:00 |
|
Anatoly
|
d24c0cf407
|
added app collection, added new models
|
2019-08-21 09:58:45 +03:00 |
|
Anatoly
|
3f5d56fb7a
|
added to login endpoint parameter "remember" in request body
|
2019-08-20 17:44:46 +03:00 |
|
Anatoly
|
c03a3f9d4f
|
fixed PasswordResetSerializer
|
2019-08-20 16:32:53 +03:00 |
|
Anatoly
|
a51a686600
|
added parameter to development settings; added "email_confirmed" flag to user admin page
|
2019-08-20 16:06:40 +03:00 |
|
Anatoly
|
047803bf43
|
added endpoint to account app; added "email_confirmed" field to User model; refactored auth app;
|
2019-08-20 15:43:59 +03:00 |
|
Anatoly
|
3c00dd3d1d
|
Merge remote-tracking branch 'origin/develop' into feature/authorization
|
2019-08-20 15:33:20 +03:00 |
|
evgeniy-st
|
9f447477c3
|
SiteInterfaceDictionary
|
2019-08-20 14:04:04 +03:00 |
|
Anatoly
|
4289b01a19
|
Merge branch 'develop' into feature/authorization
|
2019-08-20 12:00:14 +03:00 |
|
Anatoly
|
6901978cf1
|
fixed cookies parameters for locale
|
2019-08-20 11:57:12 +03:00 |
|
Anatoly
|
556e9ea564
|
version 0.0.21: added endpoints to reset password, added endpoint to finish signing up, move some tasks to celery, added templates
|
2019-08-20 11:10:07 +03:00 |
|
evgeniy-st
|
09ad324b43
|
fix languages endpoint url
|
2019-08-19 17:10:44 +03:00 |
|