Commit Graph
468 Commits
Author SHA1 Message Date
Zongjun Lan 553c7d714a * Fix #49361 2022-02-24 14:14:14 +08:00
tanghucheng 57047bb2eb * Finish task #49376,49365,49366. 2022-02-24 09:49:59 +08:00
王怡栋 c8a9e2b6b9 * code for task #49087. 2022-02-23 17:25:14 +08:00
Wenrui LI 38880314ef * remove story bug and stuff from assign to me block params for lite vision, bug #19202. 2022-02-23 17:00:47 +08:00
王怡栋 44ea505f11 Merge branch 'sprint/185_fixbug_lanzongjun_49355' into 'sprint/185'
* Fix bug #49355

See merge request easycorp/zentaopms!1920
2022-02-23 08:39:01 +00:00
Zongjun Lan 3109fa6722 * Fix bug #49355 2022-02-23 16:35:46 +08:00
tanghucheng f057a1b832 * Finish task #49375. 2022-02-23 15:50:46 +08:00
Wenrui LI a89d4b2714 * remove products from webhook edit for lite vision, bug #19552. 2022-02-23 13:29:09 +08:00
tanghucheng b3a798f9a4 * code for task #49697. 2022-02-23 11:14:11 +08:00
tanghucheng 09450e0023 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_tanghucheng_49697 2022-02-23 10:59:35 +08:00
tanghucheng adb6f14e59 * Code for task #49697. 2022-02-23 10:39:51 +08:00
孙广明 a71557ce9f Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
#   extension/lite/action/ext/lang/zh-cn/lite.php
2022-02-23 01:56:56 +00:00
孙广明 64c8871c63 * Merge code. 2022-02-23 09:56:12 +08:00
王怡栋 545ba95f90 * code for task #49372. 2022-02-23 09:55:38 +08:00
孙广明 e4552821b0 Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
#   extension/lite/action/ext/lang/zh-cn/lite.php
2022-02-23 01:54:46 +00:00
Wenrui LI d38fc515bc * change wording for modules in lite vision, bug #19489. 2022-02-23 08:59:52 +08:00
王怡栋 5f13e1e4ab * code for task #49359. 2022-02-23 08:48:58 +08:00
Wenrui LI c34a9bbd67 * remove plan related stuff from action search of lite vision, bug #19021. 2022-02-23 08:43:36 +08:00
王怡栋 c3d38e028a Merge branch 'sprint/185' into 'sprint/185_lwr_filterActionSearch_bug19021'
# Conflicts:
#   extension/lite/action/ext/lang/zh-cn/lite.php
2022-02-22 09:02:58 +00:00
Wenrui LI 61dc15d6d1 * remove unwanted search items from action module, bug #19021. 2022-02-22 16:41:29 +08:00
王怡栋 39fad91f7e * code for task #49372. 2022-02-22 16:28:43 +08:00
孙广明 47c48e68a2 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1878
2022-02-22 07:53:22 +00:00
Wenrui LI 7afe8319fb * fix workflow icon not present. 2022-02-22 14:43:41 +08:00
王怡栋 23a5acab55 * adjust for edition config. 2022-02-22 13:35:36 +08:00
王怡栋 2c89a401d5 * code for task #49352 and fix error. 2022-02-22 13:29:07 +08:00
王怡栋 0948be7aaa Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong 2022-02-22 10:55:23 +08:00
王怡栋 cc184728c1 * code for task #49348. 2022-02-22 10:54:43 +08:00
王怡栋 6486986b5a Merge branch 'sprint/185_tanghucheng_49418' into 'sprint/185'
* Finish task #49415,49418,49425,49418,49402.

See merge request easycorp/zentaopms!1873
2022-02-22 01:49:27 +00:00
tanghucheng 4ffb8c996c * Finish task #49402. 2022-02-22 09:46:00 +08:00
tanghucheng f650bc44c7 * Finish task #49415,49418,49425. 2022-02-22 09:19:27 +08:00
孙广明 5ff758878e Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
#   module/common/model.php
2022-02-22 00:32:35 +00:00
王怡栋 06352f4354 * code for task #49337. 2022-02-21 17:14:10 +08:00
tanghucheng 911ceb027b * code for task #49697. 2022-02-21 17:07:46 +08:00
tanghucheng 422811bcbd * code for task #49697. 2022-02-21 17:01:42 +08:00
王怡栋 78110fb10a * code for task #49364. 2022-02-21 16:56:23 +08:00
王怡栋 2f521db75c * code for task #49362. 2022-02-21 15:59:24 +08:00
王怡栋 0cb4581eec Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* Finish task #49697.

See merge request easycorp/zentaopms!1856
2022-02-21 05:21:01 +00:00
tanghucheng 743a8872ee * Code for task. 2022-02-21 13:18:48 +08:00
tanghucheng 510e7397d4 * Finish task #49697. 2022-02-21 13:12:51 +08:00
王怡栋 e81524fb25 * code for task #49357. 2022-02-21 11:35:52 +08:00
王怡栋 d5f74b39a5 * finish task #49087. 2022-02-21 10:58:54 +08:00
zhujinyong 4f32cb8a1c + Add xuan extension. 2022-02-21 10:30:38 +08:00
tanghucheng 8db3ec184c * Finish task #49697. 2022-02-21 08:34:14 +08:00
王怡栋 722b9c5538 * adjust code. 2022-02-18 16:27:41 +08:00
王怡栋 3c5ed57c29 * code for task #49698. 2022-02-18 15:55:29 +08:00
王怡栋 221aab879e * adjust for task #49373. 2022-02-18 15:05:44 +08:00
王怡栋 116938b2e6 * finish task #49417. 2022-02-18 11:01:13 +08:00
王怡栋 2eae8b3c38 Merge branch 'sprint/185_fixbug_lanzongjun_49422' into 'sprint/185'
* Fix bug #49422

See merge request easycorp/zentaopms!1843
2022-02-17 09:34:03 +00:00
Zongjun Lan 20732c0d2a * Fix bug #49422 2022-02-17 17:32:12 +08:00
Zongjun Lan 41e878cf47 隐藏验收标准和影响范围 2022-02-17 17:22:48 +08:00