evgeniy-st
|
c58d3bae36
|
Tags indexing and search (by id)
|
2019-09-10 12:58:39 +03:00 |
|
evgeniy-st
|
aa88721800
|
sites endpoint
|
2019-09-04 10:14:11 +03:00 |
|
evgeniy-st
|
a2ef5bbfd5
|
small refactor
|
2019-09-02 12:00:19 +03:00 |
|
Anatoly
|
664412d0f4
|
establishment list view - added filter by country code
|
2019-09-02 09:56:55 +03:00 |
|
Anatoly
|
e6b35c8d55
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-09-01 18:11:43 +03:00 |
|
Anatoly
|
e28435aba2
|
added preview image in establishment serializer
|
2019-09-01 18:11:09 +03:00 |
|
Dmitriy Kuzmenko
|
2f692bacf3
|
add migrate
|
2019-09-01 17:52:01 +03:00 |
|
Dmitriy Kuzmenko
|
e91a64ad6b
|
add website
|
2019-09-01 17:51:13 +03:00 |
|
evgeniy-st
|
6d6e1169a4
|
extended establishment model (social)
|
2019-09-01 17:30:39 +03:00 |
|
Dmitriy Kuzmenko
|
082a8a1470
|
add fake best_price_menu
|
2019-09-01 17:22:53 +03:00 |
|
Dmitriy Kuzmenko
|
c85347b53a
|
add menu
|
2019-09-01 16:18:17 +03:00 |
|
Anatoly
|
998204b7c5
|
added created field to comments serializer
|
2019-09-01 15:24:55 +03:00 |
|
evgeniy-st
|
45f990af4c
|
update serializer
|
2019-09-01 15:07:27 +03:00 |
|
evgeniy-st
|
ef02e68c70
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-01 15:05:47 +03:00 |
|
evgeniy-st
|
0da20bbcd1
|
added awards to employee
|
2019-09-01 15:05:25 +03:00 |
|
Anatoly
|
a1fed35c69
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-09-01 15:02:38 +03:00 |
|
Anatoly
|
360f88d996
|
replace textfield with tjsonfield in model Review
|
2019-09-01 15:01:55 +03:00 |
|
evgeniy-st
|
ddabac60d1
|
Fix establishment retrieve view
|
2019-09-01 14:53:46 +03:00 |
|
evgeniy-st
|
abecc6f99a
|
update migrations
|
2019-09-01 14:42:41 +03:00 |
|
evgeniy-st
|
48ac4cceab
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-01 14:33:43 +03:00 |
|
evgeniy-st
|
f10f6b23a0
|
Merge branch 'feature/employees' into develop
|
2019-09-01 14:33:25 +03:00 |
|
Anatoly
|
305da0e008
|
merge migrations
|
2019-09-01 14:31:42 +03:00 |
|
evgeniy-st
|
1b001f303a
|
extended establishment api enpoint by attribute of 'employees'
|
2019-09-01 14:17:03 +03:00 |
|
Anatoly
|
21dd87e0ec
|
Merge remote-tracking branch 'origin/develop' into features/comments
# Conflicts:
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 14:14:38 +03:00 |
|
Anatoly
|
1494bbbf36
|
Merge branch 'feature/reviews' into develop
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 14:09:37 +03:00 |
|
Anatoly
|
cd0f03f05d
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/serializers.py
|
2019-09-01 14:06:17 +03:00 |
|
Dmitriy Kuzmenko
|
ef59216feb
|
change contacts for est.
|
2019-09-01 13:39:01 +03:00 |
|
Anatoly
|
de8db655ed
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 13:38:40 +03:00 |
|
Anatoly
|
3f90ef6dab
|
fix merge
|
2019-09-01 13:29:17 +03:00 |
|
Anatoly
|
e8d4626cdb
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
# apps/establishment/models.py
|
2019-09-01 13:26:55 +03:00 |
|
Anatoly
|
c1738478ab
|
added new model Review
|
2019-09-01 13:24:37 +03:00 |
|
Dmitriy Kuzmenko
|
fc4facbf83
|
add contacts for establishments
|
2019-09-01 12:35:09 +03:00 |
|
Anatoly
|
0d4f080850
|
added new model - Comment
|
2019-09-01 12:30:00 +03:00 |
|
evgeniy-st
|
805bda3267
|
Extend establishment filterset
|
2019-08-30 17:25:07 +03:00 |
|
Anatoly
|
46faf6ecee
|
Merge remote-tracking branch 'origin/develop' into feature/establishment
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/serializers.py
|
2019-08-29 18:19:57 +03:00 |
|
Anatoly
|
3aa1e92046
|
added table EstablishmentSchedule, added application timetable, added table Timetable
|
2019-08-29 17:59:09 +03:00 |
|
evgeniy-st
|
62da2ee114
|
api establishment-detail
|
2019-08-29 17:26:22 +03:00 |
|
Dmitriy Kuzmenko
|
2a16198a8b
|
add award filter
|
2019-08-29 15:00:30 +03:00 |
|
Dmitriy Kuzmenko
|
9a7052026b
|
add metadata
|
2019-08-29 14:51:55 +03:00 |
|
evgeniy-st
|
d9793b2056
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-08-28 18:03:09 +03:00 |
|
Dmitriy Kuzmenko
|
cb1ff8e410
|
add configuration
|
2019-08-28 17:53:52 +03:00 |
|
evgeniy-st
|
c09b495bfd
|
update Establishment serializer
|
2019-08-28 16:31:02 +03:00 |
|
evgeniy-st
|
e5989273dc
|
Establishment add pagination
|
2019-08-28 15:41:17 +03:00 |
|
evgeniy-st
|
ba00bf1b00
|
Merge branch 'develop' into feature/establishment
|
2019-08-28 15:35:21 +03:00 |
|
evgeniy-st
|
1aef1a5bb1
|
Translation & establishment
|
2019-08-28 15:21:28 +03:00 |
|
Dmitriy Kuzmenko
|
253da87a99
|
URL refactoring
|
2019-08-28 11:35:38 +03:00 |
|
Dmitriy Kuzmenko
|
262e98b9e1
|
add awards
|
2019-08-28 10:15:17 +03:00 |
|
evgeniy-st
|
c04771ca58
|
recalculate price level preview version
|
2019-08-27 16:53:05 +03:00 |
|
evgeniy-st
|
6667047537
|
establishment admin conf
|
2019-08-27 14:23:41 +03:00 |
|
evgeniy-st
|
910027d10f
|
update establishment model, migrations
|
2019-08-27 14:23:11 +03:00 |
|