Commit Graph

1256 Commits

Author SHA1 Message Date
xieqiyu
e8edfb8df8 * Code for task#81779. 2023-01-04 09:33:43 +08:00
xieqiyu
43db2ac853 * Adjust code style. 2023-01-04 08:28:55 +08:00
xieqiyu
bc620ef34d * Code for task#81779. 2023-01-03 17:36:33 +08:00
xieqiyu
62070301f4 * Code for task#81779. 2023-01-03 17:04:09 +08:00
tanghucheng
62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
田淑杰
866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
liuyongkai
4d20218f56 * Resolve feedback #1849. 2022-12-28 16:28:59 +08:00
caoyanyi
fdc6a81e4d * Modify page style. 2022-12-26 17:22:20 +08:00
caoyanyi
ea5be4ade0 * Modify bug create page style. 2022-12-26 17:10:07 +08:00
wangyidong
bc02660990 * code for task #80451. 2022-12-21 15:50:17 +08:00
tanghucheng
5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
wangyidong
58efe7b011 * code task #80458,80463. 2022-12-20 11:31:15 +08:00
tanghucheng
85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
daitingting
14ea643f61 * Finish task #78361,#78362. 2022-12-02 08:03:37 +00:00
caoyanyi
f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
daitingting
995f927ae6 * Fix bug for task #77615,#77616. 2022-12-01 08:36:46 +00:00
wangyidong
22081a43de * fix bug #30425. 2022-12-01 14:15:35 +08:00
wangyidong
283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
daitingting
2fb8366405 * Finish task #77615,#77616. 2022-11-30 02:49:37 +00:00
caoyanyi
4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
xieqiyu
e6e37d4b20 * Fix bug#30032. 2022-11-23 16:17:01 +08:00
caoyanyi
0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
wangyuting
8805e4647e * Fix bug #30039. 2022-11-21 06:14:10 +00:00
王怡栋
7961c8bc55 Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468

See merge request easycorp/zentaopms!6251
2022-11-18 07:22:01 +00:00
daitingting
50975af558 * Fix bug #29977. 2022-11-18 04:02:20 +00:00
liuhong
51f8bf37d6 * Resolved feedback #1468. 2022-11-18 02:06:16 +00:00
caoyanyi
e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
lanzongjun
2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00
lanzongjun
69bd73c271 * finish task #76338 2022-11-15 15:04:22 +08:00
lanzongjun
d3887137bc * finish task #76338 2022-11-15 11:16:11 +08:00
caoyanyi
1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi
90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
liumengyi
e84e6ac11d * Fix bug of bug link bugs. 2022-11-03 09:51:16 +08:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi
6a6cfaa453 * Adjust code. 2022-10-26 10:01:26 +08:00
caoyanyi
e2a8f5a0fe * Modify view page style. 2022-10-26 09:56:57 +08:00
caoyanyi
a82cc215ba * Optimize page style. 2022-10-25 14:53:46 +08:00
王怡栋
aa49a5bbd3 Merge branch 'zentaopms_239_task_#72984' into 'zentaopms_239'
* Finish task #72984.

See merge request easycorp/zentaopms!5883
2022-10-25 05:08:33 +00:00
daitingting
1aa860c972 * Finish task #72984. 2022-10-25 03:24:04 +00:00
daitingting
9825419bd4 * Finish task #73066. 2022-10-25 02:06:30 +00:00
liyuchun
00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
daitingting
60891c37bb * Finish task #72258. 2022-10-18 02:58:26 +00:00
lanzongjun
aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
wangyuting2
af81361e27 * Finish task #72266 and bug #28441. 2022-10-17 08:16:25 +00:00
daitingting
f5d987b55d * Fix bugs of mutual_test. 2022-10-11 05:17:07 +00:00
sunguangming
876cde442e * Fix bug #28428. 2022-10-11 11:18:49 +08:00
sunguangming
50b2700f56 * Adjust create bug view style. 2022-10-11 09:43:30 +08:00
wangyuting2
aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
daitingting
39064a3e22 * Finish task #71580,#71581,#71582,#71583,#71584. 2022-10-09 08:22:27 +00:00