Kuroshini
|
2bceb0b309
|
Merge branch 'feature/news-subscription' into develop
|
2020-01-09 11:49:53 +03:00 |
|
Kuroshini
|
0f8cf72cd8
|
Merge branch 'feature/news-subscription' into develop
|
2020-01-09 11:49:24 +03:00 |
|
dormantman
|
140cc6cfa5
|
Reformat sending mail structure
|
2019-12-31 16:09:04 +03:00 |
|
alex
|
54c3e452e2
|
bo search news
|
2019-12-31 09:20:50 +03:00 |
|
dormantman
|
241012da42
|
Added prefetch optimize
|
2019-12-31 05:29:48 +03:00 |
|
dormantman
|
d4e993abee
|
Added country field
|
2019-12-31 05:13:36 +03:00 |
|
Kuroshini
|
7edd836a75
|
helping hand representation
|
2019-12-31 01:22:45 +03:00 |
|
Kuroshini
|
146f34cebe
|
Merge branch 'feature/news-subscription' into develop
# Conflicts:
# apps/notification/models.py
# apps/notification/serializers/common.py
|
2019-12-31 00:41:20 +03:00 |
|
Kuroshini
|
af8febbe45
|
subscription work out #2
|
2019-12-30 23:41:58 +03:00 |
|
Kuroshini
|
3a6476fb06
|
subscriptions work out
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
93aea70d29
|
Added saving date
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
797d3a3973
|
Optimize
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
e772663f44
|
Fix subsribtions
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
e33418dfe6
|
Fix unsubscribe
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
8567a818c7
|
Added corrections migrate
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
54d1b7742f
|
Reformat structure
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
8108471c8e
|
Added migrations
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
ec00b3a24f
|
Added correct creating subscribe
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
08f675cdbc
|
Added model Subscribe
|
2019-12-30 22:44:58 +03:00 |
|
dormantman
|
a8f053a646
|
Added last subscribe/unsubscribe dates
|
2019-12-30 22:44:58 +03:00 |
|
Kuroshini
|
fc215129ed
|
subscriptions work out
|
2019-12-30 22:26:18 +03:00 |
|
dormantman
|
974e0ce8fe
|
Added saving date
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
25e118cf0b
|
Optimize
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
13022ed476
|
Fix subsribtions
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
d9f1da1e49
|
Fix unsubscribe
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
a76efac4a8
|
Added corrections migrate
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
fe330e4270
|
Reformat structure
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
449e0675fa
|
Added migrations
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
7baf022a77
|
Added correct creating subscribe
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
eac841f41f
|
Added model Subscribe
|
2019-12-30 22:23:16 +03:00 |
|
dormantman
|
fb91383be5
|
Added last subscribe/unsubscribe dates
|
2019-12-30 22:23:16 +03:00 |
|
Anatoly
|
d3c723eb43
|
intermediate commit
|
2019-12-30 19:07:06 +03:00 |
|
Anatoly
|
e56f801e14
|
Merge branch 'develop' into feature/guides
|
2019-12-30 18:16:24 +03:00 |
|
Anatoly
|
1468e5cdde
|
intermediate commit
|
2019-12-30 18:15:55 +03:00 |
|
Kuroshini
|
ad21b6eb24
|
transfer tags with translations
|
2019-12-30 17:31:09 +03:00 |
|
alex
|
ca6a57f012
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-30 16:38:51 +03:00 |
|
alex
|
6b52feffd8
|
fix similar_artisans_producers
|
2019-12-30 16:38:42 +03:00 |
|
Dmitriy Kuzmenko
|
b27e032f15
|
change update index for Establishment
|
2019-12-30 16:36:00 +03:00 |
|
Anatoly
|
cb6834b3c0
|
Merge branch 'develop' into feature/guides
|
2019-12-30 13:23:28 +03:00 |
|
Anatoly
|
2827374911
|
intermediate commit
|
2019-12-30 13:22:57 +03:00 |
|
alex
|
318b1f1421
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-30 11:11:03 +03:00 |
|
alex
|
1ed0ebefe2
|
migrations for review
|
2019-12-30 11:10:55 +03:00 |
|
d.kuzmenko
|
700d8b5286
|
Merge branch 'feature/fix-location-sort' into 'develop'
Add order
See merge request gm/gm-backend!189
|
2019-12-30 07:45:00 +00:00 |
|
a.feteleu
|
8f2ae21aa0
|
fix swagger
|
2019-12-30 10:43:20 +03:00 |
|
Dmitriy Kuzmenko
|
e2d71fca8f
|
Merge branch 'develop' into feature/guides
|
2019-12-27 18:00:20 +03:00 |
|
Dmitriy Kuzmenko
|
ccd9f717df
|
Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
# apps/utils/export.py
|
2019-12-27 17:59:20 +03:00 |
|
Dmitriy Kuzmenko
|
d09776c8fa
|
add xml
|
2019-12-27 17:57:16 +03:00 |
|
Anatoly
|
151c017561
|
see changes
|
2019-12-27 17:49:56 +03:00 |
|
alex
|
dbdeef8642
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-27 17:39:57 +03:00 |
|
alex
|
c9d36ebd1a
|
fix product es
|
2019-12-27 17:39:47 +03:00 |
|