Commit Graph
425 Commits
Author SHA1 Message Date
tianshujie 7360831837 * Adjust plan box of create project pager. 2022-11-16 15:23:18 +08:00
Yagami 8e481418df * Finish task #76107. 2022-11-14 16:20:32 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tanghucheng d7e722f914 * Fix bug #29078. 2022-10-28 10:48:29 +08:00
tianshujie 8f10f11926 * Fix bug #29077. 2022-10-28 10:09:57 +08:00
tanghucheng 1ca5456053 * Fix bug #29006. 2022-10-27 13:35:31 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tanghucheng ae7589b5e4 * Fix bug #29016,#29006,#29020. 2022-10-27 10:44:59 +08:00
tanghucheng d96d6bb803 * Finish task #73234,73242. 2022-10-27 08:09:26 +08:00
tianshujie a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
tianshujie 935faa00bd * Finish task #73752. 2022-10-26 14:01:04 +08:00
tianshujie 308a8b9f5e * Finish task #73750. 2022-10-26 13:15:38 +08:00
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
wangjianhua 804cf64783 * Improve css and js of manage repo page. 2022-09-30 15:01:31 +08:00
wangjianhua 04702a6139 * Finish task #70792: link project without product to code repository. 2022-09-30 14:20:19 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
sunguangming 595b5f8f83 * Code for task #71167. 2022-09-29 11:36:18 +08:00
liugang fefdfe5b49 * Adjust the vertical align. 2022-09-15 13:07:43 +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