Commit Graph
33561 Commits
Author SHA1 Message Date
caoyanyi 9c63fb1542 * Adjust code. 2022-02-09 01:20:08 +00:00
caoyanyi 2262ae20c2 * Modify jenkins locate. 2022-02-09 00:44:26 +00:00
caoyanyi cd560f74b3 * Finish task #48614. 2022-02-08 05:39:57 +00:00
caoyanyi 372ca9b390 * Finish task #48619. 2022-02-08 05:21:35 +00:00
caoyanyi a5f4950d37 * Finish task #48615. 2022-02-08 05:20:49 +00:00
李玉春 395d380c05 Merge branch 'devops21_zhangzilong_19161' into 'devops21'
* Fix bug #19161.

See merge request easycorp/zentaopms!1718
2022-02-08 00:48:13 +00:00
zhangzilong fb8708557d * Fix bug #19161. 2022-02-08 08:42:16 +08:00
孙广明 2ed24b51d6 Merge branch 'sprint/fixbug_13636' into 'master'
Sprint/fixbug 13636

See merge request easycorp/zentaopms!1713
2022-02-07 06:35:11 +00:00
zhouxudong e02d0152fe *Fix bug #13636. 2022-02-07 14:30:21 +08:00
孙广明 9a328b689f Merge branch 'liyuchun_fixbug' into 'master'
* Adjsut style.

See merge request easycorp/zentaopms!1708
2022-02-07 03:13:32 +00:00
孙广明 c8ce766f83 Merge branch 'fix_bug_18308' into 'master'
* Fix bug #18308.

See merge request easycorp/zentaopms!1711
2022-02-07 03:13:06 +00:00
zhouxudong 5ec1d31b76 *Fix bug #13636. 2022-02-07 11:11:48 +08:00
李玉春 b173facd13 Merge branch 'sprint/sunhuawei_fixbug_19092' into 'master'
* Fix bug #19092.

See merge request easycorp/zentaopms!1710
2022-02-07 03:11:37 +00:00
mayue 2cc103e46f * Fix bug #18308. 2022-02-07 11:10:43 +08:00
sunhuawei 3070a90a6b * Fix bug #19092. 2022-02-07 11:05:59 +08:00
王怡栋 bc1fd93036 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #19236.

See merge request easycorp/zentaopms!1709
2022-02-07 02:59:23 +00:00
孙广明 34cbc58264 * Fix bug #19236. 2022-02-07 10:53:44 +08:00
liyuchun 9ac6ee3697 * Adjsut style. 2022-02-07 10:38:38 +08:00
孙广明 6036aa18e6 Merge branch 'fix_bug_19108' into 'master'
* Fix bug #19108.

See merge request easycorp/zentaopms!1707
2022-02-07 02:03:44 +00:00
mayue 47a5831e84 * Fix bug #19108. 2022-02-07 09:42:19 +08:00
李玉春 cf3ed8984c Merge branch 'tianshujie_18175' into 'master'
* Fix bug #18175.

See merge request easycorp/zentaopms!1706
zentaopms_16.3
2022-01-29 08:45:37 +00:00
tianshujie cb14ef28d5 * Fix bug #18175. 2022-01-29 15:51:21 +08:00
李玉春 e7936ef95a Merge branch 'sprint/scx_xuanxuan_title' into 'master'
*Xuanxuan title.

See merge request easycorp/zentaopms!1705
2022-01-29 05:40:22 +00:00
songchenxuan 5847d90351 *Xuanxuan title. 2022-01-29 13:38:26 +08:00
李玉春 bc7d190e69 Merge branch 'sprint/bug_zhouxudong_19158' into 'master'
*Fix bug #19158.

See merge request easycorp/zentaopms!1704
2022-01-29 01:02:12 +00:00
zhouxudong b767d5cbeb *Fix bug #19158. 2022-01-29 08:52:31 +08:00
李玉春 a109c294c6 Merge branch 'kanban' into 'master'
* Modify create execution error.

See merge request easycorp/zentaopms!1703
2022-01-28 09:10:23 +00:00
tianshujie ca5d15f13f * Modify create execution error. 2022-01-28 17:06:43 +08:00
李玉春 58f51b83cb Merge branch 'tianshujie_kanban' into 'master'
* Modify the problem of creating a kanban error.

See merge request easycorp/zentaopms!1702
2022-01-28 08:38:02 +00:00
tianshujie 2de963346e * Modify the problem of creating a kanban error. 2022-01-28 16:31:03 +08:00
李玉春 18cd24f4e2 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for view kanban.

See merge request easycorp/zentaopms!1701
2022-01-28 06:56:19 +00:00
liumengyi 7b09b6daab * Fix bug for view kanban. 2022-01-28 14:50:15 +08:00
李玉春 9c75dbe856 Merge branch 'tianshujie_kanban' into 'master'
* Solve the problem of getting regional data.

See merge request easycorp/zentaopms!1700
2022-01-28 06:37:25 +00:00
tianshujie 4394d09195 * Solve the problem of getting regional data. 2022-01-28 14:31:35 +08:00
李玉春 59a33f6d1e Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #19126.

See merge request easycorp/zentaopms!1699
2022-01-28 05:30:53 +00:00
liumengyi 06275780d2 * Modify code format. 2022-01-28 13:29:19 +08:00
liumengyi 4c26d32564 * Fix bug #19126. 2022-01-28 13:20:14 +08:00
李玉春 e2634f7dc0 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #19119.

See merge request easycorp/zentaopms!1698
2022-01-28 05:10:02 +00:00
liumengyi 8382aa2ddc * Fix bug #19119. 2022-01-28 13:07:54 +08:00
李玉春 0c7403ec9d Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #19119,#19121.

See merge request easycorp/zentaopms!1697
2022-01-28 05:04:18 +00:00
liumengyi 8c063b581c * Fix bug #19119,#19121. 2022-01-28 11:58:20 +08:00
李玉春 5097cb0029 Merge branch 'tianshujie_kanban' into 'master'
* Fix work in process quantity issue.

See merge request easycorp/zentaopms!1696
2022-01-28 02:53:57 +00:00
tianshujie 99f995709e * Fix work in process quantity issue. 2022-01-28 10:51:06 +08:00
李玉春 732a1b410b Merge branch 'devops20_zenggang' into 'master'
zg:编辑合并请求按钮无权限改为置灰

See merge request easycorp/zentaopms!1693
2022-01-28 02:46:07 +00:00
李玉春 b7c97339c2 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for kanban space view.

See merge request easycorp/zentaopms!1695
2022-01-28 02:45:10 +00:00
李玉春 816a3d27de Merge branch 'sprint/183_zhouxin_fix' into 'master'
Fix bugs.

See merge request easycorp/zentaopms!1694
2022-01-28 02:44:32 +00:00
liumengyi e0b4902248 * Fix bug for kanban space view. 2022-01-28 10:27:21 +08:00
zhouxin 716b055fbf Fix bugs. 2022-01-28 02:20:42 +00:00
zenggang b2875e7c20 * Adjust code 2022-01-28 01:17:50 +00:00
孙广明 82a5aa5bd7 Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Add title for batchcreatecard page.

See merge request easycorp/zentaopms!1692
2022-01-27 08:59:15 +00:00