Commit Graph

48 Commits

Author SHA1 Message Date
Anatoly
cd766e6bbf added documentation for /api/back/establishments/<id>/employees/ 2020-02-06 13:12:10 +03:00
Anatoly
a54bc86d20 added documentation for /api/back/establishments/employees/ (GET, POST) 2020-02-05 18:28:08 +03:00
Anatoly
6d9852fc7b added guide type filter to guide list view 2020-02-05 14:16:36 +03:00
Anatoly
25e829e629 added filtering by establishment id in /api/back/collections/guides/all/ 2020-02-04 12:11:56 +03:00
Anatoly
04c6948539 added endpoint /api/back/collections/guides/all/,
revert pagination in /api/back/collections/guides/
2020-02-04 11:36:46 +03:00
Anatoly
9bfba9af70 refactored a little guide list view 2020-02-04 10:50:52 +03:00
Anatoly
7cbfeb9845 added filtering by country code 2020-02-04 10:40:22 +03:00
Anatoly
87686abbb7 disable counter for guide elements 2020-02-04 10:40:22 +03:00
Anatoly
400b5ac402 change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random 2020-02-03 17:16:40 +03:00
Kirill
97588f1efc change start to created sorting 2020-01-31 17:57:31 +03:00
Kuroshini
e008e7f2a1 remove not sent menus 2020-01-31 14:40:02 +03:00
dormantman
982a52ab96 Added guides binding objects 2020-01-31 04:29:50 +03:00
Anton Gorbunov
ab8a4845d8 Merge branch 'feature/back-collections-list' into 'develop'
remove pagination

See merge request gm/gm-backend!248
2020-01-30 10:37:22 +00:00
a.gorbunov
eabb550f62 remove pagination 2020-01-30 10:36:22 +00:00
Anatoly
25c63b8097 Merge branch 'develop' into feature/roles
# Conflicts:
#	apps/account/models.py
#	apps/collection/views/back.py
#	apps/comment/views/back.py
#	apps/establishment/models.py
#	apps/establishment/views/back.py
#	apps/news/views.py
#	apps/partner/views/back.py
2020-01-30 10:56:46 +03:00
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
Anatoly
61d2f6ec46 added filter - establishment_id, refactored guide counters 2020-01-28 17:52:49 +03:00
Kuroshini
205e2fa996 optimize collections 2020-01-27 19:19:54 +03:00
a.gorbunov
1d3cf9dac0 select related before load 2020-01-27 06:41:52 +00:00
Anatoly
2827374911 intermediate commit 2019-12-30 13:22:57 +03:00
Dmitriy Kuzmenko
ccd9f717df Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
#	apps/utils/export.py
2019-12-27 17:59:20 +03:00
Dmitriy Kuzmenko
d09776c8fa add xml 2019-12-27 17:57:16 +03:00
Anatoly
151c017561 see changes 2019-12-27 17:49:56 +03:00
Anatoly
b41c185a65 see changes 2019-12-27 14:46:36 +03:00
Dmitriy Kuzmenko
02d0112d8b add export for guides 2019-12-26 18:11:48 +03:00
Anatoly
1189b6ff58 see changes 2019-12-26 10:24:08 +03:00
Anatoly
986936fdf5 Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
#	apps/collection/views/back.py
2019-12-25 22:15:22 +03:00
Anatoly
d9df886b98 added guide type field, added tasks, refactored GuideElement model, added endpoint, 2019-12-25 22:14:35 +03:00
Dmitriy Kuzmenko
d7c7880860 add counter for public_mark and change Guid serializer 2019-12-25 15:19:43 +03:00
Anatoly
7452f0bef0 intermediate commit 2019-12-23 12:38:13 +03:00
Anatoly
68b8aa427c added counters 2019-12-19 16:27:58 +03:00
Anatoly
0851a9e6d6 added filter values in guide views 2019-12-18 15:19:04 +03:00
Anatoly
471239983e Merge branch 'develop' into feature/guides
# Conflicts:
#	apps/collection/views/back.py
#	apps/transfer/models.py
2019-12-17 14:47:26 +03:00
Олег Хаятов
23522eb1f0 Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections

See merge request gm/gm-backend!178
2019-12-16 11:02:27 +00:00
dormantman
c2a520b518 Reformat code style 2019-12-16 13:59:04 +03:00
dormantman
def1372317 Change ordering format 2019-12-16 01:02:21 +03:00
dormantman
525658f39b Reformat ordering 2019-12-13 18:32:06 +03:00
dormantman
5c171c644c Added mixins 2019-12-13 03:52:52 +03:00
dormantman
450ca4cf52 Added new field rank to collection 2019-12-13 03:50:12 +03:00
alex
3e83bdff59 pagination & ordering & country code 2019-12-12 15:34:36 +03:00
dormantman
6cbfc38c9c Added back collections method for collection detail 2019-12-11 17:58:39 +03:00
Anatoly
3bbd76a4f8 added endpoints 2019-12-10 18:50:12 +03:00
Anatoly
7d40471084 intermediate commit 2019-12-10 17:44:29 +03:00
Anatoly
ab82d9a2d6 refactoring guide and collection endpoints 2019-12-10 16:24:37 +03:00
Dmitriy Kuzmenko
2e17d7265d add back api for collection 2019-11-20 16:29:46 +03:00
Dmitriy Kuzmenko
2cd7755d7e add CRUD collections for back 2019-11-15 16:04:54 +03:00
Anatoly
eefbec20b1 fix swagger 2019-11-11 22:25:05 +03:00
Dmitriy Kuzmenko
7617981259 change command for migration of users 2019-11-11 15:29:31 +03:00