Dmitriy Kuzmenko
|
a7dca6cd78
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/establishment/transfer_data.py
|
2019-11-11 15:32:42 +03:00 |
|
Dmitriy Kuzmenko
|
7617981259
|
change command for migration of users
|
2019-11-11 15:29:31 +03:00 |
|
Anatoly
|
df38afa36b
|
refactored a little model Product
|
2019-11-11 15:27:58 +03:00 |
|
alex
|
b0177dfe13
|
refactor inquiries
|
2019-11-11 14:45:33 +03:00 |
|
Anatoly
|
0610075706
|
fixed transfer product with sub type plates
|
2019-11-11 13:15:37 +03:00 |
|
Anatoly
|
3a1f57e195
|
refactored product admin page
|
2019-11-11 12:29:10 +03:00 |
|
Anatoly
|
358407e786
|
merged develop
|
2019-11-11 12:01:16 +03:00 |
|
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
|
13228ec85a
|
finalizing
|
2019-11-11 11:33:20 +03:00 |
|
alex
|
2512400885
|
fix serializer
|
2019-11-11 09:43:27 +03:00 |
|
alex
|
8fb6a61018
|
Merge remote-tracking branch 'origin/feature/migrate-inquiries' into feature/migrate-inquiries
|
2019-11-11 07:57:59 +03:00 |
|
Anatoly
|
8a49a5ee72
|
added gallery to model product
|
2019-11-10 16:08:27 +03:00 |
|
alex
|
d8995ab754
|
inquiries serializer
|
2019-11-10 10:14:16 +03:00 |
|
alex
|
5267e24f05
|
Merge remote-tracking branch 'origin/develop' into feature/migrate-inquiries
# Conflicts:
# requirements/development.txt
|
2019-11-10 09:07:51 +03:00 |
|
Anatoly
|
efb468f00d
|
added migrator, refactored migrators
|
2019-11-09 22:58:34 +03:00 |
|
Anatoly
|
0f2d1ca071
|
need checks
|
2019-11-08 19:46:16 +03:00 |
|
Dmitriy Kuzmenko
|
3d83c2a3aa
|
Merge branch 'feature/account_migrate' into develop
|
2019-11-08 17:04:11 +03:00 |
|
Виктор Гладких
|
b8d9a1344b
|
Add hash password
|
2019-11-08 16:31:43 +03:00 |
|
evgeniy-st
|
ad1ad95f2f
|
Merge branch 'feature/passwords' into develop
|
2019-11-08 16:13:10 +03:00 |
|
evgeniy-st
|
b02ccb3b08
|
Bcrypt support
|
2019-11-08 16:12:43 +03:00 |
|
alex
|
cdcdab8b26
|
Merge branch 'develop' into feature/migrate-inquiries
|
2019-11-08 14:53:40 +03:00 |
|
e.stoyushko
|
43956d4d49
|
Merge branch 'feature/back_region_list_without_pagination' into 'develop'
Removed pagination from back regions list view
See merge request gm/gm-backend!109
|
2019-11-08 10:54:50 +00:00 |
|
Semyon Yekhmenin
|
d9e14194c3
|
Removed pagination from back regions list view
|
2019-11-08 10:54:50 +00:00 |
|
alex
|
c7537079d4
|
mark to float
|
2019-11-08 12:28:18 +03:00 |
|
alex
|
79a65ab179
|
fix ads
|
2019-11-08 12:26:51 +03:00 |
|
Виктор Гладких
|
be0412ffae
|
Fix url
|
2019-11-08 11:42:40 +03:00 |
|
Виктор Гладких
|
251d29c461
|
Add image url
|
2019-11-08 11:29:45 +03:00 |
|
Anatoly
|
9bdeabe352
|
added tags
|
2019-11-07 19:03:12 +03:00 |
|
alex
|
117604f060
|
models
|
2019-11-07 18:35:01 +03:00 |
|
Kuroshini
|
bf301d21bb
|
Fix tests
|
2019-11-07 18:25:04 +03:00 |
|
Kuroshini
|
c1f89515c5
|
Nested sitefeatures for new design
|
2019-11-07 18:08:29 +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 |
|
Виктор Гладких
|
37ba1a1c39
|
Edit help message
|
2019-11-07 17:03:14 +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 |
|
d.kuzmenko
|
19d23668e1
|
Merge branch 'feature/region_name_resolving' into 'develop'
Feature/region name resolving
See merge request gm/gm-backend!55
|
2019-11-07 09:55:20 +00:00 |
|
Semyon Yekhmenin
|
475c29ee9e
|
Added function for getting subdivision by ISO 3166-1 alpha-2 country code and ISO 3166-2 subdivision code without country prefix
|
2019-11-07 09:55:20 +00:00 |
|
e.stoyushko
|
d8ccf0f567
|
Merge branch 'bugfix/fix-signup-validators' into 'develop'
Bugfix/fix signup validators
See merge request gm/gm-backend!107
|
2019-11-07 08:58:33 +00:00 |
|
Anatoly
|
0b4282bd2f
|
disable session authentication class
|
2019-11-07 10:55:46 +03:00 |
|
Anatoly
|
ba2b3303bb
|
delete unused attributes (social auth)
|
2019-11-07 10:17:36 +03:00 |
|
Kuroshini
|
952e259fa9
|
Fix validators #2
|
2019-11-06 19:51:53 +03:00 |
|
Anatoly
|
442e4fb2ce
|
refactored social auth
|
2019-11-06 18:50:42 +03:00 |
|
Anatoly
|
3b7bef463f
|
refactored social auth
|
2019-11-06 16:11:26 +03:00 |
|
evgeniy-st
|
164f860cc0
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-06 16:02:37 +03:00 |
|
evgeniy-st
|
e21a8bb550
|
Added country serializer to AddressDetailSerializer
|
2019-11-06 16:02:12 +03:00 |
|
Anatoly
|
0aa0378ae0
|
intermediate commit
|
2019-11-06 15:35:47 +03:00 |
|
Dmitriy Kuzmenko
|
82d238c123
|
fiz settings
|
2019-11-06 15:25:59 +03:00 |
|
alex
|
9b16f46215
|
migrate identities
|
2019-11-06 15:12:33 +03:00 |
|
e.stoyushko
|
a466168d61
|
Merge branch 'bugfix/fix-signup-validators' into 'develop'
Fix validators
See merge request gm/gm-backend!105
|
2019-11-06 11:37:56 +00:00 |
|