wangzemei
|
01a12c95d9
|
* fix bug #283950
|
2022-10-11 16:42:59 +08:00 |
|
sunguangming
|
f6e2d7d272
|
* Change project hasproduct to execution hasproduct.
|
2022-10-11 16:34:49 +08:00 |
|
王怡栋
|
238226a7f0
|
Merge branch 'zentaopms_239_fix_mutual_test' into 'zentaopms_239'
* Fix bugs of mutual_test.
See merge request easycorp/zentaopms!5720
|
2022-10-11 08:23:13 +00: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
|
a8ffa986c0
|
* Fix bug of create default sprint.
|
2022-10-11 15:25:06 +08:00 |
|
sunguangming
|
587d8285d9
|
* Fix bug #28389.
|
2022-10-11 14:54:59 +08:00 |
|
tianshujie
|
0b49c19866
|
* Fix bug #28451.
|
2022-10-11 14:53:01 +08:00 |
|
李玉春
|
bd488328ab
|
Merge branch 'sprint/gfl_71875' into 'master'
* finish task 71875
See merge request easycorp/zentaopms!5716
|
2022-10-11 06:52:12 +00:00 |
|
李玉春
|
30238c658f
|
Merge branch 'sprint/247_tianshujie_71888' into 'master'
Sprint/247 tianshujie 71888
See merge request easycorp/zentaopms!5723
|
2022-10-11 06:51:55 +00:00 |
|
wangzemei
|
740e144707
|
* fix bug 28388 && 28395
|
2022-10-11 14:05:33 +08:00 |
|
tianshujie
|
202be34c31
|
* Finish task #71888.
|
2022-10-11 13:50:58 +08:00 |
|
daitingting
|
f5d987b55d
|
* Fix bugs of mutual_test.
|
2022-10-11 05:17:07 +00:00 |
|
wangzemei
|
b14dd4c6ed
|
* fix 28426
|
2022-10-11 12:11:22 +08:00 |
|
liugang
|
bedad1aab6
|
* Fix bug #28391.
|
2022-10-11 10:22:26 +08:00 |
|
liugang
|
d808b28d2e
|
* Hide the plan field on the linkStory page of the execution module.
|
2022-10-11 10:14:04 +08:00 |
|
liugang
|
3057b55576
|
* Fix bug #28392.
|
2022-10-11 10:13:36 +08:00 |
|
曹延义
|
8f73e4d340
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gfl_71875
|
2022-10-11 08:36:05 +08:00 |
|
王怡栋
|
c943f77c80
|
Merge branch 'zentaopms_239' into 'zentaopms_239_task#71585'
# Conflicts:
# module/testtask/model.php
|
2022-10-10 09:22:39 +00:00 |
|
guofeilong
|
3d563b958b
|
* finish task 71875
|
2022-10-10 09:21:54 +00:00 |
|
王怡栋
|
abcdde7ea3
|
Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix systemMode bug.
See merge request easycorp/zentaopms!5710
|
2022-10-10 09:18:50 +00:00 |
|
李玉春
|
923718371a
|
Merge branch 'sprint/cyy_71903' into 'master'
* Finish task #71903.
See merge request easycorp/zentaopms!5707
|
2022-10-10 08:44:41 +00:00 |
|
田淑杰
|
f6d750c01a
|
Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
# module/my/view/task.html.php
# www/theme/default/style.css
|
2022-10-10 08:43:18 +00:00 |
|
曹延义
|
68274e57c2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_71903
|
2022-10-10 16:35:45 +08:00 |
|
tianshujie
|
ff6c9221cb
|
* Finish task #71904.
|
2022-10-10 16:14:45 +08:00 |
|
李玉春
|
333f75d6dc
|
Merge branch 'sprint/cyy_71874' into 'master'
Sprint/cyy 71874
See merge request easycorp/zentaopms!5703
|
2022-10-10 08:09:39 +00:00 |
|
曹延义
|
0bff4d85fd
|
* Fix bug #28360.
|
2022-10-10 15:49:57 +08:00 |
|
wangyuting2
|
aa9bc2b8ec
|
* Fix systemMode bug.
|
2022-10-10 07:32:11 +00:00 |
|
liugang
|
f0d3d3e70f
|
* Fix bug #27897.
|
2022-10-10 14:57:30 +08:00 |
|
daitingting
|
f8259297b7
|
* Finish task #71585,#71586,#71587.
|
2022-10-10 05:46:31 +00:00 |
|
liugang
|
4512eaf2b4
|
* Fix bug #27899.
|
2022-10-10 13:40:04 +08:00 |
|
tianshujie
|
e9ebed5a6e
|
* Finish task #71904.
|
2022-10-10 11:28:31 +08:00 |
|
曹延义
|
20a77c4811
|
* Modify language.
|
2022-10-10 11:05:49 +08:00 |
|
王怡栋
|
97f4bdac55
|
Merge branch 'zentaopms_239_task#71580' into 'zentaopms_239'
* Finish task #71580,#71581,#71582,#71583,#71584.
See merge request easycorp/zentaopms!5694
|
2022-10-10 03:01:48 +00:00 |
|
guofeilong
|
150beef775
|
* finish task *71875
|
2022-10-10 02:51:03 +00:00 |
|
曹延义
|
aeb4bef5bc
|
* Modify execution page style.
|
2022-10-10 10:33:40 +08:00 |
|
李玉春
|
635693bef4
|
Merge branch 'sprint/244_wzm_70007' into 'master'
* finish task 70007 & 71896
See merge request easycorp/zentaopms!5689
|
2022-10-10 00:56:52 +00:00 |
|
wangyidong
|
059cf9a8af
|
* code for task #71608.
|
2022-10-09 17:24:56 +08:00 |
|
daitingting
|
39064a3e22
|
* Finish task #71580,#71581,#71582,#71583,#71584.
|
2022-10-09 08:22:27 +00:00 |
|
wangzemei
|
f0c3b79018
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71878
|
2022-10-09 15:42:16 +08:00 |
|
wangzemei
|
ec7844f035
|
* compatible datatable style
|
2022-10-09 15:42:00 +08:00 |
|
wangzemei
|
4a656cf175
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007
|
2022-10-09 15:19:48 +08:00 |
|
李玉春
|
7f1d674a73
|
Merge branch 'sprint/cyy_71876' into 'master'
Sprint/cyy 71876
See merge request easycorp/zentaopms!5683
|
2022-10-09 06:50:04 +00:00 |
|
曹延义
|
dc6b265503
|
* Adjust codes.
|
2022-10-09 14:48:37 +08:00 |
|
曹延义
|
0b55fb4095
|
* Adjust code.
|
2022-10-09 14:27:50 +08:00 |
|
曹延义
|
b30fc65ded
|
* Finish task #71876.
|
2022-10-09 13:26:43 +08:00 |
|
王怡栋
|
05d4c462a7
|
Merge branch 'master_28214' into 'master'
*Fix bug #28214.
See merge request easycorp/zentaopms!5659
|
2022-10-09 05:09:28 +00:00 |
|
王怡栋
|
1f68a6b1e7
|
Merge branch 'master_xieqiyu_26098' into 'master'
* Fix bug#26098.
See merge request easycorp/zentaopms!5658
|
2022-10-09 05:08:34 +00:00 |
|
曹延义
|
84e1f0295d
|
* Code for task #71876.
|
2022-10-09 11:15:44 +08:00 |
|
曹延义
|
bff2bdcbb3
|
* Finish task #71877.
|
2022-10-09 10:07:41 +08:00 |
|
wangzemei
|
ed225f525d
|
* finish task #71878
|
2022-10-09 10:06:57 +08:00 |
|