Commit Graph

1006 Commits

Author SHA1 Message Date
Yagami
90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
leiyong
ac5d658933 * Adjust getExecutionPairsByProduct method. 2020-11-24 15:58:26 +08:00
leiyong
8cead79b18 * Adjust getProjectPairs to getExecutionPairsByProduct. 2020-11-24 10:40:18 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
z
351b562cf5 * fix bug #3695. 2020-11-20 14:21:30 +08:00
leiyong
b919cc45b2 * Adjust getProductPairsByProject to getProductByProject. 2020-11-19 09:07:31 +08:00
qiyu-xie
f0e8bee379 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-18 16:38:18 +08:00
Yagami
460947ebce * Change toString to zui function. 2020-11-18 15:33:23 +08:00
qiyu-xie
0def3e0b08 * Finish task#8419. Fix bug. 2020-11-18 14:01:27 +08:00
holan20180123
d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
holan20180123
aa54b07ab3 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-17 16:25:08 +08:00
qiyu-xie
ca7070b2cb * Finish task#8419. 2020-11-17 16:22:15 +08:00
holan20180123
cb8dc1bc3b * Finish task #8389. 2020-11-17 16:11:06 +08:00
holan20180123
4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
tianshujie98
b96129db79 * Finish task #8420. 2020-11-17 14:42:50 +08:00
leiyong
03326e0d24 * Fix error. 2020-11-17 14:23:07 +08:00
holan20180123
bb34dfe79b * Finish task #8378. 2020-11-17 14:04:50 +08:00
tianshujie98
877dc32f88 * Finish task #8393. 2020-11-17 13:33:20 +08:00
holan20180123
97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
leiyong
3272d0c454 * Adjust the test module related code. 2020-11-16 14:50:04 +08:00
leiyong
3cb8149563 * Finish task#8313. 2020-11-13 14:02:11 +08:00
holan20180123
3ae9a9189e * Finish task #8194. 2020-11-12 16:25:23 +08:00
holan20180123
a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123
15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
holan20180123
159cd5c41d * Finish task #8194. 2020-11-10 10:34:08 +08:00
holan20180123
07d0f7c6d8 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-11-06 14:01:58 +08:00
holan20180123
09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
leiyong
579891b10e * Fix bug. 2020-11-06 11:48:29 +08:00
hufangzhou
981f8b25ad * Adjust the indent of the code. 2020-11-05 17:39:08 +08:00
hufangzhou
76a793ab03 * Fix a bug. 2020-11-05 16:05:03 +08:00
leiyong
98f37169e1 * Adjust code. 2020-11-05 13:45:48 +08:00
qiyu-xie
7a8e3bec38 * Finish task#8207. 2020-11-04 14:31:10 +08:00
tianshujie98
b400af6ffc * Finish task #8262. 2020-11-04 14:07:15 +08:00
tianshujie98
8be947a1e8 * Finish task #8195. 2020-11-03 10:52:38 +08:00
Yagami
227d6c8211 * Adjust code detail. 2020-11-02 14:31:47 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
tianshujie98
f6669285c6 * Edit comment. 2020-10-28 13:19:29 +08:00
tianshujie98
ef7c4ddd72 * Edit comment. 2020-10-28 13:18:21 +08:00
tianshujie98
8d3bb923e6 * Finish task #12965. 2020-10-28 09:46:44 +08:00
tianshujie98
e52a724b35 * Finish task #12965. 2020-10-28 09:41:05 +08:00
tianshujie98
80307f2457 * Finish task #12956. 2020-10-28 09:09:58 +08:00
tianshujie98
b42307a2ad * Finish task #12956. 2020-10-28 09:05:35 +08:00
Yagami
d6b59ef125 * Fix bugs. 2020-10-21 16:01:39 +08:00
tianshujie98
9cd4ea9835 * Finish task #12818. 2020-10-21 14:39:22 +08:00
tianshujie98
777956a658 * Finish task #12818. 2020-10-21 14:12:36 +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
tianshujie98
f674ff12ef * Add space. 2020-10-14 13:40:53 +08:00
tianshujie98
ff7e706d4d * Delete blank lines. 2020-10-14 13:38:44 +08:00
tianshujie98
f996382d2b * Adjust code style. 2020-10-14 13:37:41 +08:00