Commit Graph

411 Commits

Author SHA1 Message Date
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
leiyong
b919cc45b2 * Adjust getProductPairsByProject to getProductByProject. 2020-11-19 09:07:31 +08:00
hufangzhou
ff69596dcd * Finish task#8418. 2020-11-17 13:17:14 +08:00
holan20180123
15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
hufangzhou
43174e39ec * Finish task#8200: Add the lib field for search testcase. 2020-11-04 09:06:41 +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
z
bd59b4a920 * finish task #12974. 2020-10-29 13:24:46 +08:00
Yagami
d6b59ef125 * Fix bugs. 2020-10-21 16:01:39 +08:00
leiyong
81d9b1de5d * Finish task#8059. 2020-10-09 17:42:15 +08:00
holan20180123
e024d848e1 * Finish task #8089. 2020-09-30 14:10:20 +08:00
holan20180123
bbf7424e40 * Finish task #8089. 2020-09-30 14:07:33 +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
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
holan20180123
9c3d71fd04 * Fix bug 7914. 2020-09-16 11:02:30 +08:00
holan20180123
08c1428b30 * Fix bug #7914. 2020-09-15 17:20:19 +08:00
tianshujie98
65347ec6b3 * Fix bug #3442. 2020-09-08 17:30:05 +08:00
tianshujie98
7fd5c7d55c * Fix bug #3442. 2020-09-04 13:48:19 +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
holan20180123
edfe4ccd97 * Finish task #7433. 2020-07-20 10:39:29 +08:00
holan20180123
3cba60eb57 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-07-17 17:19:47 +08:00
holan20180123
f574524f3f * Finish task #7407. 2020-07-17 17:19:12 +08:00
tianshujie98
a9dcdea00d * Finish task #7472. 2020-07-17 08:58:18 +08:00
chenfei
48e1b9becc * Fix bug #3217. 2020-07-06 15:20:59 +08:00
z
807fa3c58a * finish task #7273. 2020-06-22 10:59:10 +08:00
z
2539193d30 * add new version and upgrade. 2020-06-01 14:58:04 +08:00
wangyidong
91de6e934c * add insert param for cover or insert exist data. 2020-05-29 10:08:11 +08:00
wangyidong
b85560356e * fix for error. 2020-05-15 08:21:18 +08:00
wangyidong
15b2d838e7 * finish task #7187. 2020-05-14 08:29:21 +08:00
wangyidong
e1dd1b8d1f * change importFile to fileImport. 2020-05-13 17:39:17 +08:00
wangyidong
be2033a859 * finish task #7183. 2020-05-13 17:29:27 +08:00
wangyidong
d81da2876b * finish task #7180. 2020-05-13 17:22:01 +08:00
wangyidong
5ea2467bee * finish task #7088. 2020-05-06 10:38:09 +08:00
wangyidong
1e5576a961 * fix bug. 2020-04-30 11:21:29 +08:00
wangyidong
7407085500 * adjust for show import. 2020-04-26 17:33:42 +08:00
wangyidong
40fc4ad25b * adjust code. 2020-04-08 09:18:45 +08:00
wangyidong
e8c1309e92 * adjust for tescase view. 2020-04-02 17:50:57 +08:00
wangyidong
d649cbcbaa * adjust for show unit. 2020-04-02 16:50:43 +08:00
wangyidong
7749555f92 * code for task #7006. 2020-03-30 16:11:36 +08:00
wangyidong
3ba2f42aef * show child label. 2020-03-13 11:22:54 +08:00
wangyidong
92f366b767 * code for task #6849. 2020-02-06 09:01:41 +08:00
wangyidong
4db7034029 * finish task #6849. 2020-02-05 10:06:14 +08:00
wangyidong
b7b132baa5 * fix bug for error word. 2019-12-30 09:08:45 +08:00
wangyidong
f29fdfd106 * finish task #6760. 2019-12-18 13:07:49 +08:00
wangyidong
a9f4bc8edd * finish task #6760. 2019-12-16 17:00:05 +08:00
wangyidong
ddddf58813 * finish task #6673. 2019-12-11 16:07:49 +08:00
Yagami
c961d47610 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-27 10:05:46 +08:00
Yagami
383a2e236b * Finish task #6579. 2019-11-27 10:05:25 +08:00