Commit Graph

36 Commits

Author SHA1 Message Date
Anatoly
111e859f74 refactored establishment serializers 2019-09-05 15:50:52 +03:00
Anatoly
a133cfe1dd added default value of is_main flag in comment section for establishments 2019-09-05 11:53:48 +03:00
Anatoly
3cac53c77d fixed comments in establishment list or detail endpoints 2019-09-05 10:32:44 +03:00
Anatoly
c6cbb9bd36 fixed return in establishment serializer last published review 2019-09-05 09:54:43 +03:00
Anatoly
605c81b33c replace comment model from establishment app, added new app comment 2019-09-04 18:47:06 +03:00
evgeniy-st
aa88721800 sites endpoint 2019-09-04 10:14:11 +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
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
f10f6b23a0 Merge branch 'feature/employees' into develop 2019-09-01 14:33:25 +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
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
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
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
c09b495bfd update Establishment serializer 2019-08-28 16:31:02 +03:00
evgeniy-st
1aef1a5bb1 Translation & establishment 2019-08-28 15:21:28 +03:00
evgeniy-st
910027d10f update establishment model, migrations 2019-08-27 14:23:11 +03:00
evgeniy-st
f82784cd19 update establishment-list endpoint 2019-08-27 12:33:16 +03:00