Commit Graph

2876 Commits

Author SHA1 Message Date
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
dormantman
095e482358 Optimize method 2020-01-27 20:59:19 +03:00
dormantman
e94787716e Change labels 2020-01-27 20:33:51 +03:00
dormantman
b687eb6024 Change format method 2020-01-27 20:29:54 +03:00
Kuroshini
e60f4b817b API method for possible news states 2020-01-27 20:04:36 +03:00
Ruslan Stepanov
1d534fe1a8 Merge branch 'develop' into 'feature/employees-params'
# Conflicts:
#   apps/establishment/serializers/back.py
#   apps/establishment/views/back.py
2020-01-27 17:04:15 +00:00
dormantman
f45eae56e9 Added new features 2020-01-27 20:03:42 +03:00
dormantman
3796a698d2 Added employee-establishment-positions method 2020-01-27 20:01:44 +03:00
Kuroshini
42d21a79a4 fix typo again =\ 2020-01-27 19:46:17 +03:00
Kuroshini
9b6c70cf74 fix typo 2020-01-27 19:45:04 +03:00
Kuroshini
b9ee22c4a5 filter by states news 2020-01-27 19:44:07 +03:00
Kuroshini
7a66559307 remove obviously unnecessary field 2020-01-27 19:38:47 +03:00
Kuroshini
205e2fa996 optimize collections 2020-01-27 19:19:54 +03:00
Kuroshini
8a1651bf1f fix permission 2020-01-27 18:45:50 +03:00
Kuroshini
f5da5f71a3 base related qs for cities 2020-01-27 18:45:23 +03:00
Kuroshini
b6bfc51aad fix issue w/ news update 2020-01-27 18:30:32 +03:00
Олег Хаятов
f3cea9987e Merge branch 'feature/subscriptions' into 'develop'
Feature/subscriptions

See merge request gm/gm-backend!242
2020-01-27 15:24:43 +00:00
Kuroshini
a8630661d8 fix state 2020-01-27 17:30:09 +03:00
Kuroshini
bf60479c66 user short name serializer added username 2020-01-27 15:38:06 +03:00
Kuroshini
21006e77cb user id in self info 2020-01-27 15:16:29 +03:00
Kuroshini
8be85707c7 fix published news 2020-01-27 14:15:10 +03:00
Anatoly
e1c1662819 refactored filters for partner view 2020-01-27 13:19:53 +03:00
Kuroshini
b1817061db try to fix subscriptions #4 2020-01-27 12:53:37 +03:00
Kuroshini
7386887f49 state fields for BO 2020-01-27 11:24:59 +03:00
Anatoly
bcecb39ee2 disable checking on email field in UserDetailSerializer 2020-01-27 11:11:24 +03:00
Anton Gorbunov
d49b00e008 Merge branch 'feature/optimize-back-collection' into 'develop'
select related before load

See merge request gm/gm-backend!241
2020-01-27 06:42:26 +00:00
a.gorbunov
1d3cf9dac0 select related before load 2020-01-27 06:41:52 +00:00
dormantman
d2f04d4958 Reformat method structure 2020-01-25 00:42:00 +03:00
dormantman
dd49ee7b6c Reformat restaurant to name 2020-01-24 22:37:06 +03:00
dormantman
809b5ccab7 Fixed employee establishments method 2020-01-24 22:33:39 +03:00
Kuroshini
2e4daaf9a1 try to fix subscriptions #3 2020-01-24 19:02:22 +03:00
Kuroshini
03946d0626 try to fix subscriptions #2 2020-01-24 18:52:36 +03:00
Kuroshini
e998865de5 try to fix subscriptions 2020-01-24 18:49:08 +03:00
dormantman
8acb86a5ab Added history to subscriptions 2020-01-24 18:25:17 +03:00
Anatoly
0ad1408f18 added account removal action 2020-01-24 18:13:01 +03:00
Kuroshini
0f73cf9477 fix news agenda 2020-01-24 18:08:51 +03:00
Kuroshini
c82362b268 should_read same country 2020-01-24 17:54:37 +03:00
dormantman
5a1d33c981 Remove save 2020-01-24 17:52:47 +03:00
Anatoly
36c4641ed0 fix plates transfer 2020-01-24 17:49:42 +03:00