dormantman
|
d5fea50108
|
Added locales
|
2020-01-21 14:49:42 +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 |
|
Олег Хаятов
|
306b189725
|
Merge branch 'bugs/optimize-translation-request' into 'develop'
Bugs/optimize translation request
See merge request gm/gm-backend!221
|
2020-01-18 13:49:26 +00: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
|
d8a3e744e1
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-01-17 18:15:32 +03:00 |
|
Dmitry Kuzmenko
|
f400ceed81
|
add filter backend for user
|
2020-01-17 18:15:21 +03:00 |
|
Kuroshini
|
76612238cd
|
updated transfer strategy
|
2020-01-17 18:11:56 +03:00 |
|