Commit Graph
919 Commits
Author SHA1 Message Date
hufangzhou 8fc7117fb6 * Fix bug#3765. 2020-12-18 15:52:36 +08:00
leiyong ef7fa91f5c * Fix bug#3765. 2020-12-18 14:06:26 +08:00
tianshujie98 b8b305000e * Fix bug #3697. 2020-12-03 09:04:27 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +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
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
z 79918a7dd0 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-11-16 09:00:56 +08:00
z 8eb9b0afb8 * adjust code. 2020-11-16 08:58:44 +08:00
holan20180123 95c2adcdb0 *Finish task #8194. 2020-11-15 22:39:26 +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
qiyu-xie 1ea321fea5 * Finish task#8239. 2020-11-05 11:10:53 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
holan20180123 35e793260e * Fix bug #12955. 2020-10-29 11:24:18 +08:00
z 4aeeb5f591 * fix bug for picker. 2020-10-14 14:02:27 +08:00
tianshujie98 ca54dacb02 * Finish task #8061. 2020-10-10 09:18:10 +08:00
tianshujie98 b6674ed079 * Finish task #8061. 2020-10-10 09:06:42 +08:00
tianshujie98 677fa52863 * Revert submission. 2020-10-09 08:31:30 +08:00
tianshujie98 f7911a7013 * Revert submission. 2020-10-09 08:27:33 +08:00
tianshujie98 456dbffd68 * Fix bug #2526. 2020-09-29 08:26:13 +08:00
tianshujie98 347e52e049 * Fix bug #2526. 2020-09-29 08:20:38 +08:00
tianshujie98 31687d6856 * Finish task #8009. 2020-09-24 09:37:49 +08:00
tianshujie98 ac8ab8d868 * Finish task #8009. 2020-09-24 09:30:55 +08:00
tianshujie98 b106d3a95e * Finish task #8009. 2020-09-23 11:10:28 +08:00
tianshujie98 d39955eb24 * Finish task #8009. 2020-09-23 11:04:55 +08:00
holan20180123 3296d751c4 * Finish task #7971. Fix bug #3296. 2020-09-22 16:33:33 +08:00
qiyu-xie 681b6b4d9b * Fix bug#3425. 2020-09-16 16:00:48 +08:00
tianshujie98 b945a8e306 * Finish task #8031. 2020-09-16 11:31:21 +08:00
tianshujie98 bd7838bebd * Finish task #8031. 2020-09-16 11:20:30 +08:00
qiyu-xie c86d0327d6 * Fix bug#3425. 2020-09-14 16:35:12 +08:00
qiyu-xie fa2690d046 *Fix bug view and testcase view product jump issues. 2020-09-04 09:56:37 +08:00
z 40dbb5b53a * code for task #12372. 2020-09-03 16:32:39 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
Yagami ad750e1f94 * Finish task #7722. 2020-08-31 14:12:20 +08:00
Yagami 1f2f21e44b * Adjust code style. 2020-08-29 13:20:50 +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
holan20180123 89a4481f0b * Fix bug #3276. 2020-08-17 09:45:55 +08:00
holan20180123 a25560c573 * Fix bug #3276. 2020-08-17 09:22:58 +08:00
tianshujie98 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
tianshujie98 fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
tianshujie98 2134ee1b8f * Fix bug #2499. 2020-08-06 15:49:29 +08:00
tianshujie98 548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
leiyong fb752e34c8 * Finish task#1198. 2020-08-04 23:19:36 -07:00
leiyong e639fd4379 * Finish task#7481. 2020-07-27 02:29:36 -07:00