Anatoly
|
c67109d9f8
|
Merge branch 'develop' into features/migrate-wine
# Conflicts:
# apps/transfer/management/commands/transfer.py
# apps/transfer/models.py
# project/settings/base.py
|
2019-11-11 11:35:03 +03:00 |
|
Anatoly
|
8a49a5ee72
|
added gallery to model product
|
2019-11-10 16:08:27 +03:00 |
|
Виктор Гладких
|
1c8737a798
|
Merge branch 'develop' into feature/account_migrate
|
2019-11-07 17:05:06 +03:00 |
|
evgeniy-st
|
4573233e45
|
fix
|
2019-11-07 17:04:26 +03:00 |
|
evgeniy-st
|
497451cb3e
|
Added tags to Establishment back-office serializers
|
2019-11-07 17:01:27 +03:00 |
|
Виктор Гладких
|
ba6d18d202
|
Fix account migration
|
2019-11-07 17:01:26 +03:00 |
|
Semyon Yekhmenin
|
d717b09153
|
Fixed nearest establishments search
|
2019-11-06 11:35:43 +00:00 |
|
alex
|
a372d29677
|
refactor comment migration
|
2019-11-06 14:24:14 +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 |
|
evgeniy-st
|
661f6fb395
|
Added fields to Establishment model: index_name, tranliterated_name
|
2019-11-06 11:25:38 +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 |
|
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 |
|
Виктор Гладких
|
e7143f73c3
|
Add positions
|
2019-11-05 14:59:32 +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 |
|
alex
|
8eee337d34
|
fix last published establishment description
|
2019-11-03 19:12:47 +03:00 |
|
Dmitriy Kuzmenko
|
a30f863155
|
fix currency
|
2019-11-03 17:39:10 +03:00 |
|
Dmitriy Kuzmenko
|
924b4e68e9
|
fix currency
|
2019-11-03 17:13:27 +03:00 |
|
Dmitriy Kuzmenko
|
c47f659657
|
add fix currency
|
2019-11-03 15:34:53 +03:00 |
|
Dmitriy Kuzmenko
|
b88c0d5213
|
modify script add_currency
|
2019-11-03 15:24:03 +03:00 |
|
Dmitriy Kuzmenko
|
1856589427
|
disabled inline in est, and change currency creator
|
2019-11-03 14:55:08 +03:00 |
|
Dmitriy Kuzmenko
|
398a982c82
|
add fix currency
|
2019-11-03 14:09:07 +03:00 |
|
Dmitriy Kuzmenko
|
1ac3cf95ca
|
add currency
|
2019-11-03 14:03:47 +03:00 |
|
Dmitriy Kuzmenko
|
c69ef65d79
|
add filter for description
|
2019-11-03 00:36:19 +03:00 |
|
Dmitriy Kuzmenko
|
22b4b94f1b
|
add filter for description
|
2019-11-03 00:11:08 +03:00 |
|
alex
|
9da10acd8e
|
fix none value establishment description
|
2019-11-02 22:52:20 +03:00 |
|
alex
|
cc2c475b4e
|
add_establishment_description with elastic error
|
2019-11-02 22:45:57 +03:00 |
|
GladkihViktor
|
9acf2f5c5f
|
Code style
|
2019-11-02 17:58:00 +03:00 |
|
GladkihViktor
|
56b3d0dcc2
|
Update transportation
|
2019-11-02 17:54:24 +03:00 |
|
GladkihViktor
|
ea830379fc
|
Fix image url
|
2019-11-02 14:31:12 +03:00 |
|
Dmitriy Kuzmenko
|
1747f6e95c
|
fix filter old_estab
|
2019-11-02 10:24:24 +03:00 |
|
Dmitriy Kuzmenko
|
20b9b9affd
|
fix filter old_estab
|
2019-11-02 10:11:47 +03:00 |
|
Dmitriy Kuzmenko
|
4059446a3c
|
add filter by exist Establishments
|
2019-11-02 10:04:32 +03:00 |
|
Dmitriy Kuzmenko
|
4108de5931
|
add filter for transfer establishment by fr
|
2019-11-02 09:17:18 +03:00 |
|
Anatoly
|
4e76fc966e
|
added fix link for establishment preview_image
|
2019-11-01 18:43:48 +03:00 |
|
Anatoly
|
fdd5c0bace
|
added fix link for establishment preview_image, run - ./manage.py transfer --fix_establishment_preview_image
|
2019-11-01 18:10:53 +03:00 |
|
alex
|
84cefefa0b
|
fix add_establishment_description
|
2019-11-01 14:14:16 +03:00 |
|
evgeniy-st
|
0e04b9d044
|
update toque calculating
|
2019-11-01 12:57:57 +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
|
55e68ec336
|
fix establishment mark
|
2019-10-31 17:19:07 +03:00 |
|
e.stoyushko
|
6c8deb5f80
|
Merge branch 'feature/geo-subtypes' into 'develop'
Geo subtypes
See merge request gm/gm-backend!86
|
2019-10-31 11:52:10 +00:00 |
|
alex
|
0d399cc44e
|
add_establishment_mark command
|
2019-10-31 12:29:40 +03:00 |
|
alex
|
7be3c2b93f
|
add_establishment_description command
|
2019-10-31 12:02:52 +03:00 |
|
alex
|
fea93f50f7
|
fix image_url for establishment
|
2019-10-31 09:40:50 +03:00 |
|
littlewolf
|
11a1928346
|
Add MultipkleObjects exception
|
2019-10-31 08:49:17 +03:00 |
|
littlewolf
|
f259319ade
|
Fix exception
|
2019-10-31 08:42:52 +03:00 |
|
littlewolf
|
08ca1dc356
|
Move addresses to new key
|
2019-10-31 07:47:45 +03:00 |
|
littlewolf
|
c08e202f64
|
Fix db
|
2019-10-31 07:46:29 +03:00 |
|
littlewolf
|
d654b093ef
|
Fix
|
2019-10-31 07:44:53 +03:00 |
|
littlewolf
|
8f18320171
|
Merge branch 'develop' into origin/feature/migrate-etablishment
# Conflicts:
# apps/establishment/transfer_data.py
# apps/transfer/management/commands/transfer.py
|
2019-10-31 07:44:07 +03:00 |
|
littlewolf
|
b146e6cd24
|
Add establishment address transfer
|
2019-10-31 07:00:44 +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 |
|
alex
|
4343060c74
|
Merge branch 'migration_fix' into HEAD
|
2019-10-30 15:49:32 +03:00 |
|
Kuroshini
|
d4792cb342
|
Geo subtypes
|
2019-10-30 14:34:07 +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 |
|
e.stoyushko
|
c9edaaa654
|
Merge branch 'feature/geo-type-index-name' into 'develop'
Feature/geo type index name
See merge request gm/gm-backend!84
|
2019-10-30 07:31:50 +00:00 |
|
alex
|
e524483ed0
|
fix ass_publish_data
|
2019-10-30 08:03:30 +03:00 |
|
alex
|
a0c52d8ef9
|
Merge remote-tracking branch 'origin/origin/migration_fix' into migration_fix
|
2019-10-29 21:57:07 +03:00 |
|
Dmitriy Kuzmenko
|
a3bf921771
|
fix timezone
|
2019-10-29 21:54:59 +03:00 |
|
alex
|
0a7a5e57f4
|
Merge remote-tracking branch 'origin/migration_fix' into migration_fix
|
2019-10-29 21:54:14 +03:00 |
|
alex
|
55bdc7771f
|
add image to establishment
|
2019-10-29 21:54:03 +03:00 |
|
Kuroshini
|
a0aa503cfa
|
Add index_name type field to geo
|
2019-10-29 20:56:41 +03:00 |
|
Anatoly
|
5675f23fae
|
fixed BaseModelAdminMixin
|
2019-10-29 18:12:52 +03:00 |
|
Anatoly
|
5984fdc7cd
|
fixed BaseModelAdminMixin
|
2019-10-29 17:57:11 +03:00 |
|
Anatoly
|
71f2f8a574
|
small fix for establishment model admin
|
2019-10-29 17:44:03 +03:00 |
|
alex
|
b41ec3eebd
|
add is_publish
|
2019-10-29 17:16:51 +03:00 |
|
Anatoly
|
03c75efece
|
gm-259, gm-260, gm-261
|
2019-10-29 17:16:39 +03:00 |
|
Dmitriy Kuzmenko
|
e270131679
|
Merge branch 'develop' into origin/migration_fix
|
2019-10-29 15:27:40 +03:00 |
|
Dmitriy Kuzmenko
|
8fd14f2f44
|
Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/migration_fix
|
2019-10-29 15:27:19 +03:00 |
|
Dmitriy Kuzmenko
|
03bf648ef9
|
add change admin for establishments
|
2019-10-29 15:08:54 +03:00 |
|
Dmitriy Kuzmenko
|
30ba313f54
|
add filter accounts for existing users
|
2019-10-29 14:47:57 +03:00 |
|
Dmitriy Kuzmenko
|
631ffd265a
|
add mixin for admin panel
|
2019-10-29 14:46:44 +03:00 |
|
Anatoly
|
8cf2cebe85
|
added BaseModelAdminMixin
|
2019-10-29 14:01:27 +03:00 |
|
alex
|
dc11fb055f
|
fix news and paris establishments
|
2019-10-29 12:34:08 +03:00 |
|
alex
|
b84eb68dd9
|
Merge branch 'feature/migrate-menu' into origin/feature/migration
|
2019-10-29 12:18:18 +03:00 |
|
alex
|
939d7f139f
|
fix max max length error
|
2019-10-29 10:20:30 +03:00 |
|
alex
|
4e868c2d8d
|
transfer dishes
|
2019-10-29 08:25:03 +03:00 |
|
alex
|
4e0f3c9a4d
|
with address
|
2019-10-28 10:59:28 +03:00 |
|
alex
|
281d57996e
|
fix null timezone
|
2019-10-28 09:24:56 +03:00 |
|
alex
|
3b68a4dc19
|
establishment fin fix 1
|
2019-10-27 16:47:08 +03:00 |
|
alex
|
25a2edf17d
|
establishment fin
|
2019-10-27 16:23:30 +03:00 |
|
alex
|
490fae3c00
|
Merge branch 'origin/feature/migration' into origin/feature/migrate-etablishment
# Conflicts:
# apps/transfer/management/commands/transfer.py
|
2019-10-26 20:47:49 +03:00 |
|
Anatoly
|
37d745eeaa
|
added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype
|
2019-10-26 18:54:22 +03:00 |
|
Semyon Yekhmenin
|
e1e0f1e997
|
Added index_name in employee position
|
2019-10-25 13:41:53 +00:00 |
|
Kuroshini
|
4eaa600fc1
|
Fix all tests
|
2019-10-25 14:13:54 +03:00 |
|
Kuroshini
|
dd0b595132
|
Review fixes
|
2019-10-25 14:13:19 +03:00 |
|
Kuroshini
|
7f23f0e891
|
Establishment each hour reindexing
|
2019-10-25 14:13:19 +03:00 |
|
alex
|
09647fa4d3
|
start transfer_data
|
2019-10-25 12:03:43 +03:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +03:00 |
|
alex
|
cd294961e0
|
Merge remote-tracking branch 'origin/develop' into feature/migration
|
2019-10-25 10:00:25 +03:00 |
|
Dmitriy Kuzmenko
|
66ddfb455b
|
fix tests
|
2019-10-24 22:19:59 +03:00 |
|
alex
|
287578eb9e
|
base models and funcs
|
2019-10-24 17:08:00 +03:00 |
|
d.kuzmenko
|
f484219ec7
|
Merge branch 'feature/develop_ci' into 'develop'
Feature/develop ci
See merge request gm/gm-backend!70
|
2019-10-24 13:23:00 +00:00 |
|
evgeniy-st
|
8a8986246f
|
Merge branch 'bugfix/kuroshini' into develop
|
2019-10-24 16:19:10 +03:00 |
|
evgeniy-st
|
128488b5ee
|
some bugfixes
|
2019-10-24 16:17:37 +03:00 |
|
Виктор Гладких
|
2cf0a94ccb
|
Fix migr
|
2019-10-24 16:14:18 +03:00 |
|
Semyon Yekhmenin
|
74b2b52ee1
|
Added currency to establishment model
|
2019-10-24 11:06:58 +00:00 |
|
alex
|
0adac058c5
|
Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news
# Conflicts:
# apps/gallery/models.py
# requirements/base.txt
|
2019-10-24 13:11:05 +03:00 |
|
alex
|
647147bf03
|
Merge branch 'develop' into feature/migrate-news
|
2019-10-24 12:28:51 +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 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
Semyon Yekhmenin
|
538ae41d85
|
Establishments/slug/<slug> fix
|
2019-10-23 10:06:39 +00:00 |
|
evgeniy-st
|
9c9c49d900
|
update slug fields
|
2019-10-23 12:25:50 +03:00 |
|
littlewolf
|
f09bd5996a
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# project/settings/base.py
# requirements/base.txt
|
2019-10-23 09:27:42 +03:00 |
|
evgeniy-st
|
0c8959f4e7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-22 17:11:22 +03:00 |
|
evgeniy-st
|
d1c9e649b7
|
Remove metadatacontent
|
2019-10-22 17:05:54 +03:00 |
|
Anatoly
|
071b634659
|
fixed EstablishmentFilter
|
2019-10-22 15:58:00 +03:00 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
evgeniy-st
|
4ceb0e4d86
|
fix establishment migration
|
2019-10-21 20:22:47 +03:00 |
|
Виктор Гладких
|
87708df084
|
Fix test establishment
|
2019-10-21 16:11:28 +03:00 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +03:00 |
|
evgeniy-st
|
2dbe65a169
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-21 10:31:06 +03:00 |
|
Anatoly
|
7be7315cef
|
added filters and endpoint to get winery list
|
2019-10-18 18:00:57 +03:00 |
|
Виктор Гладких
|
2e2ed19118
|
Fix establishment tests
|
2019-10-18 12:14:10 +03:00 |
|
Kuroshini
|
b77c654c6c
|
Open now filter
|
2019-10-18 02:38:59 +03:00 |
|
evgeniy-st
|
9661de4810
|
Establishment types
|
2019-10-17 15:17:29 +03:00 |
|
Kuroshini
|
6a85e52abc
|
Rename variable
|
2019-10-17 12:30:40 +03:00 |
|
Kuroshini
|
ed03f0f40f
|
Search establishment by working time
|
2019-10-16 19:05:16 +03:00 |
|
Виктор Гладких
|
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 |
|
evgeniy-st
|
c268575a04
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:33:44 +03:00 |
|
evgeniy-st
|
9d4c483f51
|
clean models (tags)
|
2019-10-15 18:25:09 +03:00 |
|
evgeniy-st
|
92529f4c5b
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 17:17:35 +03:00 |
|
evgeniy-st
|
60cdec99e0
|
refactor tags
|
2019-10-15 17:17:03 +03:00 |
|
Anatoly
|
449eae060d
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 12:52:38 +03:00 |
|
Anatoly
|
1764cfc08b
|
added urlpath to get establishment tags to all platform
|
2019-10-15 12:52:21 +03:00 |
|
Anatoly
|
2d830b2821
|
Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
|
2019-10-15 12:08:23 +03:00 |
|
michail
|
54cfccbcbe
|
the fix of types fields in all apps
|
2019-10-15 13:23:31 +05:00 |
|
michail
|
a223832241
|
Relational integers to ForeignKey
|
2019-10-14 15:48:26 +05:00 |
|
Anatoly
|
469f7bdf4c
|
added prefetch select related
|
2019-10-14 12:24:26 +03:00 |
|
Anatoly
|
9e237d4657
|
removed endpoint to display a list of tags by establishment id, added instead filter to filter tags by establishment id
|
2019-10-14 11:40:03 +03:00 |
|
Anatoly
|
47993a7155
|
added endpoint ot get list of tag categories with tags by establishment type
|
2019-10-14 10:22:17 +03:00 |
|
Anatoly
|
2d41b9142b
|
Merge remote-tracking branch 'origin/feature/gm-192' into feature/gm-192
|
2019-10-11 18:26:26 +03:00 |
|
Anatoly
|
cb762ce746
|
added param to attr for Establoishment model and small refactoring, boost queries
|
2019-10-11 18:26:13 +03:00 |
|
evgeniy-st
|
0d7104eace
|
Merge branch 'develop' into feature/gm-192
|
2019-10-11 16:44:54 +03:00 |
|
Anatoly
|
ddb3eec679
|
finished endpoint to get tags by establishment type and subtype
|
2019-10-11 15:41:31 +03:00 |
|
Anatoly
|
bdb9348916
|
Merge branch 'bugfix/gm-205' into feature/gm-148
# Conflicts:
# apps/establishment/models.py
|
2019-10-11 13:31:33 +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 |
|
Anatoly
|
f83b735eb3
|
changed files
|
2019-10-10 15:10:43 +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 |
|
littlewolf
|
0e474a16ea
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-10 09:04:01 +03:00 |
|
Anatoly
|
74fa1fc014
|
Merge branch 'develop' into feature/gm-192
|
2019-10-09 16:21:50 +03:00 |
|
michail
|
4cc9fabd73
|
edited transfer.py for notification, account, establishment
|
2019-10-09 17:43:48 +05:00 |
|
evgeniy-st
|
095b4a4bd7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:11:26 +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 |
|
Anatoly
|
2191a505a5
|
refactored EstablishmentBase serializer
|
2019-10-09 14:11:53 +03:00 |
|
Anatoly
|
ca5f588466
|
fix elastic document, fix prefetch and select related
|
2019-10-09 12:53:35 +03:00 |
|
littlewolf
|
22d2396c6b
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# docker-compose.yml
# project/settings/base.py
|
2019-10-09 07:54:15 +03:00 |
|
Anatoly
|
d321866dc2
|
gm-192: in progress
|
2019-10-08 15:38:35 +03:00 |
|
Anatoly
|
8ac5a1970f
|
fixed carousel
|
2019-10-07 10:51:08 +03:00 |
|
michail
|
511312bb28
|
added transfer.py to partner
|
2019-10-04 16:20:04 +05:00 |
|
Anatoly
|
eaa1795f0c
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/authorization/tasks.py
|
2019-10-04 14:00:06 +03:00 |
|
michail
|
ad17a2ad7a
|
new relations template
|
2019-10-04 13:18:43 +05:00 |
|
evgeniy-st
|
729a77866d
|
update elasticsearch index
|
2019-10-03 17:19:30 +03:00 |
|
michail
|
018d9f6557
|
added establishment and collection transfer.py files
|
2019-10-03 17:54:26 +05:00 |
|
Kuroshini
|
0408d93599
|
Squashed migrations && added lastable credentials
|
2019-10-03 13:41:45 +03:00 |
|
Anatoly
|
b31e71d4ef
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/serializers.py
# project/settings/local.py
|
2019-10-02 10:20:14 +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 |
|
Anatoly
|
aeebdd02c6
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
|
2019-09-30 15:43:45 +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 |
|