Commit Graph

104 Commits

Author SHA1 Message Date
hufangzhou
f13b0db32e * Fix bug #24585. 2022-06-30 10:44:46 +08:00
liumengyi
3cbc219ad5 * Code review. 2022-06-24 14:18:31 +08:00
sunjun
2514a53fde fixbug 2022-06-22 06:03:07 +00:00
sunjun
b0fbce7fd4 *Finish task #57888 2022-06-22 05:48:13 +00:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
hufangzhou
bad39397ce * Fix bug #15582. 2022-04-28 10:56:13 +08:00
hufangzhou
4f4ab1e720 * Fix bug #15831. 2022-04-27 17:00:15 +08:00
朱金勇
fe9ef3556d Merge branch 'sprint/fixbug_hufangzhou_15740' into 'master'
* Fix bug #15740.

See merge request easycorp/zentaopms!3154
2022-04-27 06:38:56 +00:00
hufangzhou
b3c5aad263 * Fix bug #15740. 2022-04-27 13:58:36 +08:00
hufangzhou
474ef7cb85 * Fix bug #15681. 2022-04-27 13:39:32 +08:00
hufangzhou
0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
hufangzhou
6a42dabd32 * Fix bug #15954. 2022-04-26 13:44:14 +08:00
zenggang
8b54060132 * Fix bug#15658,15644 2022-04-25 09:11:13 +00:00
hufangzhou
abca99908b * Code for story #32201. 2022-04-22 09:49:59 +08:00
hufangzhou
2031d9df86 * Fix bug #15648. 2022-04-12 10:04:08 +08:00
hufangzhou
996c0c6edb * Fix bug #15647. 2022-04-06 17:21:51 +08:00
hufangzhou
54c00c0907 * Fix bug #16115. 2022-04-02 16:11:47 +08:00
hufangzhou
c74f8f2b5a * Modify the checkbox style of api edit page. 2022-04-01 11:01:30 +08:00
hufangzhou
b2543e022f * Fix bug #15961. 2022-04-01 10:56:30 +08:00
孙广明
34cbc58264 * Fix bug #19236. 2022-02-07 10:53:44 +08:00
zhouxudong
a25933c371 *Fix buf #17419. 2022-01-12 09:54:31 +08:00
zhujinyong
d065d6077b * Adjust index page of api. 2021-12-23 13:27:41 +08:00
zhujinyong
411b060895 + Create demo data for api. 2021-12-21 09:36:25 +08:00
孙广明
13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
zhujinyong
861e92107c + Add user type for api. 2021-12-03 10:01:01 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明
801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
zhujinyong
0d7c8a5e2d * Add array type for params type. 2021-11-22 09:55:20 +08:00
zhujinyong
5f8c33d682 * Move chinese to $lang->api. 2021-11-22 08:10:05 +08:00
liyuchun
af1c32a406 * Fix bug #16208. 2021-11-12 08:43:50 +08:00
root
f49cbba01d * Fix bug #15665 2021-11-09 14:38:14 +08:00
liyuchun
886f54508f * Adjust style of api index. 2021-10-28 15:10:23 +08:00
xiawenlong
a4aef73aa6 * Finish Task #43676,43675,43672,43671,43679,43669 2021-10-28 14:41:31 +08:00
xiawenlong
3d52f403d0 * Finish Task #43624 2021-10-28 13:02:38 +08:00
mayue
17118b4595 *Fix a bug #15739 2021-10-26 14:37:42 +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