Commit Graph

69 Commits

Author SHA1 Message Date
liyuchun
af1c32a406 * Fix bug #16208. 2021-11-12 08:43:50 +08:00
孙广明
a3948383f8 Merge branch 'sprint/167_api_doc' into 'sprint/167'
* Fix bug #15674.

See merge request easycorp/zentaopms!124
2021-10-20 07:40:43 +00:00
tianshujie
eaaed9cfe6 * Fix bug #15679. 2021-10-20 15:32:02 +08:00
liyuchun
3f279a9ec1 * Fix bug #15674. 2021-10-20 15:00:11 +08:00
hufangzhou
409f2936cb * Fix bug #15666. 2021-10-20 10:21:38 +08:00
xiawenlong
50ea48702e fix api lib default access control 2021-10-19 20:51:13 +08:00
朱金勇
2b04f2ba14 Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
fix default body type.

See merge request easycorp/zentaopms!118
2021-10-19 12:42:52 +00:00
xiawenlong
f02595167f fix default body type. 2021-10-19 20:40:26 +08:00
liyuchun
8c12096a92 * Fix bug #15639. 2021-10-19 20:23:19 +08:00
zhujinyong
f17a9bd5f6 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 19:10:01 +08:00
朱金勇
3bebe533db Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
fix code style.

See merge request easycorp/zentaopms!112
2021-10-19 11:09:40 +00:00
xiawenlong
5db2b168de fix code style. 2021-10-19 19:04:30 +08:00
zhujinyong
d6db6a965b Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 18:57:36 +08:00
zhujinyong
823fd5db59 * Format code. 2021-10-19 18:57:15 +08:00
李玉春
1dea8203c0 Merge branch 'sprint/167' into 'sprint/167_xieqiyu_15615'
# Conflicts:
#   module/api/view/index.html.php
2021-10-19 10:44:18 +00:00
xieqiyu
5479e2db3f * Code for bug#15615. 2021-10-19 18:40:55 +08:00
李玉春
1e69e81346 Merge branch 'sprint/167_tianshujie_15620' into 'sprint/167'
* Fix bug #15620.

See merge request easycorp/zentaopms!111
2021-10-19 10:29:39 +00:00
tianshujie
44d842755e * Adjust code of api module. 2021-10-19 18:28:53 +08:00
tianshujie
d6a56aaeab * Adjust code of api module. 2021-10-19 18:25:20 +08:00
tianshujie
8a1948c487 * Fix bug #15620. 2021-10-19 18:23:10 +08:00
朱金勇
cf2f61ddb3 Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
Sprint/167 xiawenlong

See merge request easycorp/zentaopms!109
2021-10-19 10:18:18 +00:00
xieqiyu
b70e00dbad * Adjust code style. 2021-10-19 18:14:27 +08:00
xiawenlong
e872c187cf fix group en language. 2021-10-19 18:09:48 +08:00
xieqiyu
cfaea6c602 * Fix bug#15615. 2021-10-19 17:59:36 +08:00
xiawenlong
2f28bb8c85 fix all level 1 and 3 bugs. 2021-10-19 17:49:39 +08:00
李玉春
579763d5f8 Merge branch 'sprint/167_sgm_fixbug' into 'sprint/167'
* Fix bug #15635.

See merge request easycorp/zentaopms!105
2021-10-19 09:44:29 +00:00
孙广明
d3a9f0fb73 * Fix bug #15635. 2021-10-19 17:42:53 +08:00
xieqiyu
fe063ce0b9 * Fix bug#15628. 2021-10-19 17:34:15 +08:00
zhujinyong
8f7c0e6f47 * Merge manually. 2021-10-19 16:24:10 +08:00
朱金勇
e770ce54d1 Merge branch 'sprint/167' into 'sprint/167_xiawenlong_api'
# Conflicts:
#   module/api/view/editlib.html.php
2021-10-19 08:18:16 +00:00
xiawenlong
b849261155 fix bugs. 2021-10-19 16:03:02 +08:00
zhujinyong
fc2e75eeb8 * Fix languages. 2021-10-19 15:59:07 +08:00
xiawenlong
7f733c3ad3 fix language fie. 2021-10-19 14:48:08 +08:00
zhujinyong
68e738fdd7 * Reformat code style. 2021-10-19 13:21:22 +08:00
zhujinyong
4bb27b624e * Adjust code for Api doc. 2021-10-19 11:00:55 +08:00
xiawenlong
90a357a980 finish api release manage. 2021-10-18 16:42:38 +08:00
xiawenlong
e1bed5bc55 finish api release. 2021-10-18 16:13:46 +08:00
xiawenlong
4f9086045a finish api release. 2021-10-14 15:57:38 +08:00
thanatos
1cb991b70f 详情 2021-10-12 17:18:58 +08:00
thanatos
cb1613604f fix header action 2021-10-12 09:41:21 +08:00
zhujinyong
83d598745f * Finish task#43059. 2021-10-08 08:01:53 +08:00
thanatos
eccb9609ac update api detail style 2021-09-28 11:39:45 +08:00
thanatos
a2b41fdcf8 update api detail style 2021-09-28 11:38:05 +08:00
thanatos
9b9d95f923 update params 2021-09-28 08:58:55 +08:00
thanatos
c0e6b93d3f fix bug 2021-09-26 13:33:22 +08:00
thanatos
dbeacce70f edit api doc 2021-09-24 08:48:47 +08:00
thanatos
02b0ab4dda fix code style 2021-09-23 15:57:57 +08:00
thanatos
ec628d33f1 fix code style 2021-09-23 15:05:22 +08:00
thanatos
1787e7a86c fix code style 2021-09-23 10:58:00 +08:00
zhujinyong
3b921a953b Merge branch 'api_doc' of http://gitlab.zcorp.cc/easycorp/zentaopms into api_doc 2021-09-23 10:32:12 +08:00