Commit Graph

274 Commits

Author SHA1 Message Date
holan20180123
b95a5ccdf0 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 13:15:49 +08:00
holan20180123
62843dd5a0 * Finish task #36756. 2021-03-17 13:15:36 +08:00
leiyong
9df4cc58b9 * Adjust index module. 2021-03-17 10:09:28 +08:00
leiyong
2316458960 * Adjust menu. 2021-03-11 14:50:38 +08:00
holan20180123
e7a2c41199 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-11 13:23:10 +08:00
holan20180123
07fda9e004 * Finish task #36447. 2021-03-11 13:22:52 +08:00
hufangzhou
4d6c389c24 * Finish task #36446. 2021-03-11 11:40:23 +08:00
Yagami
d1e6e9265b * Rename project session to PRJ. 2021-03-09 15:29:06 +08:00
Yagami
0f1492cad9 * Fix bug and execution menu. 2021-03-09 10:05:34 +08:00
wangyidong
a849cfe72c * fix error. 2021-03-05 10:11:38 +08:00
wangyidong
59ed6b990e * Adjust code for testtask. 2021-03-04 16:01:28 +08:00
hufangzhou
75abf393f0 * Finish task #36365. 2021-03-02 10:35:52 +08:00
holan20180123
3e5a2546d8 * Finish task #36348. 2021-03-02 09:49:37 +08:00
hufangzhou
412d8df328 * Adjust the code. 2021-02-25 13:38:43 +08:00
Yagami
5c5bdc213e * Adjust code style. 2021-02-24 15:02:43 +08:00
hufangzhou
6285ae1b7a * Adjust the testtask browse page in qa. 2021-02-24 14:20:54 +08:00
leiyong
13a304980d * Finish task#36938. 2021-02-24 10:31:20 +08:00
Yagami
8b5ac13916 * Code for task #36042. 2021-02-23 17:15:12 +08:00
leiyong
20075135ab * Finish task#36038. 2021-02-23 14:36:54 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
wangyidong
b12d189779 * Merge from github. 2021-01-26 13:35:21 +08:00
sgm0422
670ea7c68a * Fix menu. 2021-01-03 13:56:11 +08:00
leiyong
0c4afee4ee * Finish task#8865. 2021-01-01 11:34:11 +08:00
leiyong
1729b8ff2f * Adjust todo related code. 2020-12-28 10:56:46 +08:00
leiyong
db18b9b3e9 * Finish task#8781. 2020-12-24 22:16:49 +08:00
Yagami
8e2ba0762e * Fix bug. 2020-12-24 09:49:27 +08:00
holan20180123
2688718ee0 * Finish task #8673. 2020-12-17 09:26:35 +08:00
holan20180123
85080edae6 * Modify comments. 2020-12-09 16:27:31 +08:00
holan20180123
031134ae3f * Fix bug 3642. 2020-12-08 10:41:56 +08:00
holan20180123
653f817e83 * Fix bug #3642. 2020-12-08 10:28:35 +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
qiyu-xie
0def3e0b08 * Finish task#8419. Fix bug. 2020-11-18 14:01:27 +08:00
qiyu-xie
ca7070b2cb * Finish task#8419. 2020-11-17 16:22:15 +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
leiyong
3272d0c454 * Adjust the test module related code. 2020-11-16 14:50:04 +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
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
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +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
70e78fc672 * finish task #7960. 2020-09-23 16:18:31 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
hufangzhou
ea578deb07 * Fix bug#3469. 2020-09-11 10:09:35 +08:00
z
a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00