Commit Graph
34346 Commits
Author SHA1 Message Date
孙广明 bde32fd381 * Refactor code. 2022-02-24 08:19:04 +08:00
李玉春 9b4fe955ea Merge branch 'sprint/185_zhouxudong_19917' into 'sprint/185'
Sprint/185 zhouxudong 19917

See merge request easycorp/zentaopms!1923
2022-02-23 09:26:48 +00:00
李玉春 e30201491d Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529

See merge request easycorp/zentaopms!1929
2022-02-23 09:26:29 +00:00
周旭东 bc832bcf22 Update kanban.js 2022-02-23 09:20:20 +00:00
孙华伟 e78a9cc05a *Story #30529. 2022-02-23 17:17:28 +08:00
孙华伟 51e54dcf74 *Story #30529. 2022-02-23 17:15:56 +08:00
zhouxudong 6556130370 * Modify variable name. 2022-02-23 17:11:26 +08:00
孙广明 cca313c355 Merge branch 'sprint/186/tianshujie_upgrade' into 'sprint/185'
* Modify the issue of feature review.

See merge request easycorp/zentaopms!1925
2022-02-23 09:02:51 +00:00
tianshujie 38ebc359e6 * Modify the code logic. 2022-02-23 17:02:03 +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
tianshujie e1e2686493 * Modify the issue of feature review. 2022-02-23 16:56:22 +08:00
李玉春 cbd1ec29ce Merge branch 'sprint/185_zhengrunyu_Fixbug_19932' into 'sprint/185'
*Fix bug 19932 .

See merge request easycorp/zentaopms!1924
2022-02-23 08:56:19 +00:00
zhouxudong ad7d67071d * Fix bug #19917. 2022-02-23 16:50:08 +08:00
王怡栋 923741ca79 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-23 16:45:09 +08:00
王怡栋 103bae1470 Merge branch 'fix_upgrade' into sprint/185 2022-02-23 16:43:28 +08:00
zhengrunyu c07ca10dd7 *Fix bug 19932 . 2022-02-23 16:39:35 +08:00
zhujinyong b017832ab4 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-23 16:39:33 +08:00
zhujinyong 891b914fc9 * Format code. 2022-02-23 16:39:15 +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
zhouxudong 97e5aab33c * Fix bug #19917. 2022-02-23 16:37:44 +08:00
Zongjun Lan 3109fa6722 * Fix bug #49355 2022-02-23 16:35:46 +08:00
孙广明 914a00e83a * Code for upgrade. 2022-02-23 16:35:36 +08:00
孙华伟 234cfff784 *Story #30529. 2022-02-23 16:30:50 +08:00
李玉春 322c9c2b54 Merge branch 'sprint/185_zxd_49696' into 'sprint/185'
* Finish task #49696.

See merge request easycorp/zentaopms!1908
2022-02-23 08:11:28 +00:00
王怡栋 128f3be486 Merge branch 'sprint/185_tanghcuheng_49375' into 'sprint/185'
* Finish task #49375.

See merge request easycorp/zentaopms!1919
2022-02-23 07:59:21 +00:00
王怡栋 fe3b568a36 Merge branch 'sprint/185_lanzongjun_49334' into 'sprint/185'
* Fix bug #49334

See merge request easycorp/zentaopms!1917
2022-02-23 07:58:13 +00:00
王怡栋 c971499c52 Merge branch 'sgm_upgrade' into 'sprint/185'
Sgm upgrade

See merge request easycorp/zentaopms!1918
2022-02-23 07:51:52 +00:00
tanghucheng f057a1b832 * Finish task #49375. 2022-02-23 15:50:46 +08:00
孙广明 9515b94624 * Fix error. 2022-02-23 15:36:52 +08:00
Zongjun Lan 7a673daa6f * Fix bug #49334 2022-02-23 15:26:53 +08:00
王怡栋 ff5069a4fc Merge branch 'sprint/185_zhengrunyu_Fixmore' into 'sprint/185'
* Fixbug 19911.

See merge request easycorp/zentaopms!1916
2022-02-23 07:24:19 +00:00
孙广明 7be1378030 Merge branch 'sprint/186/tianshujie_upgrade' into 'sprint/185'
Sprint/186/tianshujie upgrade

See merge request easycorp/zentaopms!1912
2022-02-23 06:17:37 +00:00
zhengrunyu 599e94d578 * Fixbug 19911. 2022-02-23 14:12:39 +08:00
tianshujie 40fec08bb5 * Modify the load module path. 2022-02-23 14:08:25 +08:00
zhujinyong 61e790f1ff Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-23 14:04:48 +08:00
zhujinyong 4dbd9fcae5 * Fix bug: = ? return. 2022-02-23 14:04:11 +08:00
tianshujie 20fb3044d5 * Modify the code format. 2022-02-23 13:58:50 +08:00
孙广明 0ee66db862 * Code for upgrade. 2022-02-23 13:44:09 +08:00
tianshujie 2d1c81a4fe * Modify the code format. 2022-02-23 13:42:54 +08:00
王怡栋 88663142fe Merge branch 'sprint/185_lwr_removeProductFromWebhookEdit_bug19552' into 'sprint/185'
* remove products from webhook edit for lite vision, bug #19552.

See merge request easycorp/zentaopms!1914
2022-02-23 05:41:52 +00:00
Wenrui LI a89d4b2714 * remove products from webhook edit for lite vision, bug #19552. 2022-02-23 13:29:09 +08:00
周旭东 7d6fa23ced Update taskkanban.html.php 2022-02-23 05:29:00 +00:00
周旭东 177b6005f3 Update taskkanban.html.php 2022-02-23 05:28:31 +00:00
周旭东 8b494a429d Update kanban.html.php 2022-02-23 05:27:17 +00:00
tianshujie 90bd75ea02 * Modify the style of the migration files page. 2022-02-23 13:26:45 +08:00
tianshujie 85982b6cf0 * Modify the style of the migration files page. 2022-02-23 13:21:37 +08:00
周旭东 ede11fedbe Update kanban.html.php 2022-02-23 05:21:05 +00:00
周旭东 f134c0d63b Merge branch 'sprint/185' into 'sprint/185_zxd_49696'
# Conflicts:
#   module/execution/view/kanban.html.php
2022-02-23 05:17:54 +00:00
liyuchun 2610958bf1 Merge branch 'sprint/185_zxd_49693' into sprint/185 2022-02-23 13:09:53 +08:00
李玉春 e637d830ee Merge branch 'sprint/185' into 'sprint/185_zxd_49693'
# Conflicts:
#   module/execution/js/kanban.js
#   module/execution/view/kanban.html.php
2022-02-23 05:08:23 +00:00