Commit Graph
374 Commits
Author SHA1 Message Date
王怡栋 eceac71915 Merge branch 'master_liuhong_25078' into 'master'
*Fix bug #25078

See merge request easycorp/zentaopms!4762
2022-08-04 02:01:25 +00:00
liuhong 3c0471a280 *Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug 2022-08-04 01:28:19 +00:00
liuhong 892cb2e6dc *Fix bug #25078 2022-08-04 00:18:17 +00:00
liuruogu a28d225da9 * Finish task #63381. 2022-08-03 08:21:44 +00:00
liuhong 49ff270d97 *Fix bug #25078 2022-08-03 06:53:36 +00:00
daitingting b834dc794f * Finish task #62919,#62923,#62924. 2022-08-02 07:43:12 +00:00
zenggang 4bd33b9cba * Adjust code 2022-07-27 01:53:26 +00:00
zenggang 7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zhouxudong 0b309f63bd * Finish task #59534 #59530 #59529. 2022-07-04 08:54:44 +00:00
tianshujie 32af972947 * Fix bug #24533. 2022-06-29 15:25:38 +08:00
tianshujie 1f185ff189 * Fix bug #24514. 2022-06-29 14:34:09 +08:00
tianshujie f994051ea8 * Finish task #58552. 2022-06-28 12:16:11 +08:00
tianshujie 319d29e3d3 * Finish task #58552. 2022-06-28 09:06:38 +08:00
tianshujie 70b01098ac * Finish task #58552. 2022-06-27 17:22:49 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
zhujinyong c2bff85082 * Fix fail of ciresult. 2022-06-20 08:50:47 +08:00
孙广明 f09c614299 * Add comment. 2022-06-14 09:25:04 +08:00
孙广明 7c7a364102 * Finish task #56635. 2022-06-13 14:28:57 +08:00
孙广明 753a5e557a * Finish task #56635. 2022-06-13 11:11:01 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liyuchun 29ceb63023 * Fix bug #23132. 2022-06-02 02:49:27 +00:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
王怡栋 276d1b2197 Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570

See merge request easycorp/zentaopms!3477
2022-05-18 05:35:22 +00:00
lanzongjun 867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00
lanzongjun ece8976470 * fix bug #22570 2022-05-18 13:20:43 +08:00
wangyidong cceff98fd5 * Add id for post data. 2022-05-18 10:47:23 +08:00
lanzongjun 10eebbd136 * fix bug #22570 2022-05-17 17:13:17 +08:00
王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
mayue 181d0d67de * Fix bug #21948. 2022-04-24 09:58:10 +08:00
mayue 2ed8646488 * Fix bug #21948. 2022-04-24 09:31:14 +08:00
hufangzhou 2dc575a760 * Fix bug #11074. 2022-04-21 14:53:38 +08:00
王怡栋 a8983445c8 Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
#   module/bug/model.php
#   module/task/model.php
2022-04-13 07:52:03 +00:00
周旭东 4e7fcd1ad1 Update model.php 2022-04-13 03:08:48 +00:00
zhouxudong 37337bdb68 * Fix bug #17994. 2022-04-13 10:59:25 +08:00
zhouxudong 19f499e121 * Fix bug #17994. 2022-04-13 10:36:39 +08:00
zhouxudong 1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
zhouxudong 233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
tianshujie a8b051c12b * Fix bug #16527. 2022-04-12 12:58:56 +08:00
tianshujie f1c24db544 * Fix bug #16350. 2022-04-11 14:16:45 +08:00
zhouxudong d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +08:00
xieqiyu d8ef00183b * Fix bug#17296. 2022-04-06 13:47:49 +08:00
王怡栋 38ed825461 * adjust for get testtask list. 2022-03-01 13:58:00 +08:00