Commit Graph

319 Commits

Author SHA1 Message Date
tianshujie
6ca88e549e * Fix bug #19046. 2022-01-27 10:25:44 +08:00
songchenxuan
8927059720 *Code for code review. 2022-01-06 13:08:46 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
songchenxuan
ea34d06dad *Fix task bug. 2021-12-30 14:51:33 +08:00
孙广明
aa60c24da5 * Fix code comment. 2021-12-29 17:19:31 +08:00
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
songchenxuan
051e3968af *Fix classic mode branch bug. 2021-12-28 11:02:11 +08:00
songchenxuan
a5a0848a1c *Fix classic mode branch bug. 2021-12-28 09:56:21 +08:00
songchenxuan
a90fc7c4c0 *Fix classic mode branch bug. 2021-12-27 16:47:44 +08:00
李玉春
f0f0325a8d Merge branch 'master' into 'sprint/174_xieqiyu_45015'
# Conflicts:
#   module/testcase/control.php
2021-12-03 05:07:19 +00:00
xieqiyu
e61c87a6ff * Code for task#45015. 2021-12-03 10:49:42 +08:00
xieqiyu
6057c36ce5 * Add judgment on null parameters. 2021-12-02 14:12:17 +08:00
xieqiyu
85ef3a9849 * Fix option menu in doc and caselib. 2021-12-01 10:49:44 +08:00
xieqiyu
4c0eb137da * Finish task#45004. 2021-11-30 19:43:49 +08:00
tianshujie
7cff062d2e * Adjust code style of model tree. 2021-11-30 17:29:05 +08:00
tianshujie
be15ba6045 * Fix the module tree under execution. 2021-11-30 17:24:11 +08:00
hufangzhou
4736e3a01c * Solve the problem of mutual testing for task #45085. 2021-11-30 09:59:14 +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
zhujinyong
e86878e5c6 * Fix tree of product and branch. 2021-11-25 14:49:15 +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
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
hufangzhou
c1f2dfd857 * Modify the module tree in project story. 2021-11-21 16:10:21 +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
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
王怡栋
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
holan20180123
3b1933ca43 * Fix bug #14009. 2021-08-03 16:06:20 +08:00
holan20180123
51af4491d9 * Return id when create object by API. 2021-05-12 17:33:59 +08:00
hufangzhou
2f8fa6f91a * Adjust the project story tree link. 2021-04-16 14:37:01 +08:00
wangyidong
0dc863da3a * change for set cookie secure. 2021-04-07 17:44:25 +08:00
tianshujie98
b7eba90982 * Fix an error. 2021-04-02 10:51:41 +08:00
Yagami
6997ad43af * Fix bug. 2021-03-31 14:28:14 +08:00
hufangzhou
8270948126 * Fix a bug. 2021-03-31 11:35:10 +08:00
Yagami
ecee971a21 * Fix bug #11571. 2021-03-25 15:50:26 +08:00