Commit Graph

2527 Commits

Author SHA1 Message Date
Anatoly
86257153ac refactored guide ad label photos 2019-12-13 12:21:31 +03:00
littlewolf
eb514c0ce2 Add clean db setup 2019-12-13 12:16:02 +03:00
Dmitriy Kuzmenko
8aa2cb71f3 fix migrations 2019-12-13 12:08:24 +03:00
Dmitriy Kuzmenko
4c872b936b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/account/urls/back.py
#	apps/account/views/back.py
#	apps/transfer/models.py
2019-12-13 11:17:12 +03:00
Dmitriy Kuzmenko
f6427e732a Merge remote-tracking branch 'origin/develop' into owner_list
# Conflicts:
#	apps/transfer/models.py
2019-12-13 11:08:18 +03:00
Dmitriy Kuzmenko
bd6f8a47a1 add api for establishment admin 2019-12-13 11:02:37 +03:00
littlewolf
6ef0e7adfe Merge branch 'develop' into feature/fix-country-region-city-transfer 2019-12-13 09:18:44 +03:00
dormantman
5c171c644c Added mixins 2019-12-13 03:52:52 +03:00
dormantman
450ca4cf52 Added new field rank to collection 2019-12-13 03:50:12 +03:00
Kuroshini
0193ca90e3 dynamic filters 2019-12-12 22:07:07 +03:00
Kuroshini
38f2211982 sum fixes for mobile filters 2019-12-12 19:05:47 +03:00
Kuroshini
16def7df5d search crunches for mobiles 2019-12-12 18:22:52 +03:00
Anatoly
e2ec179f69 refactored the mechanism for finding similar establishments 2019-12-12 18:10:20 +03:00
Anatoly
8ca8c73b4b fix get_ruby_data 2019-12-12 17:15:08 +03:00
Kuroshini
b58d54c07e smallfix 2019-12-12 17:06:37 +03:00
alex
731b45ff53 Merge remote-tracking branch 'origin/develop' into develop 2019-12-12 16:58:29 +03:00
alex
f565285abd back menu filter by establishment 2019-12-12 16:58:13 +03:00
Kuroshini
fcf3999d3d news duplication date 2019-12-12 16:51:55 +03:00
Kuroshini
bd3dd47742 slugs news 2019-12-12 16:27:40 +03:00
Kuroshini
22408bf21f Merge branch 'feature/news-doubles' into develop 2019-12-12 16:10:02 +03:00
Kuroshini
755f007d25 clone news API method 2019-12-12 16:09:43 +03:00
Dmitriy Kuzmenko
826abd9142 Merge branch 'sql_panel' into develop 2019-12-12 15:39:12 +03:00
Dmitriy Kuzmenko
b03cd4fe09 add transfer command, models and crud api. 2019-12-12 15:37:42 +03:00
alex
3e83bdff59 pagination & ordering & country code 2019-12-12 15:34:36 +03:00
Anatoly
5fe8273379 fix incorrect removal of uniqueness constraint code field 2019-12-12 12:48:20 +03:00
Anatoly
ea2eb666d4 fix incorrect removal of uniqueness constraint code field 2019-12-12 12:40:07 +03:00
Anatoly
28bf782731 update method to remove city duplicates 2019-12-12 11:17:59 +03:00
Anatoly
3dfd674aa4 Merge branch 'develop' into feature/fix-country-region-city-transfer 2019-12-12 10:51:03 +03:00
alex
e3d41ecd8d Merge remote-tracking branch 'origin/develop' into es_product 2019-12-12 09:35:28 +03:00
Kuroshini
9d2b7ff77c add migration 2019-12-11 19:18:04 +03:00
Kuroshini
60f6c8d811 fix migrations 2019-12-11 19:15:19 +03:00
Kuroshini
370f9cc7ce remove wrong migration 2019-12-11 18:26:29 +03:00
Kuroshini
56501d76f2 order images 2019-12-11 18:20:53 +03:00
Dmitriy Kuzmenko
86b2e708f0 add datamigrate and change for models 2019-12-11 18:12:26 +03:00
Dmitriy Kuzmenko
d2f011417a add datamigrate and change for models 2019-12-11 18:11:39 +03:00
dormantman
e0a66f300b Hide unnecessary fields 2019-12-11 18:07:04 +03:00
dormantman
a6b77e74b5 Remove unnecessary slash 2019-12-11 17:59:42 +03:00
dormantman
6cbfc38c9c Added back collections method for collection detail 2019-12-11 17:58:39 +03:00
Kuroshini
90f75c6da5 update news gallery 2019-12-11 17:54:53 +03:00
alex
bbb72dabbe Merge remote-tracking branch 'origin/develop' into es_product 2019-12-11 17:10:56 +03:00
Kuroshini
f182ec4981 remove wrong unique constraint 2019-12-11 17:07:29 +03:00
Kuroshini
df00ceaa02 Merge branch 'feature/reformat-filter-requests' into develop 2019-12-11 16:47:15 +03:00
dormantman
0b1b960108 Remove excess output 2019-12-11 16:27:52 +03:00
dormantman
9f27b0c5d9 Added different types 2019-12-11 16:27:18 +03:00
dormantman
d8e3ad0bb5 Added works_at_weekday 2019-12-11 16:26:43 +03:00
dormantman
f0709fa409 Fixed tag filter type 2019-12-11 16:22:30 +03:00
d.kuzmenko
b68e98e9aa Merge branch 'feature/add-accounts-csv' into 'develop'
Feature/add accounts csv

See merge request gm/gm-backend!177
2019-12-11 13:19:50 +00:00
d.kuzmenko
f55983a46f Merge branch 'feature/add-city-search' into 'develop'
Add endpoint to get all cities with search string

See merge request gm/gm-backend!174
2019-12-11 13:18:58 +00:00
Kuroshini
39c8f6d152 remove carousel hardcode 2019-12-11 15:47:08 +03:00
Kuroshini
165509bc64 update news_gallery model 2019-12-11 15:13:06 +03:00