Commit Graph

654 Commits

Author SHA1 Message Date
songchenxuan
91c8826f45 * Fix bug 16377 2021-11-18 14:08:21 +08:00
李玉春
e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00
xieqiyu
7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
xieqiyu
84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
xieqiyu
47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
songchenxuan
59f3ac6661 * Finish task 44490 2021-11-17 17:42:10 +08:00
songchenxuan
8cd05d8301 * Finish task 44490. 2021-11-17 16:22:43 +08:00
songchenxuan
1dab48045e * Finish task 44490. 2021-11-17 15:39:30 +08:00
李玉春
293f76a1ed Merge branch 'sprint/170_songchenxuan_44601' into 'sprint/170'
* Fix bug 13756

See merge request easycorp/zentaopms!483
2021-11-17 05:25:38 +00:00
李玉春
87597eccbb Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170'
* Finish task #44493,44494.

See merge request easycorp/zentaopms!477
2021-11-17 02:33:33 +00:00
mayue
0dd5dd1955 * Finish task #44493,44494. 2021-11-17 10:27:02 +08:00
mayue
8b8c4fe180 * Finish task #44493,44494. 2021-11-17 09:30:34 +08:00
songchenxuan
4b42cb22a4 * Fix bug 13756 2021-11-17 09:26:02 +08:00
mayue
102561019d * Finish task #44493,44494. 2021-11-16 18:20:35 +08:00
mayue
7d496eebc2 * Finish task #44493,44494. 2021-11-16 17:05:03 +08:00
songchenxuan
f262ca14d1 *Finish task 44492 2021-11-16 15:23:13 +08:00
songchenxuan
f495a6cb62 * Finish task 44492 2021-11-16 14:46:14 +08:00
tianshujie
b175a5057b * Fix bug #16293. 2021-11-15 16:13:51 +08:00
xieqiyu
cce14cef80 * Fix bug#16188. 2021-11-14 10:47:12 +08:00
hufangzhou
8352d145f5 * Deal with the branch is empty. 2021-11-12 15:22:47 +08:00
hufangzhou
d160b6b0f5 * Fix bug #16219. 2021-11-12 10:07:28 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
tianshujie
77da777064 * Finish task #43893. 2021-11-05 15:46:52 +08:00
tianshujie
6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
root
1c4ceda168 Fix bug 15784 2021-11-01 17:19:25 +08:00
root
1aac9130a4 Fix bug 15784 2021-11-01 17:16:28 +08:00
root
69287cea22 Fix bug 15784 2021-11-01 17:06:51 +08:00
root
8101f661ab Fix bug 15784 2021-11-01 17:01:13 +08:00
root
01656fd005 Fix bug 15784 2021-11-01 16:59:27 +08:00
root
7f9028691c Fix bug 15784 2021-11-01 16:20:56 +08:00
zenggang
4c800f938a * Adjust code 2021-10-15 06:09:32 +00:00
zenggang
cae0dba070 * Fix bug15438 for classic mode 2021-10-14 09:32:03 +00:00
hufangzhou
52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
tianshujie
70358073e3 * Fix bug #42594. 2021-09-16 11:33:53 +08:00
tianshujie
441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
tianshujie
626c95b095 * Fix bug #15162. 2021-09-14 17:24:42 +08:00
tianshujie
87397bf86f * Fix bug #15138. 2021-09-14 11:23:56 +08:00
孙广明
1c9d3d38c9 * Fix code error. 2021-09-01 13:05:09 +08:00
zhujinyong
664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
tianshujie
89c43c9a63 * Modify the return link of the task. 2021-08-30 15:19:47 +08:00
tianshujie98
9ed732fd9e * Finish task #41536. 2021-08-18 15:02:27 +08:00
tianshujie98
eb513ffa6e * Finish task #41534. 2021-08-18 15:00:50 +08:00
leiyong
63038c836c * Finish task#40904. 2021-08-10 15:31:33 +08:00
qiyu-xie
506d2ec05f * Fix bug#14091. 2021-08-09 14:32:14 +08:00
wangyidong
656e13e3b9 * adjust for construct function. 2021-08-05 17:34:04 +08:00
wangyidong
87a04e4857 * finish task #40900. 2021-08-04 16:58:15 +08:00
wangyidong
57e68d9f4d * fix for view bug in modal. 2021-08-03 16:32:23 +08:00
hufangzhou
572a6c8647 * Finish task #40800. 2021-08-03 09:59:48 +08:00
wangyidong
bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong
0a131fe8db * finish task #40432. 2021-07-29 15:12:10 +08:00