Олег Хаятов
|
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 |
|
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 |
|