Kuroshini
|
ac606d14f8
|
swagger
|
2020-01-30 17:16:15 +03:00 |
|
alex
|
d60e46419b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-30 17:01:39 +03:00 |
|
alex
|
40fa4c543b
|
roles for user csv
|
2020-01-30 17:01:27 +03:00 |
|
Kuroshini
|
442e26cfe4
|
partners web
|
2020-01-30 16:37:48 +03:00 |
|
Anatoly
|
e6de2cc4f9
|
fix method
|
2020-01-30 16:28:32 +03:00 |
|
Anatoly
|
7541909390
|
added merge migration
|
2020-01-30 16:19:15 +03:00 |
|
Anatoly
|
13cc40c19c
|
added transfer for table - a la cartes
|
2020-01-30 16:17:30 +03:00 |
|
Kuroshini
|
973ad80073
|
filter partners and sponsors
|
2020-01-30 16:12:17 +03:00 |
|
Kuroshini
|
f8aab86f3c
|
fix serializer
|
2020-01-30 15:45:51 +03:00 |
|
Kuroshini
|
1e126d3b1f
|
migraion for partners
|
2020-01-30 15:44:33 +03:00 |
|
Kuroshini
|
632233d930
|
partners remastered (moved fields to binding table)
|
2020-01-30 15:43:25 +03:00 |
|
dormantman
|
f05fab8329
|
Reformat establishment back serializer
|
2020-01-30 15:07:46 +03:00 |
|
alex
|
ca29e9b02a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-30 14:42:37 +03:00 |
|
alex
|
ce919b54d0
|
user roles for csv
|
2020-01-30 14:42:27 +03:00 |
|
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 |
|
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 |
|
Anatoly
|
61d2f6ec46
|
added filter - establishment_id, refactored guide counters
|
2020-01-28 17:52:49 +03:00 |
|
Kuroshini
|
4604c81ede
|
change news states
|
2020-01-28 17:50:46 +03:00 |
|
Anton Gorbunov
|
a0aad97a4d
|
Merge branch 'feature/tune-comment-method' into 'develop'
fix route
See merge request gm/gm-backend!245
|
2020-01-28 13:57:07 +00:00 |
|
a.gorbunov
|
121b917096
|
fix route
|
2020-01-28 13:56:32 +00:00 |
|
Олег Хаятов
|
2b0663b702
|
Merge branch 'bug/establishment-fields' into 'develop'
Bug/establishment fields
See merge request gm/gm-backend!244
|
2020-01-28 13:35:15 +00:00 |
|
dormantman
|
191c168c99
|
Added migrations
|
2020-01-28 15:49:50 +03:00 |
|
dormantman
|
56b5af1291
|
Added district_name field
|
2020-01-28 15:49:00 +03:00 |
|
dormantman
|
d0e75ca07c
|
Added instagram/western_name fields
|
2020-01-28 15:46:23 +03:00 |
|
Олег Хаятов
|
d2926e487f
|
Merge branch 'feature/tune-comment-method' into 'develop'
tune get comments method
See merge request gm/gm-backend!243
|
2020-01-28 12:38:52 +00:00 |
|
a.gorbunov
|
a0a6e98fa6
|
resolve comments
|
2020-01-28 12:32:18 +00:00 |
|
a.gorbunov
|
028b8475b7
|
slug from content object
|
2020-01-28 12:16:18 +00:00 |
|
dormantman
|
3b7b778a8e
|
Change sending subscription searcher
|
2020-01-28 15:09:57 +03:00 |
|
a.gorbunov
|
8f752ae6a0
|
tune get comments method
|
2020-01-28 12:05:30 +00:00 |
|
Kuroshini
|
4c7088abbc
|
fix news again...
|
2020-01-28 14:58:41 +03:00 |
|
Kuroshini
|
baeb7e5b93
|
fix news update
|
2020-01-28 14:55:13 +03:00 |
|
Anatoly
|
236b532d98
|
refactored permission classes
|
2020-01-28 14:54:14 +03:00 |
|
Kuroshini
|
475de626ce
|
fix news update
|
2020-01-28 14:50:51 +03:00 |
|
dormantman
|
e89f04dee4
|
Added serializer parent region
|
2020-01-28 14:44:54 +03:00 |
|
alex
|
0dd86e53cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-28 14:37:04 +03:00 |
|
alex
|
193f1655e4
|
email cascade establishment
|
2020-01-28 14:36:54 +03:00 |
|
Kuroshini
|
cec7a58338
|
fix typo
|
2020-01-28 13:25:52 +03:00 |
|
alex
|
65a6feb4b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-28 12:49:53 +03:00 |
|
alex
|
a02a52f2b0
|
menu dishes gallery api
|
2020-01-28 12:49:45 +03:00 |
|
Kuroshini
|
029cd36b98
|
localized cities #7
|
2020-01-28 12:35:30 +03:00 |
|
alex
|
c0f3aca532
|
menu gallery
|
2020-01-28 12:16:56 +03:00 |
|
Kuroshini
|
781779d54a
|
localized cities #6
|
2020-01-27 23:30:17 +03:00 |
|
Kuroshini
|
5c75b0a3ac
|
localized cities #5
|
2020-01-27 23:24:01 +03:00 |
|
Kuroshini
|
faeec9b4f2
|
localized cities #4
|
2020-01-27 23:22:53 +03:00 |
|
Kuroshini
|
e1b2c74988
|
localized cities #3
|
2020-01-27 23:19:25 +03:00 |
|
Kuroshini
|
ff34d66854
|
localized cities #2
|
2020-01-27 23:15:48 +03:00 |
|
Kuroshini
|
468527bc0e
|
localized cities #1
|
2020-01-27 23:13:22 +03:00 |
|
Олег Хаятов
|
a8fc46ed60
|
Merge branch 'feature/employees-params' into 'develop'
Feature/employees params
See merge request gm/gm-backend!240
|
2020-01-27 19:25:47 +00:00 |
|
dormantman
|
bb38bb3393
|
Change api view method
|
2020-01-27 22:22:17 +03:00 |
|
Kuroshini
|
4b0ef25baf
|
roles for email changing #2
|
2020-01-27 21:53:18 +03:00 |
|
Kuroshini
|
4cfe613739
|
roles for email changing
|
2020-01-27 21:47:04 +03:00 |
|
dormantman
|
d51d304077
|
Refactor (structure)
|
2020-01-27 21:45:14 +03:00 |
|
Kuroshini
|
415c9b7851
|
fix
|
2020-01-27 21:18:48 +03:00 |
|
Kuroshini
|
1fc0627ca9
|
email superuser
|
2020-01-27 21:10:26 +03:00 |
|