Commit Graph
979 Commits
Author SHA1 Message Date
leiyong b919cc45b2 * Adjust getProductPairsByProject to getProductByProject. 2020-11-19 09:07:31 +08:00
Yagami 460947ebce * Change toString to zui function. 2020-11-18 15:33:23 +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
leiyong 3cb8149563 * Finish task#8313. 2020-11-13 14:02:11 +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
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
tianshujie98 42469b896d * Fix bug #3559. 2020-10-14 13:34:48 +08:00
tianshujie98 a2b459ebce * Fix bug #3559. 2020-10-14 13:22:48 +08:00
z 7509e74182 + add new version and upgrade. 2020-10-13 10:44:41 +08:00
qiyu-xie fbdc9624fc * Fix bug#3549. 2020-10-10 09:11:48 +08:00
leiyong 81d9b1de5d * Finish task#8059. 2020-10-09 17:42:15 +08:00
z 70e78fc672 * finish task #7960. 2020-09-23 16:18:31 +08:00
holan20180123 4b1c0ced7b * Finish task #7932. Fix bug #3422. 2020-09-23 13:55:32 +08:00
holan20180123 d85d370800 * Finish task #7932. Fix bug #3422. 2020-09-23 13:27:08 +08:00
qiyu-xie 99e966c405 * Fix bug#3377. 2020-09-16 16:03:48 +08:00
holan20180123 97e787358b Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-16 14:40:44 +08:00
holan20180123 831e4d7aff * Finish task #7968. 2020-09-16 14:40:27 +08:00
holan20180123 5fdd5a4a9a * Finish task #7968. 2020-09-16 14:38:26 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
qiyu-xie 36dcee74da * Fix bug#3377. 2020-09-14 17:14:20 +08:00
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
hufangzhou ea578deb07 * Fix bug#3469. 2020-09-11 10:09:35 +08:00
qiyu-xie f035d6af3e *Fix testtask module lang. 2020-09-08 17:20:50 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123 521cea2844 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-31 15:04:28 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
Yagami bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +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
tianshujie98 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
z dcba3b07ac * change zh-tw lang. 2020-08-11 08:08:36 +08:00
tianshujie98 5b75245191 * Fix bug custom required testtask. 2020-08-10 16:13:52 +08:00