Commit Graph
572 Commits
Author SHA1 Message Date
tianshujie 0194c5b3c7 * Fix bug #21186. 2022-03-28 11:13:23 +08:00
Hao Sun 539c797bd5 * bug #14569, optimize style for dropmenu. 2022-03-24 17:01:41 +08:00
李玉春 009aaed504 Merge branch 'devops24_zenggang' into 'master'
Finish task#51184,51176,51141

See merge request easycorp/zentaopms!2508
2022-03-24 07:45:13 +00:00
李玉春 43d834e01d Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2513
2022-03-24 07:44:23 +00:00
zhouxudong 3a3660764c * Fix bug. 2022-03-24 15:15:12 +08:00
zhouxudong c6f8ca1526 * Fix bug. 2022-03-24 14:57:46 +08:00
Hao Sun 0a7c559478 * optimize UI for kanban. 2022-03-24 14:27:03 +08:00
zenggang dd5cab2011 * Finish task#51184,51176,51141 2022-03-24 06:21:10 +00:00
zenggang 04652c0e65 * Adjust code 2022-03-22 07:34:17 +00:00
zenggang 784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
孙广明 88f1cd03d5 Merge branch 'fixbug_zhouxin_17415' into 'master'
Fix bug #17415.

See merge request easycorp/zentaopms!2436
2022-03-22 06:06:31 +00:00
zhouxin cc2704e1d0 Fix bug #17415. 2022-03-22 05:10:45 +00:00
zhouxudong b65da66453 * Fix bug #14090. 2022-03-22 13:09:47 +08:00
zhouxudong 67045f3041 *Fix bug #14090. 2022-03-22 11:28:44 +08:00
李玉春 73b13d19fe Merge branch 'sprint/pailei2_zhouxudong_15763' into 'master'
* Fix bug #15763.

See merge request easycorp/zentaopms!2417
2022-03-22 03:01:10 +00:00
zhouxudong b59845049b * Fix bug #15763. 2022-03-22 10:59:17 +08:00
zhouxudong 39a58efedf * Fix bug #15763. 2022-03-22 10:53:22 +08:00
zhouxudong 541032f12e * Fix bug #15763. 2022-03-22 10:40:34 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxudong d818c3426e * Fix bug #15763. 2022-03-22 08:54:24 +08:00
zhouxin f280e32777 Fix bug #17415. 2022-03-18 02:43:14 +00:00
zhouxudong c011895995 * Fix bug #20121. 2022-03-17 16:34:32 +08:00
李玉春 59ff30de9d Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2265
2022-03-15 05:43:03 +00:00
孙华伟 dd727476ad * Fix bug #17639. 2022-03-15 13:36:52 +08:00
sunjun 7411c4c4f3 fix bug #50431 2022-03-11 15:59:07 +08:00
Zongjun Lan b51e39e69f * fix bug #20640 2022-03-11 14:58:39 +08:00
sunjun f69c9746b5 bug增加必填标识 2022-03-11 08:52:04 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
李玉春 3b79f9ce1c Merge branch 'sprint/pailei2_zhouxudong_fixbug' into 'pailei2'
* Fix bug #19962.

See merge request easycorp/zentaopms!2137
2022-03-08 06:40:16 +00:00
tianshujie 54ac0f8c8e * Finish task #50380. 2022-03-08 13:52:34 +08:00
zhouxudong cbe21a49d8 * Fix bug #19962. 2022-03-08 10:56:25 +08:00
孙广明 23ebec3d25 Merge branch 'sprint/187_liumengyi_50324' into 'master'
* Finish task #50324.

See merge request easycorp/zentaopms!2109
2022-03-07 05:19:08 +00:00
孙广明 1b137f7bc8 Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie

See merge request easycorp/zentaopms!2107
2022-03-07 05:13:55 +00:00
liumengyi 15a95e6c6b * Finish task #50324. 2022-03-07 11:05:46 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
tianshujie afed9c5c71 * Finish task #50338. 2022-03-07 10:37:41 +08:00
孙华伟 d8bb8a903e * 2022-03-04 14:34:01 +08:00
liumengyi 86d19f82f7 * Fix bug #20290. 2022-03-03 14:53:58 +08:00
孙华伟 c01323fdbb *Fix bug #20273 . 2022-03-03 09:40:43 +08:00
孙华伟 e0640737c2 *Fix bug #20273. 2022-03-03 09:34:41 +08:00
李玉春 a0da36e3f2 Merge branch 'pailei' into 'pailei_sunhuawei_story_30528'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
2022-03-02 05:34:15 +00:00
孙华伟 e7d721af85 * 2022-03-02 13:15:04 +08:00
孙华伟 03b0221c99 * 2022-03-02 13:08:22 +08:00
孙华伟 fa34d9e024 * 2022-03-02 11:31:50 +08:00
孙华伟 51b7e615e0 * 2022-03-02 11:30:20 +08:00
孙华伟 5d61f31c3b * 2022-03-02 11:22:23 +08:00
孙华伟 abd00b8f08 * 2022-03-02 11:13:22 +08:00
孙华伟 33a2aec741 * 2022-03-02 11:00:51 +08:00
孙广明 b63fa55607 Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.

See merge request easycorp/zentaopms!2029
2022-03-02 03:00:45 +00:00
孙华伟 0402049b85 * 2022-03-02 10:58:08 +08:00