Commit Graph
389 Commits
Author SHA1 Message Date
liumengyi ea3071279b * Fix bug #27020. 2022-09-06 14:52:24 +08:00
liumengyi 6a2deee711 * Fix bug for task #67727. 2022-09-06 08:39:49 +08:00
liumengyi 796d0423bc * Fix bug #27020. 2022-09-05 16:30:02 +08:00
zhouxudong 39007e35b2 Merge branch 'sprint/229_zhouxudong_64888' into sprint/229 2022-08-17 07:15:55 +00:00
王怡栋 3a3477b3c3 Merge branch 'sprint/master_zhouxudong_63580' into 'sprint/229'
Sprint/master zhouxudong 63580

See merge request easycorp/zentaopms!4986
2022-08-17 06:43:24 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
zhouxudong 04247b0533 * Finish task #63580. 2022-08-11 07:00:06 +00:00
王怡栋 7c2d2b54eb Merge branch 'master' into 'master_liuhong_63787'
# Conflicts:
#   module/program/css/browse.css
#   module/project/css/browse.css
2022-08-11 01:22:50 +00:00
liuhong f713f01ee7 *Finish task #63787. 2022-08-11 00:49:21 +00:00
王怡栋 de30066a3b Merge branch 'master_liuhong_63787' into 'master'
Master liuhong 63787

See merge request easycorp/zentaopms!4902
2022-08-10 08:11:31 +00:00
xieqiyu 0495adaae1 * Code for task#63787. 2022-08-10 15:54:35 +08:00
liuhong 0c2b54ade7 *Finish task #63787. 2022-08-10 03:57:22 +00:00
xieqiyu 930d72178e * Code for task#63790. 2022-08-09 22:39:41 +08:00
liuhong 61839c50a8 *Finish task #63787. 2022-08-09 14:31:37 +00:00
liuyongkai 7ca2f66a28 * Fix bug #26002,25249 2022-08-04 10:26:46 +00:00
王怡栋 c80090ff79 Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix bug#25998,26017,23426

See merge request easycorp/zentaopms!4783
2022-08-04 03:56:58 +00:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zenggang 9314b23885 * Fix bug#25998,26017 2022-08-04 02:48:29 +00:00
zhouxudong 6a784fdfda * Finish task #62850. 2022-08-02 08:50:16 +00:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
zhouxudong 364a5009f4 * Finish task #62850. 2022-08-02 07:21:03 +00:00
tianshujie 9f3c5e3b30 * Fix bug #25682. 2022-07-28 08:24:34 +08:00
xieqiyu ea5c5c760d * Delete future width when create project. 2022-07-15 14:38:17 +08:00
孙广明 5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
孙广明 daf3ef4c99 * Code for execution list. 2022-07-12 00:43:56 +08:00
孙广明 f507af4cd0 * Code for stage list. 2022-07-11 18:19:27 +08:00
zhouxudong eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
hufangzhou ac69cd1afb * Finish task #57883. 2022-06-22 10:39:55 +08:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
tianshujie b1f29eed4e * Fix bug #23815. 2022-06-16 13:30:59 +08:00
mayue ee058f67f1 * Finish task #57393. 2022-06-15 15:09:05 +08:00
王怡栋 71fb547445 Merge branch 'master_xieqiyu_56922' into 'master'
* Finish task#56922.

See merge request easycorp/zentaopms!3910
2022-06-14 07:19:42 +00:00
xieqiyu 38dad8467f * Finish task#56922. 2022-06-14 15:00:08 +08:00
孙广明 dbb1ccc413 Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558

See merge request easycorp/zentaopms!3892
2022-06-14 06:58:39 +00:00
tianshujie 1eda1081d1 * Fix bug #23663. 2022-06-14 13:49:07 +08:00
tianshujie ed2664f731 * Fix bug #23663. 2022-06-14 13:46:38 +08:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
zenggang 8bfc6dec02 * Finish task#56558 2022-06-13 09:46:02 +00:00
孙华伟 12b8250e06 *Fix bug #22453 #22455. 2022-05-13 13:17:10 +08:00
孙华伟 a3ab4a596b *解决功能演示过程中出现的问题。 2022-05-12 15:29:28 +08:00
tianshujie 27b6817c2c * Fix bug #17551. 2022-04-14 17:11:36 +08:00
tianshujie 90a1fea2d8 * Fix bug #17551. 2022-04-13 13:35:02 +08:00
Hao Sun 8b336e8694 * bug #16555, remove scrollbar when drag item to outside of kanban. 2022-04-07 16:06:46 +08:00
Hao Sun 8b58e71667 * bug #16555, remove scrollbar when drag item to outside of kanban. 2022-04-07 16:05:54 +08:00
tianshujie 7407aabc00 * Fix bug #19104. 2022-04-01 14:32:00 +08:00
tianshujie 1d91f13687 * Fix bug #17551. 2022-03-31 14:22:35 +08:00
tianshujie 6617f8747c * Fix bug #19397. 2022-03-28 16:46:15 +08:00
tianshujie d3e63841fa * Fix bug #20559. 2022-03-25 15:00:30 +08:00