alex
|
e0cbf1115b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-07 15:03:07 +03:00 |
|
alex
|
955527a2c1
|
employee for admin
|
2020-02-07 15:02:58 +03:00 |
|
Олег Хаятов
|
6868f75dc8
|
Merge branch 'feature/fields_for_establishment' into 'develop'
Feature/fields for establishment
See merge request gm/gm-backend!268
|
2020-02-07 11:50:42 +00:00 |
|
a.gorbunov
|
5023650e8b
|
migration for establishment
|
2020-02-07 11:43:50 +00:00 |
|
a.gorbunov
|
f854cd6ba5
|
last update by for establishment
|
2020-02-07 11:41:49 +00:00 |
|
Kuroshini
|
9084fbeab6
|
reviews or bo list
|
2020-02-07 14:25:57 +03:00 |
|
Kirill
|
f9187c5801
|
remove collection and guide tags from metadata
|
2020-02-07 14:24:34 +03:00 |
|
alex
|
e4547b9554
|
active to carousel serializer
|
2020-02-07 14:09:53 +03:00 |
|
alex
|
6feb67b0b5
|
GET carousel for BO
|
2020-02-07 13:43:20 +03:00 |
|
a.gorbunov
|
5b6db0f974
|
must of the week mark
|
2020-02-07 10:40:30 +00:00 |
|
a.gorbunov
|
0eb6a73e09
|
Carousel mixin
|
2020-02-07 10:25:52 +00:00 |
|
Anatoly
|
c866721c8d
|
added a documentation for awards types
|
2020-02-07 12:58:38 +03:00 |
|
Anatoly
|
26b7ef8ad6
|
added a documentation for awards
|
2020-02-07 12:33:15 +03:00 |
|
a.gorbunov
|
40c730bdd3
|
allow blank street_name
|
2020-02-07 09:31:40 +00:00 |
|
Александр Пархомин
|
4f5af57d02
|
add docstring for ProductBackOffice.
|
2020-02-07 12:14:36 +03:00 |
|
Александр Пархомин
|
023d304ea7
|
add docstring for ProductType.
|
2020-02-07 12:08:38 +03:00 |
|
Александр Пархомин
|
fb3fc25a3d
|
add docstring for Comment
|
2020-02-07 12:01:49 +03:00 |
|
Александр Пархомин
|
ea25ea7fbd
|
add docstring for social socialchoice
|
2020-02-07 11:41:51 +03:00 |
|
Александр Пархомин
|
e990810839
|
add docstring for phone
|
2020-02-07 11:34:47 +03:00 |
|
a.gorbunov
|
b6cf12f35c
|
save address cascade for establishment
|
2020-02-07 08:27:54 +00:00 |
|
Александр Пархомин
|
12b56da53a
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-07 11:09:30 +03:00 |
|
Александр Пархомин
|
60fd0d3aa4
|
add docstring for email
|
2020-02-07 11:09:01 +03:00 |
|
a.gorbunov
|
8483a56ea7
|
fix country_name for mobile
|
2020-02-07 07:53:29 +00:00 |
|
Anatoly
|
14da53ed94
|
refactored permission a little
|
2020-02-07 09:44:11 +03:00 |
|
Kuroshini
|
4388253bf9
|
media update route
|
2020-02-07 00:41:07 +03:00 |
|
Kuroshini
|
258e13c808
|
establishment type as enum
|
2020-02-06 22:55:41 +03:00 |
|
Kuroshini
|
53bfa878ba
|
establishment gallery
|
2020-02-06 22:47:57 +03:00 |
|
Kuroshini
|
2c3beb78d8
|
remove wrong unique constraint
|
2020-02-06 21:50:27 +03:00 |
|
Kuroshini
|
93da9370bc
|
extend establishments gallery
|
2020-02-06 20:55:57 +03:00 |
|
Александр Пархомин
|
d6bd20ac09
|
add docstring for Back office
|
2020-02-06 18:18:39 +03:00 |
|
Александр Пархомин
|
32439c9db6
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-06 18:06:46 +03:00 |
|
Александр Пархомин
|
7dec8048e1
|
add docstring for establishment schedule
|
2020-02-06 18:05:29 +03:00 |
|
Олег Хаятов
|
e656316cda
|
Merge branch 'feature/save-address-cascade' into 'develop'
cascade save address
See merge request gm/gm-backend!265
|
2020-02-06 14:55:44 +00:00 |
|
Anatoly
|
e0ef77a392
|
refactored role choices
|
2020-02-06 17:49:07 +03:00 |
|
Александр Пархомин
|
bb040fffdf
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-06 17:45:25 +03:00 |
|
Александр Пархомин
|
f6d41f878f
|
add docstring for establishment type
|
2020-02-06 17:45:01 +03:00 |
|
a.gorbunov
|
2235198198
|
cascade save address
|
2020-02-06 14:19:17 +00:00 |
|
Anatoly
|
a9f3d3de46
|
added report template and enabled send an report emails
|
2020-02-06 17:16:37 +03:00 |
|
Kuroshini
|
c8d2884a48
|
filter employees by country for BO
|
2020-02-06 15:17:21 +03:00 |
|
Anatoly
|
0104400dbd
|
added documentation for employees
|
2020-02-06 14:54:29 +03:00 |
|
Anatoly
|
cd766e6bbf
|
added documentation for /api/back/establishments/<id>/employees/
|
2020-02-06 13:12:10 +03:00 |
|
Олег Хаятов
|
2ffe4bc3ea
|
Merge branch 'bug-establishment_tag_filtration' into 'develop'
bug-establishment_tag_filtration
See merge request gm/gm-backend!264
|
2020-02-06 09:07:34 +00:00 |
|
Kirill
|
89f2c3bf1d
|
remove shop category tags from serialization
|
2020-02-06 11:22:14 +03:00 |
|
Anatoly
|
8993ec1097
|
added documentation for /api/back/establishments/employees/<id>/
|
2020-02-06 11:19:41 +03:00 |
|
Kuroshini
|
d234214467
|
more detailed address information
|
2020-02-05 18:46:17 +03:00 |
|
Александр Пархомин
|
8aa7f89fe2
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-05 18:42:54 +03:00 |
|
Александр Пархомин
|
f87278a4dc
|
add docstring for establishment subtype by id
|
2020-02-05 18:42:42 +03:00 |
|
Kuroshini
|
9a493545d8
|
types
|
2020-02-05 18:39:22 +03:00 |
|
Александр Пархомин
|
b679fdab56
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-05 18:37:38 +03:00 |
|
Александр Пархомин
|
58c4ab8788
|
add docstring for establishment subtype
|
2020-02-05 18:37:22 +03:00 |
|
Anatoly
|
a54bc86d20
|
added documentation for /api/back/establishments/employees/ (GET, POST)
|
2020-02-05 18:28:08 +03:00 |
|
Александр Пархомин
|
2151c36d92
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-05 18:25:10 +03:00 |
|
Александр Пархомин
|
06a215060f
|
add docstring for establishment from carousel
|
2020-02-05 18:24:54 +03:00 |
|
Kuroshini
|
0ab947f5bb
|
establishment address for BO list
|
2020-02-05 18:00:11 +03:00 |
|
Anatoly
|
061c96d198
|
refactored a little, added Gin indexes to account.User model.
|
2020-02-05 17:59:06 +03:00 |
|
Kuroshini
|
285f52ce30
|
establishment back list add toque number and public_mark
|
2020-02-05 17:46:14 +03:00 |
|
alex
|
590292919b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-05 17:32:45 +03:00 |
|
alex
|
10b9c36edb
|
fix unconfirmed_email
|
2020-02-05 17:31:13 +03:00 |
|
Александр Пархомин
|
b859792b8c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-02-05 17:05:24 +03:00 |
|
Александр Пархомин
|
20096fee8d
|
add docstring for establishment by slug
|
2020-02-05 17:05:00 +03:00 |
|
Anatoly
|
16ed67f9b1
|
refactored doc-string
|
2020-02-05 16:58:41 +03:00 |
|
Anatoly
|
8eb07205e1
|
added report app
|
2020-02-05 16:46:30 +03:00 |
|
Kuroshini
|
ab3666b03d
|
fix news states
|
2020-02-05 16:29:13 +03:00 |
|
Kuroshini
|
ce9aa30074
|
change news states
|
2020-02-05 16:12:28 +03:00 |
|
a.gorbunov
|
bf3a88fe57
|
cleanup code
|
2020-02-05 12:50:42 +00:00 |
|
a.gorbunov
|
786dbfc739
|
check by content_type
|
2020-02-05 12:47:23 +00:00 |
|
Anton Gorbunov
|
b778661564
|
Merge branch 'develop' into 'feature/bind-award-for-establishment'
# Conflicts:
# apps/establishment/views/back.py
|
2020-02-05 12:44:28 +00:00 |
|
a.gorbunov
|
a3a66a88e6
|
allow bind or remove award for establishment
|
2020-02-05 12:31:02 +00:00 |
|
Kuroshini
|
96a88e2478
|
notification messages fix
|
2020-02-05 15:06:44 +03:00 |
|
Kuroshini
|
6d556665e0
|
apply user role
|
2020-02-05 14:23:37 +03:00 |
|
Kuroshini
|
c9cf2672b6
|
establishment team role revoked email
|
2020-02-05 14:18:46 +03:00 |
|
Anatoly
|
6d9852fc7b
|
added guide type filter to guide list view
|
2020-02-05 14:16:36 +03:00 |
|
Anatoly
|
34adf748ed
|
fix location integration with ruby script
|
2020-02-05 13:58:48 +03:00 |
|
Kuroshini
|
8e22119de9
|
team
|
2020-02-05 13:32:50 +03:00 |
|
Anatoly
|
b421b934c1
|
refactored guides
|
2020-02-05 12:16:07 +03:00 |
|
Kuroshini
|
ec1caeced3
|
invite existing user email
|
2020-02-04 22:02:40 +03:00 |
|
Kuroshini
|
1c5976896b
|
fix hardcode
|
2020-02-04 21:32:39 +03:00 |
|
Kuroshini
|
fd4b6a68b1
|
email on new user
|
2020-02-04 21:30:19 +03:00 |
|
Kuroshini
|
d2440f5bf1
|
clean unaccepted invites task
|
2020-02-04 20:26:39 +03:00 |
|
Kuroshini
|
eb8ee67f06
|
dismiss from team members method
|
2020-02-04 19:40:30 +03:00 |
|
Kuroshini
|
a302e1181c
|
team members list
|
2020-02-04 18:47:28 +03:00 |
|
Anatoly
|
68ceb44acf
|
fix guide
|
2020-02-04 18:42:03 +03:00 |
|
Kuroshini
|
49d6a983d9
|
new user for team w/ confirmed email
|
2020-02-04 18:26:00 +03:00 |
|
Kuroshini
|
fc0cf3e25b
|
invite team member route
|
2020-02-04 18:22:03 +03:00 |
|
Kuroshini
|
2db59131a8
|
migration for team
|
2020-02-04 18:20:23 +03:00 |
|
Anatoly
|
c68d6ec148
|
fix extend guide method
|
2020-02-04 18:10:48 +03:00 |
|
alex
|
e7759ada27
|
AwardType List filters
|
2020-02-04 17:40:07 +03:00 |
|
alex
|
6a0943b0de
|
years field in award type serializer
|
2020-02-04 17:22:37 +03:00 |
|
alex
|
0c87e3cd25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-04 17:19:18 +03:00 |
|
alex
|
8f899905ec
|
years for award types
|
2020-02-04 17:19:09 +03:00 |
|
Anatoly
|
37eef69ee2
|
fix view
|
2020-02-04 17:16:31 +03:00 |
|
Anatoly
|
b7a84a147c
|
small fix
|
2020-02-04 17:11:06 +03:00 |
|
Anatoly
|
1c6ec90fbf
|
added an endpoint that return an array of country calling codes /api/back/location/countries/calling-codes/
|
2020-02-04 17:02:02 +03:00 |
|
Kuroshini
|
28d4122840
|
establishment statuses method
|
2020-02-04 16:23:03 +03:00 |
|
a.gorbunov
|
b74590ce75
|
remove allow null for available_for_events
|
2020-02-04 13:12:51 +00:00 |
|
a.gorbunov
|
ee8dc65f0b
|
available_for_events allow null
|
2020-02-04 13:08:19 +00:00 |
|
Kuroshini
|
e633b4f5f5
|
subtypes to establishments list
|
2020-02-04 16:05:31 +03:00 |
|
alex
|
5687eff646
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-02-04 16:01:40 +03:00 |
|
alex
|
9177d41309
|
refactor location transfer
|
2020-02-04 16:01:31 +03:00 |
|
Олег Хаятов
|
6bf5b2a75b
|
Merge branch 'bug-published_comments_not_displayed_v2' into 'develop'
filtration only in moderation v2
See merge request gm/gm-backend!261
|
2020-02-04 12:53:50 +00:00 |
|