Commit Graph

79 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
edaf9f8fdb add migrations 2019-11-06 12:22:16 +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
evgeniy-st
661f6fb395 Added fields to Establishment model: index_name, tranliterated_name 2019-11-06 11:25:38 +03:00
Виктор Гладких
6f4cd56fcd Add establishment employee 2019-11-05 17:28:13 +03:00
Виктор Гладких
ea1ddfa320 Add employee 2019-11-05 16:29:27 +03:00
Dmitriy Kuzmenko
db6c93a72f add trensfer menus 2019-11-04 00:41:34 +03:00
alex
b3bd2a7141 add_establishment_social command 2019-11-01 10:48:46 +03:00
evgeniy-st
972e456f20 recalculate toque_number for other countries 2019-10-31 19:21:06 +03:00
evgeniy-st
6d34e406db recalculate toque number 2019-10-31 19:09:57 +03:00
alex
7e503f617e merge migrations 2019-10-30 20:15:19 +03:00
alex
962d24f737 Merge branch 'migration_fix' into develop
# Conflicts:
#	apps/establishment/admin.py
#	apps/transfer/models.py
2019-10-30 20:04:02 +03:00
a.feteleu
d31bb9b495 merge migrations 2019-10-30 19:19:40 +03:00
Dmitriy Kuzmenko
638bafe4a6 Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
#	apps/establishment/admin.py
#	project/settings/base.py
2019-10-30 19:12:59 +03:00
evgeniy-st
00bcd6c205 added merge migrations 2019-10-30 11:59:19 +03:00
evgeniy-st
e371fdceea Merge branch 'develop' into migration_fix 2019-10-30 11:50:30 +03:00
alex
939d7f139f fix max max length error 2019-10-29 10:20:30 +03:00
alex
25a2edf17d establishment fin 2019-10-27 16:23:30 +03:00
Semyon Yekhmenin
e1e0f1e997 Added index_name in employee position 2019-10-25 13:41:53 +00:00
Виктор Гладких
2cf0a94ccb Fix migr 2019-10-24 16:14:18 +03:00
Kuroshini
07ac06f405 Update migration 2019-10-23 17:29:00 +03:00
Kuroshini
711d536c98 Update migration 2019-10-23 17:29:00 +03:00
Kuroshini
ce5987de95 Attach establishment timestamps as command 2019-10-23 17:29:00 +03:00
Kuroshini
d5609e4cb8 Works now filter first part 2019-10-23 17:29:00 +03:00
Anatoly
bd3a809d85 fix migrations 2019-10-23 16:48:45 +03:00
evgeniy-st
9c9c49d900 update slug fields 2019-10-23 12:25:50 +03:00
evgeniy-st
d1c9e649b7 Remove metadatacontent 2019-10-22 17:05:54 +03:00
evgeniy-st
4ceb0e4d86 fix establishment migration 2019-10-21 20:22:47 +03:00
Anatoly
7be7315cef added filters and endpoint to get winery list 2019-10-18 18:00:57 +03:00
evgeniy-st
9661de4810 Establishment types 2019-10-17 15:17:29 +03:00
evgeniy-st
60cdec99e0 refactor tags 2019-10-15 17:17:03 +03:00
Anatoly
cb762ce746 added param to attr for Establoishment model and small refactoring, boost queries 2019-10-11 18:26:13 +03:00
Anatoly
ddb3eec679 finished endpoint to get tags by establishment type and subtype 2019-10-11 15:41:31 +03:00
Anatoly
f83b735eb3 changed files 2019-10-10 15:10:43 +03:00
Anatoly
74fa1fc014 Merge branch 'develop' into feature/gm-192 2019-10-09 16:21:50 +03:00
Anatoly
ca5f588466 fix elastic document, fix prefetch and select related 2019-10-09 12:53:35 +03:00
Anatoly
d321866dc2 gm-192: in progress 2019-10-08 15:38:35 +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
Kuroshini
d224c77a01 Fix issues with test && recreate migrations 2019-09-24 12:06:11 +03:00
Kuroshini
73a858cc8c Slugs feature migrations 2019-09-24 10:38:04 +03:00
Kuroshini
1ce71fdcdc slugs for news & establishments 2019-09-24 10:38:04 +03:00
evgeniy-st
83fddd63c3 fix migration establishment 2019-09-23 16:41:20 +03:00
Anatoly
202aabf15e GM-124: added establishment migration 2019-09-23 12:40:27 +03:00
Anatoly
5f3947601a rename url path collection to collections, delete property in M2M field 2019-09-20 15:11:33 +03:00
Anatoly
2089ca067a chane FK to URLField in Collection model, added properties to field collections in Establishment model 2019-09-20 14:22:39 +03:00
Anatoly
413c93bead fixed problem with image, refactored favorites, collection 2019-09-20 13:35:59 +03:00
Dmitriy Kuzmenko
b23a79775d add merge for migrations 2019-09-19 17:57:30 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00