Commit Graph

724 Commits

Author SHA1 Message Date
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
hufangzhou
4736e3a01c * Solve the problem of mutual testing for task #45085. 2021-11-30 09:59:14 +08:00
reneeteng
bd2b8ab2a6 * Edit lang file. 2021-11-29 16:31:18 +08:00
孙广明
8d9fb81d9d Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
#   module/story/model.php
2021-11-29 07:26:45 +00:00
hufangzhou
bf1ca5893e * Modify the url when refresh the tree browse in project module. 2021-11-29 15:20:48 +08:00
hufangzhou
0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
xieqiyu
763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
hufangzhou
0e67779504 * Modify the branch switcher in qa menu. 2021-11-25 14:53:22 +08:00
zhujinyong
e86878e5c6 * Fix tree of product and branch. 2021-11-25 14:49:15 +08:00
hufangzhou
e431847c58 * Add the branch switcher in tree browse page. 2021-11-25 12:22:56 +08:00
zhujinyong
0d520d03d3 Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170_package_bug 2021-11-23 19:47:10 +08:00
zhujinyong
80010bb881 * Adjust batchEdit of story. 2021-11-23 19:46:35 +08:00
tianshujie
d8d277842b * Fix bug #16549. 2021-11-23 17:38:43 +08:00
xieqiyu
e7578880a7 * Fix bug#16507. 2021-11-22 16:26:36 +08:00
xieqiyu
e0d73b8574 * Fix bug#16542. 2021-11-22 15:59:41 +08:00
hufangzhou
b924509817 * Remove the unused code. 2021-11-22 14:52:20 +08:00
hufangzhou
5492d27798 * Fix bug #16512. 2021-11-22 13:46:02 +08:00
zhengrunyu
293c0f12e2 *Finish task #16507. 2021-11-22 10:33:00 +08:00
zhengrunyu
43fab0b8d3 *Finish task #16507. 2021-11-22 10:27:12 +08:00
hufangzhou
c1f2dfd857 * Modify the module tree in project story. 2021-11-21 16:10: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
84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
tianshujie
f849667ce3 * Fix bug #16296. 2021-11-15 14:36:48 +08:00
hufangzhou
12054383a6 * Fix bug #16179. 2021-11-15 09:28:58 +08:00
李玉春
9e74d7204a Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170'
* Fix the bugs.

See merge request easycorp/zentaopms!447
2021-11-15 01:05:55 +00:00
hufangzhou
e441e4a28d * Fix the bugs. 2021-11-15 08:50:05 +08:00
xieqiyu
cce14cef80 * Fix bug#16188. 2021-11-14 10:47:12 +08:00
王怡栋
1dd4bbc079 * fix bug for get tree menu in project view. 2021-11-12 10:35:13 +08:00
hufangzhou
a8f6836d46 * Remove the unused code. 2021-11-11 16:30:41 +08:00
hufangzhou
4163d17335 * Fix bug #16169, bug#16179. 2021-11-11 15:31:37 +08:00
hufangzhou
d279c5d7d7 * Finish task #43891. 2021-11-05 18:47:39 +08:00
zhouxin
c3558d6b75 Finish task #43877. 2021-11-04 13:12:17 +08:00
liyuchun
fce0f3aafa * Fix bug #15592. 2021-10-20 16:04:44 +08:00
liyuchun
3f279a9ec1 * Fix bug #15674. 2021-10-20 15:00:11 +08:00
liyuchun
b32541f20f * Fix bug #15639. 2021-10-19 20:32:06 +08:00
hufangzhou
dd618cf53e * Fix bug #15637. 2021-10-19 18:20:35 +08:00
王怡栋
6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
thanatos
c0e6b93d3f fix bug 2021-09-26 13:33:22 +08:00
thanatos
0d116021db finish api doc. first commit 2021-09-16 16:10:49 +08:00
tianshujie
6cb8ca5908 * Fix bug #14948. 2021-09-09 13:33:14 +08:00
zhujinyong
664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
tianshujie
1765f12338 * Modify the problem of the product module return link. 2021-08-30 10:24:25 +08:00
王怡栋
0a9b1f42ac * fix bug #14682. 2021-08-27 10:20:27 +08:00
holan20180123
f26c989ed2 * Adjust code style in tree module. 2021-08-18 13:44:16 +08:00
wangyidong
fd8d02c7df * add new version and upgrade. 2021-08-04 14:18:09 +08:00
holan20180123
3b1933ca43 * Fix bug #14009. 2021-08-03 16:06:20 +08:00
tianshujie98
c319f176c0 * Code modified when submitting code review. 2021-08-03 08:15:12 +08:00
Hao Sun
8de42e5bca * add space between icon and text. 2021-07-30 14:38:39 +08:00
wangyidong
e620c34202 * fix bug #13891 in master branch. 2021-07-29 17:02:22 +08:00
holan20180123
ca73612e3a * Fix bug #13825. 2021-07-29 14:04:34 +08:00