Anatoly
|
469a80339a
|
replaced checking is_staff on is_superuser
|
2020-01-30 14:33:11 +03:00 |
|
alex
|
d6b8c6191d
|
country name for csv users
|
2020-01-30 14:07:28 +03:00 |
|
Anton Gorbunov
|
ab8a4845d8
|
Merge branch 'feature/back-collections-list' into 'develop'
remove pagination
See merge request gm/gm-backend!248
|
2020-01-30 10:37:22 +00:00 |
|
a.gorbunov
|
eabb550f62
|
remove pagination
|
2020-01-30 10:36:22 +00:00 |
|
alex
|
1b353c48da
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/account/views/back.py
|
2020-01-30 13:18:08 +03:00 |
|
alex
|
57dd5cb521
|
user list csv export
|
2020-01-30 13:15:39 +03:00 |
|
Anatoly
|
21b0786daf
|
fix city model
|
2020-01-30 13:11:19 +03:00 |
|
Anatoly
|
7378d6d253
|
Merge branch 'feature/roles' into develop
|
2020-01-30 13:08:26 +03:00 |
|
Anatoly
|
ca5440d431
|
refactored roles
|
2020-01-30 12:50:14 +03:00 |
|
Kuroshini
|
c69bc05156
|
fix products serializer
|
2020-01-30 12:17:23 +03:00 |
|
alex
|
13968b3ed7
|
type read only
|
2020-01-30 11:21:14 +03:00 |
|
alex
|
8137bf0f68
|
fix establishment socials read_only
|
2020-01-30 11:09:12 +03:00 |
|
Anatoly
|
25c63b8097
|
Merge branch 'develop' into feature/roles
# Conflicts:
# apps/account/models.py
# apps/collection/views/back.py
# apps/comment/views/back.py
# apps/establishment/models.py
# apps/establishment/views/back.py
# apps/news/views.py
# apps/partner/views/back.py
|
2020-01-30 10:56:46 +03:00 |
|
Anatoly
|
57e63111fb
|
intermediate commit
|
2020-01-30 10:28:01 +03:00 |
|
dormantman
|
214c579701
|
Update django locales (for subscriptions)
|
2020-01-30 04:24:29 +03:00 |
|
Kuroshini
|
a2e200b48d
|
fix typing
|
2020-01-29 22:53:28 +03:00 |
|
Kuroshini
|
2d5be7bfac
|
Merge branch 'feature/cascade-update-roles' into develop
|
2020-01-29 22:49:56 +03:00 |
|
Kuroshini
|
62c25ac737
|
simplify code
|
2020-01-29 22:49:36 +03:00 |
|
a.gorbunov
|
f3ca4a8de9
|
place method to user class
|
2020-01-29 18:20:21 +00:00 |
|
Kuroshini
|
8eb828e309
|
partners remastered (sotring and optimization improvement)
|
2020-01-29 20:44:42 +03:00 |
|
Kuroshini
|
5ad32ad8aa
|
partner bind/unbind
|
2020-01-29 19:59:11 +03:00 |
|
Kuroshini
|
0261deb5df
|
get partners by establishment
|
2020-01-29 19:18:17 +03:00 |
|
Олег Хаятов
|
0e7fd39d37
|
Merge branch 'feature/bo-menus' into 'develop'
Feature/bo menus
See merge request gm/gm-backend!247
|
2020-01-29 15:54:44 +00:00 |
|
dormantman
|
e9646acfe1
|
Add migration
|
2020-01-29 18:38:15 +03:00 |
|
Kuroshini
|
007ba58f7a
|
partners create/fetch view
|
2020-01-29 18:22:58 +03:00 |
|
dormantman
|
19cf1b07d6
|
Added rud finding
|
2020-01-29 18:19:28 +03:00 |
|
Kuroshini
|
042d749d77
|
added pictures route && removed partners pictures duplicates
|
2020-01-29 17:53:25 +03:00 |
|
Kuroshini
|
6dd14ab80d
|
transfer partners
|
2020-01-29 17:46:59 +03:00 |
|
Kuroshini
|
38d2e002b7
|
partners transfer
|
2020-01-29 17:16:42 +03:00 |
|
Kuroshini
|
65b0b56c71
|
transfer partners
|
2020-01-29 17:15:12 +03:00 |
|
Kuroshini
|
917e500838
|
partners transfer
|
2020-01-29 17:07:06 +03:00 |
|
Kuroshini
|
869aa7b4f4
|
partners transfer
|
2020-01-29 17:02:58 +03:00 |
|
Kuroshini
|
45acfa37c9
|
partners transfer
|
2020-01-29 17:00:19 +03:00 |
|
Anatoly
|
302e22045e
|
fixes
|
2020-01-29 16:59:16 +03:00 |
|
Kuroshini
|
4fde19d23e
|
fix partner transfer
|
2020-01-29 16:53:04 +03:00 |
|
dormantman
|
a6db15ed50
|
Added menu dishes
|
2020-01-29 16:11:53 +03:00 |
|
Kuroshini
|
28d4a5ae42
|
reorganize partner models
|
2020-01-29 15:21:51 +03:00 |
|
dormantman
|
bcc5f2da51
|
Added menus method
|
2020-01-29 15:17:15 +03:00 |
|
Kuroshini
|
63fa81385e
|
western_name creation
|
2020-01-29 14:41:34 +03:00 |
|
Kuroshini
|
fb3e8e5d71
|
hide remove news
|
2020-01-29 12:28:31 +03:00 |
|
a.gorbunov
|
6a6d623ef3
|
update roles list
|
2020-01-29 09:03:45 +00:00 |
|
Kuroshini
|
f58ac2a1cc
|
partners
|
2020-01-28 23:21:16 +03:00 |
|
Kuroshini
|
8806bc4e33
|
fix transfer script
|
2020-01-28 21:27:45 +03:00 |
|
Kuroshini
|
24f4abc76d
|
fix transfer partners
|
2020-01-28 21:18:25 +03:00 |
|
Kuroshini
|
d2e28f519a
|
fix migration
|
2020-01-28 21:00:02 +03:00 |
|
Kuroshini
|
577098e6ca
|
partners changed relation
|
2020-01-28 20:58:54 +03:00 |
|
Kuroshini
|
8b014a7923
|
finally fix issue w/ news patch
|
2020-01-28 19:24:27 +03:00 |
|
alex
|
d9ff3227dc
|
address read only
|
2020-01-28 18:54:27 +03:00 |
|
dormantman
|
e067e8e793
|
Added menu upload files
|
2020-01-28 18:29:02 +03:00 |
|
Kuroshini
|
9af6458dff
|
translations for news types
|
2020-01-28 18:21:05 +03:00 |
|