Commit Graph

1207 Commits

Author SHA1 Message Date
evgeniy-st
e21a8bb550 Added country serializer to AddressDetailSerializer 2019-11-06 16:02:12 +03:00
evgeniy-st
c17f9ce820 Remove name_translated from establishment. Added AddressDetailSerializer
to EstablishmentRUDView
2019-11-06 14:16:10 +03:00
Dmitriy Kuzmenko
edaf9f8fdb add migrations 2019-11-06 12:22:16 +03:00
d.kuzmenko
b5789a1a5e Merge branch 'feature/affilations/award_type' into 'develop'
Feature/affilations/award type

See merge request gm/gm-backend!104
2019-11-06 09:00:51 +00:00
Виктор Гладких
e04c621a3d Fix message 2019-11-06 11:50:42 +03:00
d.kuzmenko
8fca3916f9 Merge branch 'feature/affiliations' into 'develop'
Feature/affiliations

See merge request gm/gm-backend!102
2019-11-06 08:46:43 +00:00
Виктор Гладких
390ff974d7 Fix message 2019-11-06 11:41:19 +03:00
Виктор Гладких
0ab60c1852 Add awards 2019-11-06 11:40:07 +03:00
evgeniy-st
3299bf9891 updated establishment search fields 2019-11-06 11:32:55 +03:00
evgeniy-st
eb2b727d0d Merge branch 'develop' into feature/establishmen-index-name 2019-11-06 11:27:05 +03:00
evgeniy-st
661f6fb395 Added fields to Establishment model: index_name, tranliterated_name 2019-11-06 11:25:38 +03: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
be48bff5ae Send confirmation to new email 2019-11-05 18:56:11 +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
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
Kuroshini
9d087b53ee Hardcode for presentation 2019-11-04 18:18:46 +03:00
Dmitriy Kuzmenko
2b3ded6858 fix carusel 2019-11-04 16:15:29 +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
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
Dmitriy Kuzmenko
888e18b9b1 change news tag command 2019-11-04 11:35:13 +03:00
a.feteleu
9dc12b36bb added exception detail 2019-11-04 11:18:16 +03:00
Dmitriy Kuzmenko
b37b634f59 change news tag command 2019-11-04 11:09:15 +03:00
Dmitriy Kuzmenko
fb3e5e5c93 change add_tags 2019-11-04 10:53:16 +03:00
Dmitriy Kuzmenko
b3345d612a renge_menu and carte 2019-11-04 02:25:04 +03:00
Dmitriy Kuzmenko
3462c74a65 modify add_menus 2019-11-04 00:50:37 +03:00
Dmitriy Kuzmenko
db6c93a72f add trensfer menus 2019-11-04 00:41:34 +03:00
Kuroshini
b8fe50f806 Temp crunch for chosen tags 2019-11-03 22:45:44 +03:00
Dmitriy Kuzmenko
9d3e278763 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-03 20:33:58 +03:00
Dmitriy Kuzmenko
8e61071759 add news tag command 2019-11-03 20:33:45 +03:00