Commit Graph

19 Commits

Author SHA1 Message Date
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
evgeniy-st
c942f00bd6 remove unused views 2019-08-27 12:36:48 +03:00
evgeniy-st
f82784cd19 update establishment-list endpoint 2019-08-27 12:33:16 +03:00
evgeniy-st
bb284420c4 initial app 2019-08-26 18:07:01 +03:00