Commit Graph

282 Commits

Author SHA1 Message Date
caoyanyi
28ce2717db * Fix bug #24582. 2022-07-21 13:28:26 +08:00
caoyanyi
df93073fe4 * Fix bug #24576. 2022-07-21 13:24:43 +08:00
hufangzhou
2fe046f186 * Fix bug #23942. 2022-06-30 13:25:33 +08:00
sunjun
5166008449 fixbug_api 2022-06-30 03:42:34 +00:00
王怡栋
91c7b02ad8 Merge branch 'sprint/209_hufangzhou_24585' into 'master'
* Fix bug #24585.

See merge request easycorp/zentaopms!4249
2022-06-30 02:57:52 +00:00
hufangzhou
f13b0db32e * Fix bug #24585. 2022-06-30 10:44:46 +08:00
hufangzhou
cf73860013 * Fix bug #24545. 2022-06-30 10:09:19 +08:00
liumengyi
b920b76042 * Code review. 2022-06-24 14:20:33 +08:00
liumengyi
3cbc219ad5 * Code review. 2022-06-24 14:18:31 +08:00
liumengyi
5b84f06092 * Fix bug #24214. 2022-06-24 09:10:05 +08:00
liumengyi
46bbcc74f4 * Fix bug #24179. 2022-06-23 13:24:00 +08:00
tianshujie
e2669481c7 * Added German and French. 2022-06-22 15:28:45 +08:00
王怡栋
03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
sunjun
2514a53fde fixbug 2022-06-22 06:03:07 +00:00
sunjun
c883c3b7a3 fixbug 2022-06-22 05:58:31 +00:00
sunjun
b0fbce7fd4 *Finish task #57888 2022-06-22 05:48:13 +00:00
liumengyi
8c229fa6bc * Finish task #58063. 2022-06-22 08:59:29 +08:00
tianshujie
7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
wangyidong
541f9dd0d1 * code for bug #58034. 2022-06-21 14:53:45 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
zhujinyong
7f95ea2c09 * Check unique for api doc. 2022-06-06 09:24:44 +08:00
wangyidong
d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
孙广明
57e139b2a4 Merge branch 'sprint/scx_testcase' into 'master'
Sprint/scx testcase

See merge request easycorp/zentaopms!3295
2022-05-16 09:04:32 +00:00
hufangzhou
3680af6833 * Finish task #53673. 2022-05-11 10:05:09 +08:00
宋辰轩
b21e8bf480 * Modify. 2022-05-10 15:21:06 +08:00
liyuchun
e74e7c90a1 * Add unitcase. 2022-05-09 07:43:07 +00:00
hufangzhou
84d3b884e3 * Format the code. 2022-04-28 17:31:27 +08:00
hufangzhou
61ef0dc274 * Fix bug #15662. 2022-04-28 17:28:45 +08:00
朱金勇
b7ca5dc86c Merge branch 'sprint/fixbug_hufangzhou_15582' into 'master'
* Fix bug #15582.

See merge request easycorp/zentaopms!3177
2022-04-28 03:04:35 +00:00
hufangzhou
bad39397ce * Fix bug #15582. 2022-04-28 10:56:13 +08:00
hufangzhou
e550e0ded6 * Fix bug #16114. 2022-04-28 08:42:56 +08:00
hufangzhou
4f4ab1e720 * Fix bug #15831. 2022-04-27 17:00:15 +08:00
hufangzhou
8907f7c898 * Fix bug #15599. 2022-04-27 15:53:18 +08:00
朱金勇
a78a1d6bff Merge branch 'sprint/fixbug_hufangzhou_18866' into 'master'
* Fix bug #18866.

See merge request easycorp/zentaopms!3157
2022-04-27 07:14:51 +00:00
hufangzhou
ec6e3e5a42 * Fix bug #18866. 2022-04-27 14:39:22 +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
朱金勇
1a99c23927 Merge branch 'sprint/fixbug_hufangzhou_15612' into 'master'
Fix bug #15612.

See merge request easycorp/zentaopms!3150
2022-04-27 05:30:48 +00:00
hufangzhou
e9ef78de3d Fix bug #15612. 2022-04-27 13:11:35 +08:00
hufangzhou
0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
朱金勇
aac46fee79 Merge branch 'sprint/fixbug_hufangzhou_22016' into 'master'
* Fix bug #22016.

See merge request easycorp/zentaopms!3138
2022-04-27 00:26:24 +00:00
hufangzhou
21197a36da * Fix bug #22016. 2022-04-26 16:12:26 +08:00
hufangzhou
89a4f83c41 * Fix bug #17203. 2022-04-26 15:45:30 +08:00
朱金勇
6cb9d2ddbe Merge branch 'sprint/fixbug_hufangzhou_15645' into 'master'
* Fix bug #15645.

See merge request easycorp/zentaopms!3129
2022-04-26 07:08:35 +00:00
hufangzhou
681850b969 * Fix bug #15645. 2022-04-26 14:10:36 +08:00
hufangzhou
6a42dabd32 * Fix bug #15954. 2022-04-26 13:44:14 +08:00
hufangzhou
2048dfa232 * Fix bug #15655. 2022-04-26 10:36:33 +08:00
zenggang
8b54060132 * Fix bug#15658,15644 2022-04-25 09:11:13 +00:00