Commit Graph

192 Commits

Author SHA1 Message Date
Виктор Гладких
5ad3776fe3 establishment manager 2019-10-16 12:14:13 +03:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +03:00
Anatoly
0b9fd8b1dc Merge branch 'bugfix/gm-205' into develop 2019-10-11 13:20:45 +03:00
Anatoly
a25d846028 fixed bug with duplicated records in similar establishments 2019-10-10 21:02:56 +03:00
evgeniy-st
2aa51b93d3 hide es search 2019-10-10 14:43:24 +03:00
Kuroshini
74460b3060 Fix imports issue 2019-10-10 14:43:24 +03:00
evgeniy-st
bb41f00451 hide es search 2019-10-10 14:42:42 +03:00
Kuroshini
bd7ba611fc Fix imports issue 2019-10-10 14:28:42 +03:00
e.stoyushko
1969af044c Merge branch 'feature/booking' into 'develop'
Feature/booking

See merge request gm/gm-backend!6
2019-10-09 12:00:32 +00:00
evgeniy-st
729a77866d update elasticsearch index 2019-10-03 17:19:30 +03:00
Kuroshini
0408d93599 Squashed migrations && added lastable credentials 2019-10-03 13:41:45 +03:00
Kuroshini
393aa9ef28 Merge migrations after rebase 2019-10-01 18:30:49 +03:00
Kuroshini
4c960c8abf Booking (squashed commit) 2019-10-01 18:25:57 +03:00
evgeniy-st
e42f4d061c refactor address 2019-10-01 18:07:04 +03:00
evgeniy-st
f034377405 fix establishment serializer 2019-10-01 15:11:14 +03:00
evgeniy-st
051957c7cf Refactor JSON Validation 2019-10-01 13:03:59 +03:00
e.stoyushko
1798978cf7 Merge branch 'feature/establishment-award' into 'develop'
Feature/establishment award

See merge request gm/gm-backend!40
2019-09-30 13:53:59 +00:00
Kuroshini
33478580aa Review fixes 2019-09-30 16:40:46 +03:00
Kuroshini
019ac97d19 Add vintage year to detail 2019-09-30 13:50:17 +03:00
d.kuzmenko
8745c57f84 Merge branch 'bugfix/bunch-of-fixes' into 'develop'
Bugfix/bunch of fixes

See merge request gm/gm-backend!38
2019-09-30 07:57:12 +00:00
Kuroshini
d42bf43d19 Latest award for carousel 2019-09-27 22:56:44 +03:00
Kuroshini
9aafe0d69d new establishment attribute 2019-09-27 22:27:25 +03:00
Kuroshini
051ddb617d fix conflicts after rebase 2019-09-27 22:27:25 +03:00
Kuroshini
98b0a9af5d latest award && test fix 2019-09-27 22:27:25 +03:00
Kuroshini
4388fb7346 latest award for establishment 2019-09-27 22:27:25 +03:00
Kuroshini
4d113a6916 Fix all test 2019-09-27 22:06:46 +03:00
Kuroshini
d71ed0c1de Fix lot/lat x/y mapping && address serialization 2019-09-27 19:44:00 +03:00
evgeniy-st
993e58d215 fix views after merge 2019-09-27 11:20:43 +03:00
evgeniy-st
403a60623a Merge branch 'develop' into feature/refactor-establishments 2019-09-27 10:05:15 +03:00
Anatoly
f1eec96ce8 Merge branch 'develop' into feature/gm-127
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/urls/common.py
2019-09-26 14:29:39 +03:00
Anatoly
c4d8b89a8d gm-127: finished 2019-09-26 14:19:01 +03:00
Anatoly
0e0d6e318e GM-127: finished 2019-09-26 14:12:49 +03:00
Виктор Гладких
40d9f2f2ed check 2019-09-26 11:45:26 +03:00
Виктор Гладких
86d754f4bb validate json translated field 2019-09-26 11:38:37 +03:00
d.kuzmenko
e0f71d2646 Merge branch 'feature/add-base-attributes-autouse' into 'develop'
Feature/add base attributes autouse

See merge request gm/gm-backend!24
2019-09-26 08:34:38 +00:00
d.kuzmenko
0e4b714d2f Merge branch 'feature/update-establishment-slug-urls' into 'develop'
Feature/update establishment slug urls

See merge request gm/gm-backend!29
2019-09-26 08:32:27 +00:00
d.kuzmenko
218787bec1 Merge branch 'hotfix/favorites-create' into 'develop'
Fix favorites creation by slug

See merge request gm/gm-backend!27
2019-09-26 08:31:52 +00:00
littlewolf
3279fce339 Update tests 2019-09-26 11:19:06 +03:00
littlewolf
877d3d9e6a Fix test
Add todo to fix error
2019-09-25 19:44:33 +03:00
Anatoly
207e35feb1 GM-127: in progress 2019-09-25 19:39:37 +03:00
littlewolf
cabee12fab Add comment tests
Add favorite tests
2019-09-25 18:58:52 +03:00
littlewolf
07a0f8e295 Temp commit 2019-09-25 17:34:11 +03:00
evgeniy-st
f18c18110c Refactor some establishment serializer 2019-09-25 15:32:45 +03:00
Kuroshini
f38924db42 Fix favorites creation by slug 2019-09-25 14:09:24 +03:00
littlewolf
a2ade761b4 Update web urls 2019-09-25 14:04:52 +03:00
Anatoly
8766388256 fixed similar establishments 2019-09-25 13:16:02 +03:00
Anatoly
90c9e321f7 fixed similar establishments 2019-09-25 13:05:07 +03:00
Anatoly
0e643a1dfa Merge branch 'develop' of /home/a.feteleu/projects/gm-backend with conflicts. 2019-09-25 12:23:25 +03:00
littlewolf
a55695b120 Switch to decorator
Add update test
2019-09-24 20:12:09 +03:00
Kuroshini
1534c9b09c Remove unique
(cherry picked from commit f793c20)
2019-09-24 14:51:51 +03:00