Commit Graph

287 Commits

Author SHA1 Message Date
leiyong
5ef321f149 * Adjust code logic. 2020-11-25 10:59:41 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami
6481a780c3 * Fix doc error. 2020-11-20 15:39:21 +08:00
leiyong
9073099a7e * Modify executionPairs to executionIdList. 2020-11-20 14:36:10 +08:00
Yagami
90df7cd4dc * Merge code. 2020-11-20 13:09:47 +08:00
hufangzhou
8d3ce4acdd Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-20 09:07:21 +08:00
hufangzhou
f49e756aca * Fix a bug. 2020-11-20 09:07:01 +08:00
tianshujie98
c9a91a432a * Change method name. 2020-11-20 08:29:35 +08:00
holan20180123
3f752243f6 * Method renaming 'getPairs' to 'getExecutionPairs'. 2020-11-19 16:14:04 +08:00
holan20180123
7c8ec20264 * Rename project to execution. 2020-11-19 15:22:58 +08:00
Yagami
aae58fea38 * Adjust code details. 2020-11-19 10:41:37 +08:00
leiyong
b919cc45b2 * Adjust getProductPairsByProject to getProductByProject. 2020-11-19 09:07:31 +08:00
holan20180123
4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123
97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
leiyong
d86cd9420c * Modify document query error data. 2020-11-17 09:43:41 +08:00
leiyong
caba144ce0 * Adjust code. 2020-11-16 17:47:21 +08:00
tianshujie98
b13a57d82b * Adjust code style. 2020-11-13 16:44:43 +08:00
leiyong
90f9182ddc * Adjust the doc module. 2020-11-13 09:58:53 +08:00
leiyong
1065817f17 * Adjust the doc module code. 2020-11-12 18:25:05 +08:00
holan20180123
4e69741e70 * Finish task #8194. 2020-11-12 14:18:08 +08:00
tianshujie98
3bc0854f51 * Adjust code style. 2020-11-06 14:59:05 +08:00
tianshujie98
8a15ec21d9 * Fix bug. 2020-11-05 15:52:31 +08:00
tianshujie98
1db241cb43 * Fix bug. 2020-11-05 15:30:33 +08:00
tianshujie98
b400af6ffc * Finish task #8262. 2020-11-04 14:07:15 +08:00
tianshujie98
a2a50698ee * Finish task #8199. 2020-11-03 17:25:01 +08:00
leiyong
f817727ef1 * Fix bug. 2020-11-03 13:31:01 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
Yagami
b4ea03a2fd * Fix details. 2020-10-29 14:04:46 +08:00
leiyong
6af8ff9971 * modulePageActions is modified to TRActions. 2020-10-21 09:17:33 +08:00
leiyong
c1e6e6a82c modulePageActions is modified to TRActions. 2020-10-21 09:11:19 +08:00
z
78983014a3 * finish task #8066. 2020-10-09 09:15:46 +08:00
z
5599fd31cc * finish task #7955. 2020-09-25 14:17:03 +08:00
Yagami
662c7f4545 * Fix doc bug. 2020-09-25 13:27:46 +08:00
z
853fafe717 * finish task 7924. 2020-09-18 16:20:14 +08:00
holan20180123
ebc593c1c6 * Finish task #7924. Fix bug #3446. 2020-09-18 13:13:53 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
holan20180123
1111520481 * Adjust doc browse. 2020-09-03 17:34:24 +08:00
Yagami
bfbd856b41 * Fix comment and code style. 2020-09-03 15:13:37 +08:00
Yagami
2045857098 * Finish task #7728. 2020-09-01 14:28:26 +08:00
holan20180123
7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
holan20180123
1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
qiyu-xie
21fe8daa0d Fix bug #3338 #3342 2020-08-10 16:22:10 +08:00
Yagami
96c494098a * Fix doc module. 2020-07-31 11:14:32 +08:00
chenfei
4475db6ccc * Finish task #7420. 2020-07-14 11:27:15 +08:00
sgm0422
09c2a265f4 * Delete program in link. 2020-06-12 17:16:55 +08:00
zhaohaibo
e9b2a4bc32 add param $this->session->program 2020-05-26 13:37:02 +08:00
chenfei
c7395c8b44 * Merge zentaopms_cmmi to zentaopms_12.0.1 2020-02-17 14:02:00 +08:00
leiyong
7a56b4506d Fix bug #2929,#2932,#2943 2020-02-05 15:54:29 +08:00
wangyidong
e88f364a0a * finish task #6824. 2020-02-05 11:03:46 +08:00