Commit Graph

3178 Commits

Author SHA1 Message Date
Kuroshini
969fde01b3 amazon fix 2020-02-07 16:58:08 +03:00
Kuroshini
af6c2a735e amazon fix 2020-02-07 16:56:57 +03:00
Kuroshini
f30a893fae establishment vintage year and delete media 2020-02-07 16:41:27 +03:00
alex
d488b7b229 fix anonymous user 2020-02-07 16:28:11 +03:00
Anatoly
a6cfa2ec58 redefine EMAIL_TECHNICAL_SUPPORT variable in development use 2020-02-07 16:02:51 +03:00
Kuroshini
31a9470da3 allow any for establishment media 2020-02-07 15:52:02 +03:00
Anatoly
82e7262fdf modified documentation strings for creating establishment schedule 2020-02-07 15:28:59 +03:00
Олег Хаятов
6421efed62 Merge branch 'bug-tags_cleaning' into 'develop'
bug-tags_cleaning

See merge request gm/gm-backend!267
2020-02-07 12:10:38 +00:00
Kuroshini
b7e64a0b26 is main establishment gallery 2020-02-07 15:09:17 +03:00
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
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
Олег Хаятов
7646f7d809 Merge branch 'bug/country_name_mobile' into 'develop'
fix country_name for mobile

See merge request gm/gm-backend!266
2020-02-07 07:56:17 +00: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