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 |
|
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 |
|
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 |
|
Anatoly
|
38a6508396
|
modified role model
|
2020-01-24 18:04:32 +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 |
|
dormantman
|
62ab6248ba
|
Fix subscribes
|
2020-01-24 17:43:51 +03:00 |
|
Kuroshini
|
3254573897
|
country name translated for roles
|
2020-01-24 16:50:49 +03:00 |
|
alex
|
ec351bf12a
|
fix plate
|
2020-01-24 16:44:16 +03:00 |
|
Kuroshini
|
cd0317d94d
|
image for city is not longer required field
|
2020-01-24 15:48:02 +03:00 |
|
Kuroshini
|
5353c5a67c
|
fix award unbind
|
2020-01-24 15:46:07 +03:00 |
|
dormantman
|
25488ca2fb
|
Added new mobile route
|
2020-01-24 15:38:34 +03:00 |
|
dormantman
|
a82d6685a9
|
Fix news content-pages mixin
|
2020-01-24 15:08:42 +03:00 |
|
Ruslan Stepanov
|
a2f537a5ac
|
Update content-pages
|
2020-01-24 11:59:13 +00:00 |
|
alex
|
34055d3669
|
fix plate_set
|
2020-01-24 13:31:00 +03:00 |
|
Kuroshini
|
3f3848e317
|
fix crop
|
2020-01-24 13:23:54 +03:00 |
|
Kuroshini
|
28718d17d1
|
aspect for crop
|
2020-01-24 13:02:32 +03:00 |
|
alex
|
a195ed3a53
|
menu dishes rud
|
2020-01-24 10:35:55 +03:00 |
|
alex
|
22b1b3064d
|
is_drinks_included and last_update in serializer
|
2020-01-24 10:31:07 +03:00 |
|
alex
|
29a7fb82ce
|
dishes menu list-create
|
2020-01-24 10:21:35 +03:00 |
|
alex
|
792c11e128
|
transfer formulas menu
|
2020-01-24 09:20:22 +03:00 |
|
alex
|
9b6918b3b0
|
menu old_id for transfer
|
2020-01-24 08:59:11 +03:00 |
|
Kuroshini
|
0f053dff32
|
return employee after binding
|
2020-01-23 23:24:03 +03:00 |
|
Kuroshini
|
f52016bfee
|
create award for employee and bind
|
2020-01-23 22:56:01 +03:00 |
|
Олег Хаятов
|
e8c043d2ed
|
Merge branch 'feature/advertisement-br' into 'develop'
Added mobile method
See merge request gm/gm-backend!238
|
2020-01-23 18:13:35 +00:00 |
|
dormantman
|
7c404df718
|
Added mobile method
|
2020-01-23 21:08:09 +03:00 |
|
Kuroshini
|
34977db805
|
fix permission
|
2020-01-23 21:03:24 +03:00 |
|
Kuroshini
|
d8d9a97746
|
remove award from employee
|
2020-01-23 21:02:43 +03:00 |
|
a.gorbunov
|
1d8d18d4de
|
added order field
|
2020-01-23 17:54:18 +00:00 |
|
Kuroshini
|
f70a3abb8c
|
award types list view
|
2020-01-23 20:26:22 +03:00 |
|
Kuroshini
|
e0c2138ba7
|
fix crops
|
2020-01-23 19:33:02 +03:00 |
|
Kuroshini
|
4002e684d5
|
fix god damned content-pages
|
2020-01-23 18:34:52 +03:00 |
|
Kuroshini
|
dd1b241c41
|
verbose award_type for API
|
2020-01-23 18:26:09 +03:00 |
|
dormantman
|
3ebd859686
|
Fix content-pages
|
2020-01-23 18:14:26 +03:00 |
|
Kuroshini
|
591fdc9d6a
|
fix content-pages
|
2020-01-23 18:10:17 +03:00 |
|
Kuroshini
|
d27a47f905
|
Revert "Revert "Revert (nickname field) common.py""
This reverts commit f9c5bdc
|
2020-01-23 18:03:06 +03:00 |
|
Kuroshini
|
6d2aee572a
|
fix configs
|
2020-01-23 18:02:26 +03:00 |
|
Kuroshini
|
f9c5bdceee
|
Revert "Revert (nickname field) common.py"
This reverts commit 5560a01
|
2020-01-23 18:02:26 +03:00 |
|
Олег Хаятов
|
2d2442e8bd
|
Merge branch 'feature/content-pages' into 'develop'
Added 404 pages
See merge request gm/gm-backend!236
|
2020-01-23 14:59:51 +00:00 |
|
dormantman
|
f899de0369
|
Added check to news mixin
|
2020-01-23 17:59:18 +03:00 |
|
dormantman
|
79001be037
|
Added 404 pages
|
2020-01-23 17:53:13 +03:00 |
|
Олег Хаятов
|
976e35cbd9
|
Merge branch 'feature/content-pages' into 'develop'
Feature/content pages
See merge request gm/gm-backend!232
|
2020-01-23 14:50:38 +00:00 |
|
dormantman
|
d98a6aeb00
|
Change structure
|
2020-01-23 17:45:59 +03:00 |
|
dormantman
|
0c40ed06e1
|
Changed to text/html response
|
2020-01-23 17:38:55 +03:00 |
|
Anatoly
|
6b819e2ed4
|
modified search filter for backoffice account view
|
2020-01-23 17:32:31 +03:00 |
|
alex
|
7391463f5a
|
uploads model for menu
|
2020-01-23 14:47:55 +03:00 |
|
alex
|
874de420f6
|
drinks and schedule for menu
|
2020-01-23 14:17:29 +03:00 |
|
dormantman
|
18978355bc
|
Change method model
|
2020-01-23 13:56:17 +03:00 |
|
alex
|
684c3efcf8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-23 13:54:49 +03:00 |
|
alex
|
e5faa90c76
|
multiply filters for employee
|
2020-01-23 13:54:36 +03:00 |
|
Anatoly
|
587f6c0bad
|
fix role counter, added additional field role choice id
|
2020-01-23 13:29:09 +03:00 |
|
Kuroshini
|
a6f3384126
|
change employees search precision const
|
2020-01-23 11:26:08 +03:00 |
|
Ruslan Stepanov
|
5560a0149d
|
Revert (nickname field) common.py
|
2020-01-23 07:40:56 +00:00 |
|
Kuroshini
|
d81d2445f5
|
tune news search for BO
|
2020-01-22 21:47:21 +03:00 |
|
Kuroshini
|
1c01604f43
|
Revert "disable ES sync after news_type updating"
This reverts commit 6ba8fb3
|
2020-01-22 21:29:37 +03:00 |
|
Kuroshini
|
1cd0458acc
|
Revert "temp disable tags updating"
This reverts commit 8aefe9b
|
2020-01-22 21:29:34 +03:00 |
|
Kuroshini
|
8cc5355200
|
Revert "disable ES"
This reverts commit cc9c641
|
2020-01-22 21:29:32 +03:00 |
|
Kuroshini
|
4a1676abcd
|
Revert "disable es"
This reverts commit 503ce30
|
2020-01-22 21:29:28 +03:00 |
|
Kuroshini
|
503ce30350
|
disable es
|
2020-01-22 21:26:13 +03:00 |
|
Kuroshini
|
cc9c641df3
|
disable ES
|
2020-01-22 21:25:09 +03:00 |
|
Kuroshini
|
8aefe9b0e9
|
temp disable tags updating
|
2020-01-22 21:12:30 +03:00 |
|
Kuroshini
|
6ba8fb31cf
|
disable ES sync after news_type updating
|
2020-01-22 21:09:25 +03:00 |
|
Kuroshini
|
bdf5c77f03
|
post_save async
|
2020-01-22 20:54:52 +03:00 |
|
Kuroshini
|
e94dd03875
|
disable news_type update post save
|
2020-01-22 20:52:15 +03:00 |
|
Kuroshini
|
407f9026e0
|
crunch for news type
|
2020-01-22 20:50:55 +03:00 |
|
Kuroshini
|
dd588c039f
|
fix news ES indexing
|
2020-01-22 20:23:46 +03:00 |
|
Kuroshini
|
b7fa52a2ab
|
increase news shard number
|
2020-01-22 20:10:13 +03:00 |
|
Олег Хаятов
|
8083c83df1
|
Merge branch 'bug/sort-regions' into 'develop'
fix sort
See merge request gm/gm-backend!234
|
2020-01-22 16:57:21 +00:00 |
|
Олег Хаятов
|
f5e60f0609
|
Merge branch 'bug/establishment-country' into 'develop'
fix country_id
See merge request gm/gm-backend!233
|
2020-01-22 16:55:50 +00:00 |
|
Kuroshini
|
affb985b15
|
BO news via ES #5 (optimize)
|
2020-01-22 19:41:44 +03:00 |
|
Kuroshini
|
aab99af87f
|
BO news via ES #4
|
2020-01-22 19:24:26 +03:00 |
|
Kuroshini
|
65a6ac0dd0
|
BO new via ES #3
|
2020-01-22 19:06:09 +03:00 |
|
dormantman
|
8fb8c49bfe
|
Added employee positions method
|
2020-01-22 18:48:16 +03:00 |
|
Kuroshini
|
1907494f15
|
BO news via ES#2
|
2020-01-22 18:47:08 +03:00 |
|
Kuroshini
|
0552d919f1
|
BO news via ES #1
|
2020-01-22 18:43:58 +03:00 |
|
a.gorbunov
|
749775075c
|
fix sort
|
2020-01-22 14:57:37 +00:00 |
|
dormantman
|
c78c6a67b1
|
Fixed subscriptions unsubscribe
|
2020-01-22 17:15:49 +03:00 |
|
dormantman
|
07f4947cc0
|
Change mark value
|
2020-01-22 17:00:40 +03:00 |
|
a.gorbunov
|
24c352aeac
|
fix country_id
|
2020-01-22 13:53:28 +00:00 |
|
dormantman
|
3f44a76da9
|
Added retrieve id method
|
2020-01-22 16:32:51 +03:00 |
|
dormantman
|
40bfd479d2
|
Added access levels
|
2020-01-22 16:14:00 +03:00 |
|
dormantman
|
6a1fea76b6
|
Added content page method
|
2020-01-22 16:03:23 +03:00 |
|
Олег Хаятов
|
b12253fb6b
|
Merge branch 'feature/default-images' into 'develop'
Feature/default images
See merge request gm/gm-backend!231
|
2020-01-22 12:39:04 +00:00 |
|
a.gorbunov
|
1921efd2c5
|
get news type default image query will be optimized
|
2020-01-22 12:34:38 +00:00 |
|
Anatoly
|
b4fe5dd4b0
|
fix role tab
|
2020-01-22 15:21:46 +03:00 |
|
Kuroshini
|
5a9b45cd76
|
comments status field
|
2020-01-22 15:16:48 +03:00 |
|
Anatoly
|
b989762568
|
added endpoint to get role types, change endpoint URI ( from /account/role-tab/ to /account/role/tab/)
|
2020-01-22 14:50:10 +03:00 |
|
a.gorbunov
|
f194863862
|
[migration] default_image_url field for news types
|
2020-01-22 11:26:31 +00:00 |
|
a.gorbunov
|
1981b44a10
|
added get_instances_from_related method for product document
|
2020-01-22 11:23:28 +00:00 |
|
a.gorbunov
|
b9e6df5482
|
added default image for news types
|
2020-01-22 10:55:26 +00:00 |
|
Kuroshini
|
0023fcb47b
|
fix photos
|
2020-01-22 12:19:16 +03:00 |
|
Anatoly
|
4ff3af61b3
|
extend full-text search
|
2020-01-22 09:41:22 +03:00 |
|
Олег Хаятов
|
004e4bdf98
|
Merge branch 'feature/establishments-with-employees' into 'develop'
Added employee establishments method
See merge request gm/gm-backend!230
|
2020-01-21 16:29:39 +00:00 |
|
dormantman
|
0688c622cc
|
Fixed structure view
|
2020-01-21 19:28:29 +03:00 |
|
dormantman
|
88e488e481
|
Added employee establishments method
|
2020-01-21 19:19:38 +03:00 |
|
Kuroshini
|
6a36bb5a13
|
news trigram search
|
2020-01-21 18:58:26 +03:00 |
|
Олег Хаятов
|
de50d6491f
|
Merge branch 'bugs/comment-fields' into 'develop'
Added fields to comments
See merge request gm/gm-backend!229
|
2020-01-21 14:54:40 +00:00 |
|
dormantman
|
b72f5c383b
|
Added fields to comments
|
2020-01-21 17:40:34 +03:00 |
|
Anatoly
|
de78ee5d6e
|
added field phone to User model, change establishment transfer, added filters (full-text search, role_country_code, country_code), change account serializers
|
2020-01-21 17:36:31 +03:00 |
|
Kuroshini
|
6d627ac240
|
Revert "fix news ordering"
This reverts commit 1a6828b
|
2020-01-21 16:01:04 +03:00 |
|
Олег Хаятов
|
716c6b3af2
|
Merge branch 'feature/subscriptions' into 'develop'
Feature/subscriptions
See merge request gm/gm-backend!228
|
2020-01-21 12:50:08 +00:00 |
|
Kuroshini
|
1a6828b53e
|
fix news ordering
|
2020-01-21 15:48:37 +03:00 |
|
Kuroshini
|
5ef58b8202
|
news ordering
|
2020-01-21 15:15:32 +03:00 |
|
dormantman
|
8e6d433ffd
|
Added localization to subscribes
|
2020-01-21 14:39:49 +03:00 |
|
Kuroshini
|
d77bd1d79c
|
update default ads duration
|
2020-01-21 13:56:08 +03:00 |
|
Kuroshini
|
f3dca356ad
|
advertisement
|
2020-01-21 13:47:30 +03:00 |
|
dormantman
|
a8dd7f9347
|
Added valid link to unsubscribe
|
2020-01-21 13:07:56 +03:00 |
|
dormantman
|
36b9474e36
|
Fixed subscriptions
|
2020-01-21 12:56:54 +03:00 |
|
Kuroshini
|
8235c6d172
|
fix
|
2020-01-21 12:37:33 +03:00 |
|
Kuroshini
|
416af8d343
|
photo for employee
|
2020-01-21 12:33:15 +03:00 |
|
dormantman
|
66780ef093
|
Added subscriptions associate
|
2020-01-21 12:04:55 +03:00 |
|
alex
|
61c47e4c79
|
establishment employee position delete view
|
2020-01-21 08:17:03 +03:00 |
|
Kuroshini
|
e517d87d7e
|
fix cropper
|
2020-01-20 19:00:36 +03:00 |
|
Kuroshini
|
6ad1849835
|
fix cropper
|
2020-01-20 17:41:35 +03:00 |
|
Kuroshini
|
9975b5a8ab
|
fix crop
|
2020-01-20 17:09:38 +03:00 |
|
Kuroshini
|
66d79d061c
|
fix crop
|
2020-01-20 17:05:08 +03:00 |
|
Олег Хаятов
|
1c4060ac7b
|
Merge branch 'feature/subscriptions' into 'develop'
Fixed creating subscriber with signup
See merge request gm/gm-backend!227
|
2020-01-20 13:37:57 +00:00 |
|
dormantman
|
075ce887da
|
Added type to pop in tags
|
2020-01-20 16:27:11 +03:00 |
|
Ruslan Stepanov
|
27f47cfae6
|
Merge branch 'develop' into 'feature/subscriptions'
# Conflicts:
# apps/account/serializers/common.py
|
2020-01-20 13:24:46 +00:00 |
|
alex
|
a994e7214b
|
fix from_date and to_date for est_employee
|
2020-01-20 15:51:47 +03:00 |
|
Kuroshini
|
f026cfceba
|
fix rud for inactive news
|
2020-01-20 14:53:13 +03:00 |
|
alex
|
5f4852d11e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-20 14:20:54 +03:00 |
|
alex
|
beefc82d7b
|
toque number and employee for establishment
|
2020-01-20 14:20:46 +03:00 |
|
Kuroshini
|
9ce5f89d74
|
try to fix issue w/ news images optimization
|
2020-01-20 14:18:56 +03:00 |
|
Anton Gorbunov
|
92f349d8e7
|
Merge branch 'bug/optimize-collection-images' into 'develop'
Bug/optimize collection images
See merge request gm/gm-backend!226
|
2020-01-20 11:04:51 +00:00 |
|
a.gorbunov
|
c0b517e5fe
|
find image regexp
|
2020-01-20 11:04:02 +00:00 |
|
Anton Gorbunov
|
9debe8beef
|
Merge branch 'bug/optimize-collection-images' into 'develop'
fix regexp for find images
See merge request gm/gm-backend!225
|
2020-01-20 10:58:16 +00:00 |
|
a.gorbunov
|
a31763c550
|
fix regexp for find images
|
2020-01-20 10:58:00 +00:00 |
|
Kuroshini
|
a9c1e5b154
|
in favorites for news
|
2020-01-20 13:51:25 +03:00 |
|
Anton Gorbunov
|
1140937346
|
Merge branch 'bug/optimize-collection-images' into 'develop'
optimize news images
See merge request gm/gm-backend!224
|
2020-01-20 10:42:31 +00:00 |
|
a.gorbunov
|
df601e3234
|
optimize news images
|
2020-01-20 10:42:16 +00:00 |
|
Anton Gorbunov
|
914c8fc9f3
|
Merge branch 'bug/optimize-collection-images' into 'develop'
optimize news images
See merge request gm/gm-backend!223
|
2020-01-20 10:40:50 +00:00 |
|
a.gorbunov
|
20a96e1e51
|
optimize news images
|
2020-01-20 10:40:34 +00:00 |
|
Anton Gorbunov
|
dc8bc8a94e
|
Merge branch 'bug/optimize-collection-images' into 'develop'
optimize fix
See merge request gm/gm-backend!222
|
2020-01-20 10:25:51 +00:00 |
|
a.gorbunov
|
bb8accefbf
|
optimize fix
|
2020-01-20 10:25:09 +00:00 |
|
Kuroshini
|
5a662fd745
|
Image id on city creation
|
2020-01-20 13:18:49 +03:00 |
|
alex
|
1bc7a9f13b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-20 12:14:03 +03:00 |
|
alex
|
215e7b5f19
|
establishment employee list
|
2020-01-20 12:13:50 +03:00 |
|
Anatoly
|
452c6f22ae
|
fix role counter
|
2020-01-20 11:45:26 +03:00 |
|
Anatoly
|
765a66dc68
|
fix role counter
|
2020-01-20 11:43:35 +03:00 |
|
Anatoly
|
e6dfa6d74d
|
fix SiteAffilation roles transfer
|
2020-01-20 11:21:51 +03:00 |
|
dormantman
|
f9d4d4ff57
|
Revert "Added type for pop filter in tags"
This reverts commit be96a6c7
|
2020-01-18 01:05:44 +03:00 |
|
dormantman
|
51114b0e95
|
Added db index to siteinterfacedictionary text for optimize
|
2020-01-18 01:04:30 +03:00 |
|
dormantman
|
be96a6c7ba
|
Added type for pop filter in tags
|
2020-01-18 00:55:25 +03:00 |
|
Kuroshini
|
17d8db649b
|
middleware to log db queries #2
|
2020-01-17 20:23:49 +03:00 |
|
Kuroshini
|
918c1fa17d
|
middleware to log db queries
|
2020-01-17 20:21:59 +03:00 |
|
Kuroshini
|
249f6f709e
|
Revert "Added type for pop filter in tags"
This reverts commit 2b28a56
|
2020-01-17 19:13:29 +03:00 |
|
Kuroshini
|
a05db696b0
|
optimize db queries on /api/back/establishments/employees
|
2020-01-17 19:08:33 +03:00 |
|
Dmitry Kuzmenko
|
f400ceed81
|
add filter backend for user
|
2020-01-17 18:15:21 +03:00 |
|
Kuroshini
|
8544098f8c
|
fix command #2
|
2020-01-17 17:41:53 +03:00 |
|
Anatoly
|
a26109a8da
|
added endpoint /api/back/account/role-tab/
|
2020-01-17 17:40:21 +03:00 |
|
Kuroshini
|
0bb521b479
|
fix command
|
2020-01-17 17:35:50 +03:00 |
|
Kuroshini
|
9ef26594b6
|
code improvements
|
2020-01-17 17:33:13 +03:00 |
|
Ruslan Stepanov
|
281aca4fe5
|
Added establishment saving
|
2020-01-17 17:33:13 +03:00 |
|
dormantman
|
294c468405
|
Added live link part
|
2020-01-17 17:33:13 +03:00 |
|
dormantman
|
0a832136d3
|
Added update establishment image urls command
|
2020-01-17 17:33:13 +03:00 |
|
Ruslan Stepanov
|
2b28a562d2
|
Added type for pop filter in tags
|
2020-01-17 14:31:15 +00:00 |
|
Олег Хаятов
|
4ae40dc78d
|
Merge branch 'feature/preview-news' into 'develop'
Added new route preview/slug/<slug>/
See merge request gm/gm-backend!219
|
2020-01-17 14:24:50 +00:00 |
|
Олег Хаятов
|
15df8e405d
|
Merge branch 'feature/agenda-back-office' into 'develop'
Feature/agenda back office
See merge request gm/gm-backend!202
|
2020-01-17 14:23:44 +00:00 |
|
dormantman
|
33852a6551
|
Fixed creating subscriber with signup
|
2020-01-17 17:20:49 +03:00 |
|
Kuroshini
|
c3ed88339e
|
order BO user by date they joined
|
2020-01-17 17:07:23 +03:00 |
|
Олег Хаятов
|
df5888a048
|
Merge branch 'feature/subscriptions' into 'develop'
Fixed many subscribers
See merge request gm/gm-backend!220
|
2020-01-17 13:48:54 +00:00 |
|
dormantman
|
8843d5efed
|
Fixed many subscribers
|
2020-01-17 16:34:59 +03:00 |
|
Kuroshini
|
8b4a6b0b74
|
fix employees search
|
2020-01-17 16:13:33 +03:00 |
|
alex
|
a8ea238bfc
|
some optimize for employee list
|
2020-01-17 16:02:00 +03:00 |
|
Kuroshini
|
abfd4d7288
|
full-text search employees
|
2020-01-17 14:33:57 +03:00 |
|
Ruslan Stepanov
|
903bdbb39d
|
Merge branch 'develop' into 'feature/agenda-back-office'
# Conflicts:
# apps/news/serializers.py
|
2020-01-17 11:12:30 +00:00 |
|
alex
|
4a7eb22291
|
order by position for establishment employee
|
2020-01-17 14:02:46 +03:00 |
|
alex
|
a915cff73d
|
photo for employee
|
2020-01-17 13:56:58 +03:00 |
|
alex
|
0695cdce6b
|
available_for_events field for employee
|
2020-01-17 11:36:13 +03:00 |
|
Anatoly
|
754b6d5b4f
|
fix collection guides
|
2020-01-17 10:02:49 +03:00 |
|
alex
|
4880b2629d
|
select_related for establishment types serializers
|
2020-01-17 09:54:05 +03:00 |
|
alex
|
85e5537b82
|
prefetch_related for employee serializers
|
2020-01-17 09:43:13 +03:00 |
|
alex
|
f15a93f760
|
username, first_name, last_name filter for employee
|
2020-01-17 09:37:15 +03:00 |
|
alex
|
38485292f9
|
public_mark filter for actual employee
|
2020-01-17 09:21:51 +03:00 |
|
alex
|
988de09efe
|
toque_number filter for employee
|
2020-01-17 09:12:18 +03:00 |
|
dormantman
|
a0fdef69b6
|
Fixed conditions for news methods
|
2020-01-16 21:16:08 +03:00 |
|
dormantman
|
6c624115e6
|
Added agenda validate to update method
|
2020-01-16 20:36:19 +03:00 |
|
Kuroshini
|
ea485d9960
|
optimize images at least for establishments
|
2020-01-16 19:21:57 +03:00 |
|
Anatoly
|
391df439c6
|
fix reset password token generator
|
2020-01-16 18:05:09 +03:00 |
|
Kuroshini
|
881e4b11e2
|
last ip for comments backoffice
|
2020-01-16 17:59:25 +03:00 |
|
Kuroshini
|
3d09333d31
|
toques for employees in BO
|
2020-01-16 16:51:33 +03:00 |
|
Kuroshini
|
783e2e5931
|
cascade create agenda
|
2020-01-16 16:40:17 +03:00 |
|
alex
|
2aec0bdfb4
|
position filter for employee
|
2020-01-16 16:23:10 +03:00 |
|
Олег Хаятов
|
de55154d89
|
Merge branch 'feature/subscriptions' into 'develop'
Fix subscriber get
See merge request gm/gm-backend!217
|
2020-01-16 13:06:14 +00:00 |
|
dormantman
|
ad43e4a5f9
|
Added new route preview/slug/<slug>/
|
2020-01-16 15:47:01 +03:00 |
|
a.feteleu
|
14f19b2b4d
|
small fix
|
2020-01-16 15:30:37 +03:00 |
|
dormantman
|
0eba2a4405
|
Fix subscriber get
|
2020-01-16 15:27:38 +03:00 |
|
Олег Хаятов
|
e9f07a4aa0
|
Merge branch 'feature/subscriptions' into 'develop'
Added method subscribe with code
See merge request gm/gm-backend!204
|
2020-01-16 11:45:19 +00:00 |
|
Олег Хаятов
|
ffb11b8233
|
Merge branch 'feature/standart-weekdays' into 'develop'
Feature/standart weekdays
See merge request gm/gm-backend!210
|
2020-01-16 11:42:08 +00:00 |
|
Anatoly
|
017308da95
|
refactored news transfer
|
2020-01-16 14:20:07 +03:00 |
|
Kuroshini
|
127d15b181
|
try to fix performance issues
(cherry picked from commit 964ead1)
|
2020-01-16 12:14:04 +03:00 |
|