Commit Graph
45233 Commits
Author SHA1 Message Date
tianshujie 51fb885b08 * Finish task #70482. 2022-09-28 15:10:49 +08:00
tianshujie 389397ef92 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 14:33:04 +08:00
tianshujie 7b2980726e Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:59:37 +08:00
胡方舟 0681bde87c Merge branch 'sprint/wangzemei/fix_kanban' into 'master'
* fix xuanxuan css

See merge request easycorp/zentaopms!5587
zentaopms_17.6.2
2022-09-28 03:30:00 +00:00
王怡栋 a3d6bffe61 Merge branch 'master_xieqiyu_27408' into 'master'
* Fix bug#27408.

See merge request easycorp/zentaopms!5582
2022-09-28 03:28:48 +00:00
李玉春 408902f6e0 Merge branch 'sprint/244_tianshujie_70504' into 'sprint/244'
* Finish task #70504.

See merge request easycorp/zentaopms!5586
2022-09-28 03:28:10 +00:00
wangzemei 85685c774d * fix xuanxuan css 2022-09-28 11:27:19 +08:00
李玉春 d401ef9626 Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015

See merge request easycorp/zentaopms!5577
2022-09-28 03:25:16 +00:00
tianshujie 8e5f019f46 * Finish task #70015. 2022-09-28 11:24:47 +08:00
胡方舟 6ed8540d28 Merge branch 'sprint/wzm/fixkanban' into 'master'
* fix select class bug about xuanxuan

See merge request easycorp/zentaopms!5584
2022-09-28 03:23:46 +00:00
tianshujie 4314480ae7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:19:07 +08:00
tianshujie 20830f395f Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:18:55 +08:00
李玉春 f6b6bbd5e7 Merge branch 'sprint/cyy_bug' into 'sprint/244'
Sprint/cyy bug

See merge request easycorp/zentaopms!5575
2022-09-28 03:12:07 +00:00
wangzemei e65e3d81d9 * fix select class bug about xuanxuan 2022-09-28 11:08:20 +08:00
李玉春 1868918ad8 Merge branch 'sprint/244_dyl_70501' into 'sprint/244'
* rm product icon.

See merge request easycorp/zentaopms!5568
2022-09-28 03:03:22 +00:00
曹延义 46474331ba * Modify batch edit style for product list page. 2022-09-28 11:00:45 +08:00
xieqiyu 46bba7775e * Fix bug#27408. 2022-09-28 02:50:03 +00:00
王怡栋 7b25b702f7 Merge branch 'bug_28068' into 'master'
* Fix bug#28068

See merge request easycorp/zentaopms!5578
2022-09-28 02:09:49 +00:00
曹延义 ca5110623e * Add project checkbox style. 2022-09-28 10:09:32 +08:00
tianshujie 90946ab3d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 09:23:23 +08:00
tianshujie c5c299b727 * Finish task #70015. 2022-09-28 09:22:13 +08:00
tianshujie 129c7dfd03 * Finish task #70015. 2022-09-28 09:15:16 +08:00
曹延义 d16362e3da * Set batch edit checkbox style to cookie. 2022-09-28 08:58:30 +08:00
胡方舟 19175806f5 Merge branch 'sprint/wangzemei/241_fix' into 'master'
* fix bug #28047 # 28065

See merge request easycorp/zentaopms!5579
2022-09-28 00:55:03 +00:00
孙广明 dcdcaad2a0 Merge branch 'lyk_28056' into 'master'
* Fix bug #28056.

See merge request easycorp/zentaopms!5576
2022-09-28 00:53:58 +00:00
wangzemei 58969d7ade * fix bug #28047 # 28065 2022-09-28 08:52:48 +08:00
zenggang 4279033526 * Fix bug#28068 2022-09-27 08:41:55 +00:00
tianshujie e0d1c1983f * Finish task #70504. 2022-09-27 16:36:57 +08:00
曹延义 6cb187bec1 * Modify product page style. 2022-09-27 16:26:24 +08:00
tianshujie 78905f7e05 * Finish task #70015. 2022-09-27 16:23:02 +08:00
曹延义 336982fd73 * Adjust code. 2022-09-27 16:19:16 +08:00
曹延义 6133128e23 * Modify project style. 2022-09-27 16:18:29 +08:00
liuyongkai 7567b5b499 * Fix bug #28056. 2022-09-27 08:16:01 +00:00
胡方舟 6fd2b704dc Merge branch 'cyy_bug' into 'master'
* Fix bug #28030.

See merge request easycorp/zentaopms!5573
2022-09-27 08:05:30 +00:00
曹延义 5bb453c851 * Code for task #70489. 2022-09-27 16:00:13 +08:00
曹延义 79009a9d80 * Modify checkbox display. 2022-09-27 15:52:29 +08:00
曹延义 f133837589 * Hide left border. 2022-09-27 15:52:11 +08:00
王怡栋 36641d7a97 Merge branch 'sprint/hufangzhou_bug_28003' into 'master'
* Fix bug #28003.

See merge request easycorp/zentaopms!5571
2022-09-27 07:35:26 +00:00
曹延义 c549090db1 * Fix bug #28030. 2022-09-27 15:28:12 +08:00
胡方舟 376197313f Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Modify navigation default font color.

See merge request easycorp/zentaopms!5570
2022-09-27 07:18:58 +00:00
hufangzhou 682425df5e * Fix bug #28003. 2022-09-27 15:17:41 +08:00
tianshujie 1513c4a303 * Modify navigation default font color. 2022-09-27 15:14:54 +08:00
胡方舟 a95042508e Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!5564
2022-09-27 05:51:26 +00:00
tianshujie 9a0642075a * Fix bug #27974,28001. 2022-09-27 13:42:30 +08:00
王怡栋 14012809bd Merge branch 'sprint/fixbug_liumengyi_26595' into 'master'
* Optimize code for bug #26595.

See merge request easycorp/zentaopms!5559
2022-09-27 05:36:13 +00:00
王怡栋 fba65fddac Merge branch 'sprint/hufangzhou_changelog' into 'master'
* Add the fixed bugs to changelog.

See merge request easycorp/zentaopms!5563
2022-09-27 05:35:51 +00:00
王怡栋 bb0ba240a2 Merge branch 'sprint/fixbug_liumengyi_28010' into 'master'
* Fix bug #28010.

See merge request easycorp/zentaopms!5565
2022-09-27 05:35:41 +00:00
王怡栋 53f07a630a Merge branch 'sprint/xuan_fix_notification' into 'master'
* xuanxuan notification only support bug,task,story,mr

See merge request easycorp/zentaopms!5567
2022-09-27 05:34:30 +00:00
李玉春 cb1a4fad90 Merge branch 'cyy_bug' into 'master'
* Fix bug #28008.

See merge request easycorp/zentaopms!5560
2022-09-27 05:26:47 +00:00
chaideqing cb7aa61d79 * xuanxuan notification only support bug,task,story,mr 2022-09-27 13:26:32 +08:00