Commit Graph

111 Commits

Author SHA1 Message Date
lanzongjun
d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
lanzongjun
d07a8a3e37 * Fix Bug #78695 2022-12-09 13:44:48 +08:00
wangyuting
6a445b8a42 * Fix bug #29566. 2022-11-25 01:48:56 +00:00
lanzongjun
675891f136 * Fix Bug #30028 2022-11-24 14:26:27 +08:00
xieqiyu
c35c8bbcad * Fix bug#30036. 2022-11-21 14:20:03 +08:00
xieqiyu
bdb570c00e * Fix bug#29461. 2022-11-21 09:43:56 +08:00
tianshujie
6faaaf865c * Fix bug #29847. 2022-11-18 14:24:41 +08:00
lanzongjun
ccbf2ee9eb * Fix task #76414 2022-11-18 09:59:39 +08:00
王怡栋
ab5e0d9b4a Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   module/execution/control.php
2022-11-15 08:26:48 +00:00
孙广明
093069f5eb Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.

See merge request easycorp/zentaopms!6148
2022-11-15 08:13:37 +00:00
lanzongjun
df7841c7b7 * finish task #75920 2022-11-15 15:50:05 +08:00
lanzongjun
4d4b1565f4 * finish task #75923#75924 2022-11-15 10:23:54 +08:00
lanzongjun
9cc5139a08 * finish task #75919 2022-11-15 09:53:24 +08:00
xieqiyu
f86b9b0b17 * Fix bug#29440. 2022-11-15 09:51:31 +08:00
wangyuting
9627f33b3b * Fix bug #29711. 2022-11-14 08:37:07 +00:00
Yagami
d0abde8930 * Code for zentaopms_250 bug. 2022-10-21 17:31:32 +08:00
Yagami
187d3b8ca4 * Finish task #72674. 2022-10-19 15:36:15 +08:00
Yagami
c330b6bc06 * Finish task #72673. 2022-10-19 13:07:04 +08:00
Yagami
33bb2e6082 * Finish task #72672. 2022-10-19 10:47:30 +08:00
Yagami
6788ef5793 * Finish task #72671. 2022-10-19 09:23:59 +08:00
Yagami
b99203caa6 * Finish task #72678. 2022-10-18 11:23:12 +08:00
liugang
657b36b3dc * Hide the link and unlink buttons if the execution is a none-product and single one. 2022-10-11 15:57:02 +08:00
liugang
bedad1aab6 * Fix bug #28391. 2022-10-11 10:22:26 +08:00
liugang
3057b55576 * Fix bug #28392. 2022-10-11 10:13:36 +08:00
sunguangming
7efbb7d6ca * Fix bug #28227. 2022-10-08 17:02:01 +08:00
wangyidong
42e85921d6 * code for task #69715. 2022-09-21 09:19:47 +08:00
liumengyi
3da9fdd18c * Fix bug #26916. 2022-08-26 09:49:54 +08:00
tianshujie
93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
wangyuting2
fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
chaideqing
3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
chaideqing
69f20c1205 * replace xhtml to html when click card 2022-07-13 10:54:12 +08:00
zhouxudong
c568a46744 * Fix bug #22964. 2022-07-01 07:20:01 +00:00
zhouxudong
7fce4137c5 * Fix bug #24176. 2022-06-23 07:46:34 +00:00
mayue
6c975adff8 * Add some code. 2022-06-22 17:21:55 +08:00
孙广明
34ddc497ba Merge branch 'zentaopms_207' 2022-06-22 08:33:17 +08:00
hufangzhou
adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
mayue
d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
sunjun
3ab3059ed3 sprint_204_57097 2022-06-14 04:07:06 +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
zhouxin
cda4d7e809 * Adjust code. 2022-06-01 08:56:49 +00:00
zhouxin
2fcd623c62 * Adjust code. 2022-06-01 07:48:32 +00:00
zhouxin
bc803e56c8 * Finish task #55676. 2022-06-01 07:34:04 +00:00
李玉春
10691aa653 Merge branch 'fixbug_sunjun_22556' into 'master'
Fixbug sunjun 22556

See merge request easycorp/zentaopms!3553
2022-05-25 02:28:26 +00:00
zenggang
7d5615ffac * Adjust story sort default to desc 2022-05-24 09:10:28 +00:00
sunjun
838a8ccb95 fixbug_sunjun_22556 2022-05-24 07:36:58 +00:00
sunjun
29c329e8d4 fixbug_sunjun_22556 2022-05-24 01:51:00 +00:00
sunjun
fa22cfdd6a fixbug_sunjun_22556 2022-05-24 01:46:53 +00:00
zenggang
de835ecb3e * Fix bug#22555 2022-05-19 08:08:39 +00:00
sunjun
3a60274cf6 *Fixbug_sunjun_19732 2022-04-15 14:23:08 +08:00