d.kuzmenko
|
35f0d966ea
|
Merge branch 'feature/changed-email-notification' into 'develop'
Feature/changed email notification
See merge request gm/gm-backend!103
|
2019-11-06 07:49:32 +00:00 |
|
Виктор Гладких
|
3e3d7a21db
|
Add award types
|
2019-11-06 10:23:31 +03:00 |
|
Kuroshini
|
19c7ce4c51
|
Send confirmation to new email #3
|
2019-11-05 21:49:57 +03:00 |
|
Kuroshini
|
3fc14ac0d6
|
New email templates #2
|
2019-11-05 21:39:17 +03:00 |
|
Kuroshini
|
70f86c792b
|
New email templates
|
2019-11-05 21:33:38 +03:00 |
|
Kuroshini
|
effacc2192
|
News email pictures
|
2019-11-05 20:29:15 +03:00 |
|
Kuroshini
|
88fa3421de
|
Fix news email template
|
2019-11-05 19:22:31 +03:00 |
|
Kuroshini
|
be48bff5ae
|
Send confirmation to new email
|
2019-11-05 18:56:11 +03:00 |
|
Anatoly
|
87dacfec7f
|
refactored product app, see changes
|
2019-11-05 18:04:34 +03:00 |
|
alex
|
d853960d2e
|
create, delete, get favorite news
|
2019-11-05 17:52:36 +03:00 |
|
Виктор Гладких
|
545e9a249b
|
Fix help
|
2019-11-05 17:32:18 +03:00 |
|
Виктор Гладких
|
6f4cd56fcd
|
Add establishment employee
|
2019-11-05 17:28:13 +03:00 |
|
d.kuzmenko
|
28471686be
|
Merge branch 'feature/fix-open-noon-afternoon' into 'develop'
Feature/fix open noon afternoon
See merge request gm/gm-backend!101
|
2019-11-05 14:26:24 +00:00 |
|
d.kuzmenko
|
19fb746356
|
Merge branch 'feature/remove-presentation-crunches' into 'develop'
Remove all crunches from projects
See merge request gm/gm-backend!100
|
2019-11-05 14:21:16 +00:00 |
|
Kuroshini
|
a60fb84bcb
|
Use not only closed_at / opening_at
|
2019-11-05 17:07:48 +03:00 |
|
evgeniy-st
|
273478a7cb
|
add address to establishmentRUDSerializer
|
2019-11-05 16:57:07 +03:00 |
|
Виктор Гладких
|
22982f3332
|
Add employee fix
|
2019-11-05 16:33:38 +03:00 |
|
Виктор Гладких
|
ea1ddfa320
|
Add employee
|
2019-11-05 16:29:27 +03:00 |
|
evgeniy-st
|
568ec84da0
|
Added filter class to EstalibshmentListCreateView
|
2019-11-05 16:20:24 +03:00 |
|
evgeniy-st
|
83bab7f383
|
remove hardcoded news
|
2019-11-05 15:59:28 +03:00 |
|
Виктор Гладких
|
e7143f73c3
|
Add positions
|
2019-11-05 14:59:32 +03:00 |
|
Anatoly
|
d46ba31654
|
Merge branch 'develop' into features/migrate-wine
# Conflicts:
# apps/product/models.py
# apps/transfer/management/commands/transfer.py
# apps/transfer/models.py
|
2019-11-05 14:56:26 +03:00 |
|
evgeniy-st
|
346f126dbb
|
Added news filter (by country).
|
2019-11-05 14:48:25 +03:00 |
|
michail
|
06f5a551b8
|
additions for migration of comments
|
2019-11-05 16:45:43 +05:00 |
|
Kuroshini
|
f52847a71a
|
Remove all crunches from projects
|
2019-11-05 14:29:53 +03:00 |
|
Dmitriy Kuzmenko
|
c5e96a7ad8
|
fix retrieve
|
2019-11-04 20:33:35 +03:00 |
|
Dmitriy Kuzmenko
|
210e4d39f1
|
disabled debug
|
2019-11-04 18:58:21 +03:00 |
|
Dmitriy Kuzmenko
|
f9a1747143
|
change version kombu
|
2019-11-04 18:38:56 +03:00 |
|
Kuroshini
|
9d087b53ee
|
Hardcode for presentation
|
2019-11-04 18:18:46 +03:00 |
|
Dmitriy Kuzmenko
|
f1d22c2392
|
redis for prod
|
2019-11-04 17:32:22 +03:00 |
|
Dmitriy Kuzmenko
|
fd926ee486
|
old id for prod
|
2019-11-04 17:15:33 +03:00 |
|
Dmitriy Kuzmenko
|
24305b53c2
|
Merge branch 'amazon' into develop
|
2019-11-04 17:12:30 +03:00 |
|
Kuroshini
|
fcef8b3e2b
|
New hardcoded old ids
|
2019-11-04 17:09:19 +03:00 |
|
Dmitriy Kuzmenko
|
6422fc09f9
|
elc
|
2019-11-04 16:20:10 +03:00 |
|
Kuroshini
|
28c46a593a
|
Revert "Production settings"
This reverts commit d493c5f
|
2019-11-04 16:19:08 +03:00 |
|
Dmitriy Kuzmenko
|
2b3ded6858
|
fix carusel
|
2019-11-04 16:15:29 +03:00 |
|
Kuroshini
|
d493c5f14c
|
Production settings
|
2019-11-04 16:13:47 +03:00 |
|
Dmitriy Kuzmenko
|
a1206e555e
|
Merge branch 'develop' into amazon
|
2019-11-04 15:38:45 +03:00 |
|
d.kuzmenko
|
6c0327f1a2
|
Merge branch 'hotfix/news-ids' into 'develop'
Use old ids for demonstration
See merge request gm/gm-backend!99
|
2019-11-04 12:38:17 +00:00 |
|
Kuroshini
|
4dd06f772f
|
Use old ids for demonstration
|
2019-11-04 15:30:59 +03:00 |
|
d.kuzmenko
|
6f0122fe35
|
Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Remove doubles
See merge request gm/gm-backend!98
|
2019-11-04 11:37:17 +00:00 |
|
Kuroshini
|
cf1bb0a88c
|
Remove doubles
|
2019-11-04 14:30:03 +03:00 |
|
Dmitriy Kuzmenko
|
b92703224d
|
Merge branch 'develop' into amazon
|
2019-11-04 14:12:21 +03:00 |
|
d.kuzmenko
|
7c905b2125
|
Merge branch 'feature/chosen-tags-hardcode' into 'develop'
hardcoded new tags
See merge request gm/gm-backend!97
|
2019-11-04 11:07:36 +00:00 |
|
Kuroshini
|
f554b13083
|
hardcoded new tags
|
2019-11-04 14:00:30 +03:00 |
|
Dmitriy Kuzmenko
|
c79ec925ad
|
disable sql
|
2019-11-04 13:47:54 +03:00 |
|
Dmitriy Kuzmenko
|
4405f317e8
|
release 1
|
2019-11-04 13:08:22 +03:00 |
|
d.kuzmenko
|
3abb74d19e
|
Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Temp crunch for chosen tags
See merge request gm/gm-backend!96
|
2019-11-04 08:58:41 +00:00 |
|
Dmitriy Kuzmenko
|
55c24c400b
|
change news tag command
|
2019-11-04 11:49:57 +03:00 |
|
Dmitriy Kuzmenko
|
623a90e6a7
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-04 11:35:25 +03:00 |
|