Commit Graph
407 Commits
Author SHA1 Message Date
tianshujie 6ba9f6a195 * Fix bug #28706. 2022-10-20 11:02:11 +08:00
tianshujie f107a95ba2 * Fix bug #28706. 2022-10-20 10:55:31 +08:00
guofeilong c46cf29a2c * fix bug * 28499 2022-10-12 07:52:09 +00:00
曹延义 9287efdd8a * Modify acl radio style. 2022-10-11 15:51:34 +08:00
wangzemei b37f3e8d42 * fix bug 28416 2022-10-11 10:32:35 +08:00
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
wangzemei 209e38775d * rm class 2022-10-10 09:32:56 +08:00
wangzemei 4a656cf175 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-09 15:19:48 +08:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
wangzemei 8d0988d465 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-09 09:43:24 +08:00
wangzemei ca3a61f605 * finish task 71896 2022-10-09 09:42:29 +08:00
曹延义 4b219ab7b1 * Reset page style. 2022-10-08 16:59:02 +08:00
wangzemei 8f02d62c13 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-08 16:56:49 +08:00
曹延义 80e9e163e7 * Fix bug #28181. 2022-10-08 10:14:54 +08:00
wangzemei eae74e50fd * modify project execution table style 2022-09-30 15:26:21 +08:00
tianshujie ba5eb3f915 * Finish task #68942,68941. 2022-09-13 14:39:01 +08:00
liumengyi 2500ad1fb7 * Fix bug #27428. 2022-09-09 09:45:33 +08:00
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