Виктор Гладких
|
e9ad418976
|
Revert migrate location
|
2019-10-11 16:57:59 +03:00 |
|
evgeniy-st
|
0d7104eace
|
Merge branch 'develop' into feature/gm-192
|
2019-10-11 16:44:54 +03:00 |
|
Anatoly
|
868a3c1b78
|
added merge migration
|
2019-10-11 16:36:34 +03:00 |
|
Anatoly
|
32d56ffe83
|
Merge branch 'develop' into feature/gm-148
|
2019-10-11 16:34:06 +03:00 |
|
d.kuzmenko
|
35532a32f4
|
Merge branch 'bugfix/account-change' into 'develop'
Don't change email until user confirms it
See merge request gm/gm-backend!51
|
2019-10-11 13:20:13 +00:00 |
|
Виктор Гладких
|
f441896d6a
|
Migrate data
|
2019-10-11 16:00:23 +03:00 |
|
Anatoly
|
ddb3eec679
|
finished endpoint to get tags by establishment type and subtype
|
2019-10-11 15:41:31 +03:00 |
|
Виктор Гладких
|
d9fc88e7c6
|
Merge branch 'develop' into feature/roles
|
2019-10-11 14:50:18 +03:00 |
|
Виктор Гладких
|
a6c56a4bf1
|
Fix and refactor
|
2019-10-11 14:49:32 +03:00 |
|
Kuroshini
|
0816a847ac
|
Some booking fixes
|
2019-10-11 14:36:25 +03:00 |
|
Kuroshini
|
114d159449
|
fix tests
|
2019-10-11 13:46:08 +03:00 |
|
michail
|
51b63335d7
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-11 15:41:32 +05:00 |
|
michail
|
7bcd2edab6
|
Added transfer.py into timetable.
Edited transfer.py for collection and location.
|
2019-10-11 15:41:09 +05: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 |
|
littlewolf
|
6142508421
|
Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects
|
2019-10-11 10:46:00 +03:00 |
|
littlewolf
|
f5c16fba9d
|
Tmp fix
|
2019-10-11 10:45:49 +03:00 |
|
Anatoly
|
a25d846028
|
fixed bug with duplicated records in similar establishments
|
2019-10-10 21:02:56 +03:00 |
|
Kuroshini
|
71528d8a28
|
Password reset confirmation mechanics
|
2019-10-10 20:49:35 +03:00 |
|
Kuroshini
|
c920628574
|
Don't change email until user confirms it
|
2019-10-10 17:42:29 +03:00 |
|
Виктор Гладких
|
caf11ed372
|
Merge branch 'develop' into feature/roles
|
2019-10-10 16:01:33 +03:00 |
|
Виктор Гладких
|
b390b1af26
|
Fix
|
2019-10-10 16:00:23 +03:00 |
|
michail
|
839491c740
|
added Pages, PageTexts, PageCounters and PageMetadata models into
transfer/models.py
|
2019-10-10 17:55:28 +05:00 |
|
michail
|
b2b8798c6c
|
Edited transfer.py for news, partner, reviews, comment.
Added transfer.py for recipe.
|
2019-10-10 17:46:52 +05:00 |
|
Виктор Гладких
|
b83efb7cda
|
Fix migrations
|
2019-10-10 15:23:44 +03:00 |
|
Виктор Гладких
|
ab5a66afe2
|
Test change
|
2019-10-10 15:20:13 +03:00 |
|
Anatoly
|
f83b735eb3
|
changed files
|
2019-10-10 15:10:43 +03:00 |
|
Anatoly
|
e435d71e00
|
Merge branch 'feature/gm-192' of https://gl.id-east.ru/gm/gm-backend into feature/gm-192
|
2019-10-10 15:09:45 +03:00 |
|
Виктор Гладких
|
56c0927a52
|
Add country control
|
2019-10-10 14:58:19 +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 |
|
evgeniy-st
|
074a5ec5ea
|
refactor news tags
|
2019-10-09 18:25:40 +03:00 |
|
Anatoly
|
f239e5def8
|
Merge branch 'feature/fix-auth-refactored-email' into feature/gm-192
# Conflicts:
# project/settings/base.py
|
2019-10-09 16:49:31 +03:00 |
|
Виктор Гладких
|
01dd728323
|
Refactor
|
2019-10-09 16:44:29 +03:00 |
|
Виктор Гладких
|
77839c7e8c
|
Merge branch 'develop' into feature/roles
|
2019-10-09 16:29:11 +03:00 |
|
Виктор Гладких
|
7ed976dec0
|
Test
|
2019-10-09 16:28:14 +03:00 |
|
Anatoly
|
74fa1fc014
|
Merge branch 'develop' into feature/gm-192
|
2019-10-09 16:21:50 +03:00 |
|
Anatoly
|
091491e19f
|
small fix
|
2019-10-09 15:57:35 +03:00 |
|
Anatoly
|
3f9dea30ff
|
Revert "remove duplicate migration"
This reverts commit 93894db7
|
2019-10-09 15:54:04 +03:00 |
|
michail
|
4cc9fabd73
|
edited transfer.py for notification, account, establishment
|
2019-10-09 17:43:48 +05:00 |
|
Anatoly
|
a77b7f9c10
|
Revert "remove duplicate migration"
This reverts commit 40570a07
|
2019-10-09 15:42:46 +03:00 |
|
Anatoly
|
495b0a7563
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-10-09 15:36:50 +03:00 |
|
evgeniy-st
|
a763bb8a3a
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 15:36:44 +03:00 |
|
Anatoly
|
40570a0746
|
Revert "remove duplicate migration"
This reverts commit 93894db7
|
2019-10-09 15:36:43 +03:00 |
|
evgeniy-st
|
3ccd94f0b5
|
Merge remote-tracking branch 'origin/feature/booking' into develop
|
2019-10-09 15:36:26 +03:00 |
|
Anatoly
|
05d3e3ff60
|
fix migrations
|
2019-10-09 15:33:05 +03:00 |
|
Kuroshini
|
f5a45fccf1
|
Fix migration
|
2019-10-09 15:32:22 +03:00 |
|
Anatoly
|
41db19b167
|
Merge branch 'feature/fix-auth-refactored-email' into feature/gm-148
|
2019-10-09 15:20:34 +03: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 |
|
Виктор Гладких
|
48ca13803e
|
Pre test permission comment
|
2019-10-09 14:44:01 +03:00 |
|
e.stoyushko
|
f3eda60868
|
Update urls.py
|
2019-10-09 11:43:09 +00:00 |
|
e.stoyushko
|
0cfc48e537
|
Update admin.py
|
2019-10-09 11:34:14 +00:00 |
|
Anatoly
|
2191a505a5
|
refactored EstablishmentBase serializer
|
2019-10-09 14:11:53 +03:00 |
|
evgeniy-st
|
3c3969bf64
|
Merge branch 'develop' into feature/gm-148
|
2019-10-09 14:00:16 +03:00 |
|
Anatoly
|
ca5f588466
|
fix elastic document, fix prefetch and select related
|
2019-10-09 12:53:35 +03:00 |
|
e.stoyushko
|
c6c0ba47c5
|
Merge branch 'feature/news-mail' into 'develop'
Feature/news mail
See merge request gm/gm-backend!48
|
2019-10-09 09:47:50 +00:00 |
|
e.stoyushko
|
b573038980
|
Update tasks.py
|
2019-10-09 09:46:23 +00:00 |
|
Виктор Гладких
|
eff7dfc452
|
Merge branch 'develop' into feature/roles
|
2019-10-09 10:44:04 +03:00 |
|
Anatoly
|
69d02e7a07
|
fix auth
|
2019-10-09 10:05:19 +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 |
|
littlewolf
|
e8c48e99c6
|
Add key to transfer
Add queryset to transfer
Add models and fields get to transfer
|
2019-10-09 07:49:44 +03:00 |
|
Anatoly
|
33d2446c5c
|
Merge branch 'develop' into feature/gm-192
|
2019-10-08 15:39:31 +03:00 |
|
Anatoly
|
d321866dc2
|
gm-192: in progress
|
2019-10-08 15:38:35 +03:00 |
|
Виктор Гладких
|
eeba02c2ae
|
test role
|
2019-10-08 15:26:39 +03:00 |
|
evgeniy-st
|
e2e5faa3f9
|
Merge branch 'develop' into feature/gm-148
|
2019-10-08 14:41:52 +03:00 |
|
evgeniy-st
|
861daf8871
|
update search fields
|
2019-10-08 14:39:42 +03:00 |
|
michail
|
03b22d79db
|
edited Address in location/transfer.py
|
2019-10-08 14:01:40 +05:00 |
|
michail
|
bc7d4ef5a5
|
comment location/transfer.py
|
2019-10-08 12:24:57 +05:00 |
|
Виктор Гладких
|
e66a6bcbfa
|
Fix models
|
2019-10-08 10:18:51 +03:00 |
|
Виктор Гладких
|
7925febc77
|
Models role
|
2019-10-08 09:57:47 +03:00 |
|
littlewolf
|
ab768311f0
|
Update tables structure
|
2019-10-07 22:23:01 +03:00 |
|
evgeniy-st
|
97dc881200
|
Merge branch 'develop' into feature/gm-148
|
2019-10-07 18:03:07 +03:00 |
|
evgeniy-st
|
3bf65472d9
|
Auto fuzziness with match query
|
2019-10-07 16:31:50 +03:00 |
|
michail
|
4e96d09513
|
added transfer.py to account, comment and review
|
2019-10-07 14:34:24 +05:00 |
|
Anatoly
|
8ac5a1970f
|
fixed carousel
|
2019-10-07 10:51:08 +03:00 |
|
Anatoly
|
15ef2295ca
|
migration fix
|
2019-10-07 09:55:24 +03:00 |
|
Kuroshini
|
73646eb05f
|
News email #2
|
2019-10-05 18:08:58 +03:00 |
|
Kuroshini
|
90b8dafba9
|
News email #1
|
2019-10-04 20:24:48 +03:00 |
|
Anatoly
|
90ab1a2ab9
|
Revert "fix migrations"
This reverts commit 9a36b52e
|
2019-10-04 18:02:51 +03:00 |
|
Anatoly
|
d60d166031
|
added merge migration
|
2019-10-04 17:01:40 +03:00 |
|
Anatoly
|
059bcdb07d
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 15:55:58 +03:00 |
|
Kuroshini
|
4d55f80e6f
|
Added migration
|
2019-10-04 15:49:21 +03:00 |
|
Виктор Гладких
|
aa9288d41c
|
Merge branch 'develop' into feature/news-rating
|
2019-10-04 15:41:25 +03:00 |
|
Виктор Гладких
|
f93d0095f4
|
Fix rating
|
2019-10-04 15:40:18 +03:00 |
|
Виктор Гладких
|
9f9c1064bd
|
Fix rating
|
2019-10-04 15:39:14 +03:00 |
|
Anatoly
|
9a36b52eec
|
fix migrations
|
2019-10-04 15:26:29 +03:00 |
|
Anatoly
|
c365711c05
|
Merge branch 'develop' into feature/gm-148
|
2019-10-04 14:31:03 +03:00 |
|
Anatoly
|
91790bbc39
|
refactored
|
2019-10-04 14:30:34 +03:00 |
|
michail
|
511312bb28
|
added transfer.py to partner
|
2019-10-04 16:20:04 +05:00 |
|
evgeniy-st
|
175bd4f7b5
|
update establishment document
|
2019-10-04 14:07:50 +03:00 |
|
Anatoly
|
eaa1795f0c
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/authorization/tasks.py
|
2019-10-04 14:00:06 +03:00 |
|
Anatoly
|
af0e6af5c4
|
refactored email reconfirm view
|
2019-10-04 13:48:48 +03:00 |
|
Anatoly
|
b2f900d15d
|
gm-148: refactored
|
2019-10-04 13:25:42 +03:00 |
|
evgeniy-st
|
9fb05f0407
|
Merge branch 'feature/es' into develop
|
2019-10-04 12:11:12 +03:00 |
|
evgeniy-st
|
a73cba4dcf
|
Merge branch 'develop' into feature/es
|
2019-10-04 12:06:53 +03:00 |
|
evgeniy-st
|
50a9622f78
|
News search
|
2019-10-04 12:05:13 +03:00 |
|
Anatoly
|
646eeb8972
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
|
2019-10-04 11:53:31 +03:00 |
|
Anatoly
|
4890e00b95
|
gm-148: refactored
|
2019-10-04 11:50:29 +03:00 |
|
d.kuzmenko
|
f9247477f9
|
Merge branch 'feature/news-rating' into 'develop'
Feature/news rating
See merge request gm/gm-backend!46
|
2019-10-04 08:33:13 +00:00 |
|
michail
|
ad17a2ad7a
|
new relations template
|
2019-10-04 13:18:43 +05:00 |
|
evgeniy-st
|
24f84ae8be
|
update tag filter
|
2019-10-04 11:16:01 +03:00 |
|
Виктор Гладких
|
b42e9781a1
|
Fix code
|
2019-10-04 10:20:36 +03:00 |
|
Виктор Гладких
|
2e0da3a15f
|
Merge branch 'develop' into feature/news-rating
|
2019-10-04 10:16:05 +03:00 |
|
Виктор Гладких
|
ca38f369f7
|
Fix
|
2019-10-04 10:15:07 +03:00 |
|
littlewolf
|
4ce0eb284d
|
Update transfer structure in location
|
2019-10-04 08:16:56 +03:00 |
|
littlewolf
|
b581ead8ae
|
Add relation fields
|
2019-10-04 07:50:19 +03:00 |
|
littlewolf
|
90dd896f13
|
Load app models
Load legacy models
|
2019-10-04 00:14:16 +03:00 |
|
littlewolf
|
673acb4bb9
|
Add sort
Move dependencies to model
Add data_type to model
|
2019-10-03 23:19:40 +03:00 |
|
Kuroshini
|
3f6aa21005
|
Fix issue w/ Lastable service
|
2019-10-03 20:41:26 +03:00 |
|
Kuroshini
|
3da57b72fc
|
Lastable naive realization
|
2019-10-03 19:26:09 +03:00 |
|
evgeniy-st
|
8b9f6ed864
|
another fix migraztion
|
2019-10-03 18:21:04 +03:00 |
|
evgeniy-st
|
880c387759
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-03 18:12:12 +03:00 |
|
evgeniy-st
|
cb37b5733e
|
update migration
|
2019-10-03 18:10:29 +03:00 |
|
evgeniy-st
|
729a77866d
|
update elasticsearch index
|
2019-10-03 17:19:30 +03:00 |
|
littlewolf
|
ea427d6451
|
Update module
|
2019-10-03 16:37:57 +03:00 |
|
michail
|
018d9f6557
|
added establishment and collection transfer.py files
|
2019-10-03 17:54:26 +05:00 |
|
Kuroshini
|
53db4462f8
|
Added lastable booking availability checking method
|
2019-10-03 14:59:38 +03:00 |
|
Виктор Гладких
|
6e9da70594
|
Merge branch 'develop' into feature/news-rating
|
2019-10-03 14:52:30 +03:00 |
|
Виктор Гладких
|
9fd064fdec
|
Add rating unique value
|
2019-10-03 14:51:17 +03:00 |
|
Виктор Гладких
|
14cf7d7b1b
|
Add rating value in news
|
2019-10-03 14:46:34 +03:00 |
|
Kuroshini
|
0408d93599
|
Squashed migrations && added lastable credentials
|
2019-10-03 13:41:45 +03:00 |
|
e.stoyushko
|
4c734cc2ec
|
Merge branch 'feature/translate-classes-carousel' into 'develop'
Feature/translate classes carousel
See merge request gm/gm-backend!44
|
2019-10-03 09:18:25 +00:00 |
|
Виктор Гладких
|
295bda4b4f
|
Add hours
|
2019-10-03 11:41:52 +03:00 |
|
Виктор Гладких
|
38be14b5ba
|
Merge branch 'develop' into feature/news-rating
|
2019-10-03 11:39:24 +03:00 |
|
Виктор Гладких
|
f90e1ceded
|
Add raiting
|
2019-10-03 11:37:59 +03:00 |
|
littlewolf
|
cf7184d7ac
|
Switch transfer standard
Add utils
Add -d key
|
2019-10-03 00:29:19 +03:00 |
|
littlewolf
|
288d6cd699
|
Tmp
|
2019-10-02 18:18:38 +03:00 |
|
Anatoly
|
4796fce784
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/admin.py
|
2019-10-02 18:11:47 +03:00 |
|
Anatoly
|
296a09165d
|
added migration
|
2019-10-02 18:09:29 +03:00 |
|
Виктор Гладких
|
f0001eef93
|
Add get method in view
|
2019-10-02 17:58:22 +03:00 |
|
d.kuzmenko
|
750f141017
|
Merge branch 'feature/sending-news-email' into 'develop'
Feature/sending news email
See merge request gm/gm-backend!45
|
2019-10-02 14:17:29 +00:00 |
|
Anatoly
|
f693c36382
|
switched host email account, changed exception error
|
2019-10-02 17:16:19 +03:00 |
|
Anatoly
|
83ffb4dae1
|
Merge branch 'develop' into feature/gm-148
|
2019-10-02 16:22:11 +03:00 |
|
Anatoly
|
fec3e703ce
|
refactored collection views
|
2019-10-02 16:21:38 +03:00 |
|
Anatoly
|
e66b2f7f9f
|
refactored
|
2019-10-02 16:13:21 +03:00 |
|
michail
|
223447fc95
|
added model dicts to location/transfer.py
|
2019-10-02 18:11:16 +05:00 |
|
Anatoly
|
ae4d6c3ccd
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
|
2019-10-02 15:46:35 +03:00 |
|
Anatoly
|
8e3bb54508
|
added endpoint for retrieving collection detail information
|
2019-10-02 15:09:19 +03:00 |
|
Виктор Гладких
|
7b18d7e430
|
Model and admin
|
2019-10-02 14:50:30 +03:00 |
|
littlewolf
|
59320f4333
|
Add temp transfer options to apps.location
|
2019-10-02 14:23:24 +03:00 |
|
Виктор Гладких
|
753471544e
|
Add app Rating
|
2019-10-02 14:17:06 +03:00 |
|
Anatoly
|
402bd32eda
|
gm-148: modified news gallery
|
2019-10-02 14:10:23 +03:00 |
|
evgeniy-st
|
ca9475b182
|
refactor this feature
|
2019-10-02 12:35:01 +03:00 |
|
littlewolf
|
9dcdb7575e
|
Switch application
Add application command
Update mixin
Add mixin to models
|
2019-10-02 11:41:14 +03:00 |
|
michail
|
5ec81f417a
|
fix bug
|
2019-10-02 13:37:46 +05:00 |
|
michail
|
393ecbb55c
|
Merge remote-tracking branch 'origin/feature/sending-news-email' into feature/sending-news-email
# Conflicts:
# apps/news/admin.py
# apps/news/tasks.py
|
2019-10-02 13:31:29 +05:00 |
|
michail
|
fb9e71cbdd
|
fix querysets
|
2019-10-02 13:27:33 +05:00 |
|
Виктор Гладких
|
e611e3154d
|
Push
|
2019-10-02 11:21:28 +03:00 |
|
michail
|
0578768ebd
|
Merge remote-tracking branch 'origin/develop' into feature/sending-news-email
# Conflicts:
# docker-compose.yml
|
2019-10-02 13:17:24 +05:00 |
|
evgeniy-st
|
8f66f5372d
|
Merge branch 'develop' into feature/will-also-like-news
|
2019-10-02 10:45:16 +03:00 |
|
Anatoly
|
3234a71cde
|
gm-148: modified settings, added missing migration
|
2019-10-02 10:34:17 +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 |
|
Anatoly
|
d9635a8599
|
gm-148: refactored
|
2019-10-02 10:16:32 +03:00 |
|
michail
|
02638a26fe
|
added sending through celery
|
2019-10-02 12:09:45 +05:00 |
|
michail
|
c0149a0695
|
added country_code to news email template
|
2019-10-02 11:48:03 +05:00 |
|
michail
|
c28d1cf3a0
|
fix locale and country code in task
|
2019-10-02 11:48:03 +05:00 |
|
michail
|
5474c2ff69
|
added news mail template and task without celery delay
|
2019-10-02 11:48:03 +05:00 |
|
michail
|
6683d4a4ef
|
First commit
|
2019-10-02 11:48:03 +05:00 |
|
Kuroshini
|
df6b221029
|
Review fixes
|
2019-10-01 21:32:24 +03:00 |
|
Kuroshini
|
4cf0ce831b
|
Raise error whether field's absent
|
2019-10-01 20:12:47 +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
|
1247cefa3b
|
Merge branch 'develop' into feature/refactor-address
|
2019-10-01 18:07:59 +03:00 |
|
evgeniy-st
|
7ca6e49161
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-01 18:07:20 +03:00 |
|
evgeniy-st
|
e42f4d061c
|
refactor address
|
2019-10-01 18:07:04 +03:00 |
|
Виктор Гладких
|
266ace6912
|
Merge branch 'develop' into feature/sending-news-email
|
2019-10-01 17:52:28 +03:00 |
|
Виктор Гладких
|
0c79548027
|
Fix
|
2019-10-01 17:51:27 +03:00 |
|
Виктор Гладких
|
1f85f63d20
|
Fix celery
|
2019-10-01 17:45:57 +03:00 |
|
Kuroshini
|
9793c0a49f
|
Resend confirmation email method
|
2019-10-01 17:42:37 +03:00 |
|
Dmitriy Kuzmenko
|
9f280857ef
|
change docker-compose for working celery
|
2019-10-01 17:42:37 +03:00 |
|
Виктор Гладких
|
ee221d0938
|
Fix celery
|
2019-10-01 17:33:21 +03:00 |
|
Kuroshini
|
516c4458ac
|
Make model name translated
|
2019-10-01 17:11:24 +03:00 |
|
michail
|
a497230883
|
fix names of methods and fields of serializer
|
2019-10-01 17:42:14 +05: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 |
|
littlewolf
|
e3d26b5dd1
|
Temp commit
|
2019-10-01 07:43:38 +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 |
|
Anatoly
|
501b8833ed
|
gm-148: finish
|
2019-09-30 15:40:28 +03:00 |
|
Kuroshini
|
beb031d0b6
|
Add slug to carousel serializer
|
2019-09-30 14:05:38 +03:00 |
|
Kuroshini
|
b1e09d806a
|
Add ordering to timetable object
|
2019-09-30 14:00:34 +03:00 |
|
Kuroshini
|
019ac97d19
|
Add vintage year to detail
|
2019-09-30 13:50:17 +03:00 |
|
Kuroshini
|
310928d95c
|
Fix import package issue
|
2019-09-30 12:46:58 +03:00 |
|
michail
|
055e99dba2
|
added "on the same theme" news list and "you should read" news list
|
2019-09-30 13:17:38 +05:00 |
|
d.kuzmenko
|
b724e2eeb9
|
Merge branch 'feature/will-also-like-news' into 'develop'
Feature/will also like news
See merge request gm/gm-backend!34
|
2019-09-30 07:58:49 +00: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 |
|
michail
|
88df92a7a5
|
added country_code to news email template
|
2019-09-30 12:42:49 +05:00 |
|
Виктор Гладких
|
5ef33c0d19
|
News search url
|
2019-09-30 10:19:09 +03:00 |
|
michail
|
6d72c1abfd
|
fix locale and country code in task
|
2019-09-30 12:18:18 +05:00 |
|
michail
|
90ae87a14e
|
added news mail template and task without celery delay
|
2019-09-30 12:09:53 +05:00 |
|
Виктор Гладких
|
78e1e448d9
|
News search
|
2019-09-30 10:09:46 +03: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
|
1957ab6300
|
Pagination for ES results
|
2019-09-27 20:54:55 +03:00 |
|
Kuroshini
|
d71ed0c1de
|
Fix lot/lat x/y mapping && address serialization
|
2019-09-27 19:44:00 +03:00 |
|
Kuroshini
|
ac8356c7d1
|
Fix some test && routes && add migration
|
2019-09-27 19:03:30 +03:00 |
|
Anatoly
|
7f79ce8945
|
gm-148: in progress
|
2019-09-27 17:48:27 +03:00 |
|
Dmitriy Kuzmenko
|
2af401daa5
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-27 17:44:19 +03:00 |
|
d.kuzmenko
|
8957a52fe7
|
Merge branch 'feature/collections-update-recomendations' into 'develop'
Feature/collections update recomendations
See merge request gm/gm-backend!36
|
2019-09-27 14:43:43 +00:00 |
|
Виктор Гладких
|
4f3c804251
|
Fix
|
2019-09-27 17:34:13 +03:00 |
|
Виктор Гладких
|
49ab0a5843
|
Fix conflict
|
2019-09-27 17:31:33 +03:00 |
|
Dmitriy Kuzmenko
|
54c392762c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-27 17:25:51 +03:00 |
|
Виктор Гладких
|
d25e4af488
|
Created by
|
2019-09-27 17:21:57 +03:00 |
|
evgeniy-st
|
03753f9059
|
News model, state
|
2019-09-27 17:16:40 +03:00 |
|
littlewolf
|
7a0999a520
|
Add new filter
|
2019-09-27 17:12:12 +03:00 |
|
littlewolf
|
a0a6578ae8
|
Add new filter
|
2019-09-27 17:11:42 +03:00 |
|
Виктор Гладких
|
ae87a51277
|
Author
|
2019-09-27 17:10:08 +03:00 |
|
evgeniy-st
|
785d2a2f09
|
update news serializer, RUD for backoffice
|
2019-09-27 16:56:26 +03:00 |
|
michail
|
755490c6cf
|
done
|
2019-09-27 17:12:24 +05:00 |
|
littlewolf
|
b55a8ffda6
|
Add comments
|
2019-09-27 12:23:12 +03:00 |
|
evgeniy-st
|
941feb4233
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-27 12:22:03 +03:00 |
|
evgeniy-st
|
46ce25f0f7
|
fix migration
|
2019-09-27 12:21:50 +03:00 |
|
d.kuzmenko
|
0be257d305
|
Merge branch 'featue/gm-119-search_mobile' into 'develop'
Double api
See merge request gm/gm-backend!33
|
2019-09-27 09:10:14 +00:00 |
|
littlewolf
|
910322273e
|
Add annotate to filter
|
2019-09-27 12:01:11 +03:00 |
|
evgeniy-st
|
cd951ddd75
|
remove custom slug field from serializer, small fix in migration
|
2019-09-27 11:57:42 +03:00 |
|
evgeniy-st
|
c9bf83fba7
|
News slug, disable null, remove editable
|
2019-09-27 11:53:40 +03:00 |
|
Виктор Гладких
|
fc5ec0920e
|
fix
|
2019-09-27 11:43:14 +03:00 |
|
evgeniy-st
|
62fbded6de
|
added todo
|
2019-09-27 11:41:13 +03:00 |
|
Виктор Гладких
|
c7974a7511
|
Refactor authorization test
|
2019-09-27 11:33:49 +03:00 |
|
evgeniy-st
|
993e58d215
|
fix views after merge
|
2019-09-27 11:20:43 +03:00 |
|
Виктор Гладких
|
d115d30e82
|
Fix test authorization
|
2019-09-27 11:19:49 +03:00 |
|
Виктор Гладких
|
aa037d27f5
|
Double api
|
2019-09-27 10:43:24 +03:00 |
|
evgeniy-st
|
6806d0b216
|
Merge branch 'develop' into feature/refactor-establishments
|
2019-09-27 10:20:30 +03:00 |
|
evgeniy-st
|
403a60623a
|
Merge branch 'develop' into feature/refactor-establishments
|
2019-09-27 10:05:15 +03:00 |
|
michail
|
962dc2f480
|
maybe it is solution
|
2019-09-27 12:01:30 +05:00 |
|
michail
|
9608fdb92a
|
property was added to news model
|
2019-09-27 11:30:58 +05:00 |
|
michail
|
b1b9ab5ab2
|
First commit
|
2019-09-27 11:14:18 +05:00 |
|
littlewolf
|
44f792db0c
|
Switch sorting
|
2019-09-27 07:58:21 +03:00 |
|
littlewolf
|
4f2bca78f9
|
Update tests
Update view
|
2019-09-27 07:52:57 +03:00 |
|
littlewolf
|
5793eaad32
|
Add queryset mixin
Switch view in urls/common
Add homepage view
Switch test
|
2019-09-26 20:17:50 +03:00 |
|
Anatoly
|
14ae75f088
|
gm-148: refactored news serializer
|
2019-09-26 18:38:57 +03:00 |
|
Kuroshini
|
87999830d1
|
Remove description from search results
|
2019-09-26 17:53:21 +03:00 |
|
Kuroshini
|
ae00c30fac
|
Fix test
|
2019-09-26 17:50:07 +03:00 |
|
Kuroshini
|
fec3a2f6bc
|
Reformat establishment elastic location for api
|
2019-09-26 17:46:07 +03:00 |
|
Kuroshini
|
e0d09486c2
|
Revert "address coordinates in get api queries"
This reverts commit f21b400
|
2019-09-26 17:40:35 +03:00 |
|
Kuroshini
|
2fe0ce86d3
|
Refactor elastic serializer
|
2019-09-26 17:40:09 +03:00 |
|
Kuroshini
|
441c16281d
|
format api elastic results
|
2019-09-26 17:23:55 +03:00 |
|
Kuroshini
|
f21b4005aa
|
address coordinates in get api queries
|
2019-09-26 16:39:30 +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 |
|