Commit Graph

1295 Commits

Author SHA1 Message Date
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong
ce74f027b4 * adjust for show all projects. 2022-10-27 08:27:52 +08:00
daitingting
fd288a6a3c * Finish task #71566,#71567,#72987. 2022-10-25 08:20:29 +00:00
wangyidong
585b12838e * code for task #73472. 2022-10-25 14:04:12 +08:00
wangyidong
1a9aca53c0 * code for task #73471. 2022-10-25 11:30:40 +08:00
Yagami
b4bdcd0ca3 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 15:36:28 +08:00
Yagami
187d3b8ca4 * Finish task #72674. 2022-10-19 15:36:15 +08:00
daitingting
6948b02a8c * Finish task #71568. 2022-10-19 03:01:18 +00:00
曹延义
e7391836f7 Merge branch 'master' into cyy_optimize 2022-10-11 16:44:23 +08:00
曹延义
9287efdd8a * Modify acl radio style. 2022-10-11 15:51:34 +08:00
tianshujie
875ac851b4 * Fix bug #28460. 2022-10-11 15:07:12 +08:00
tianshujie
f080000984 * Finish task #71905. 2022-10-10 14:14:33 +08:00
曹延义
5306bb29f9 * Modify page style. 2022-10-09 16:36:57 +08:00
liyuchun
fbb492f4a5 Merge branch 'sprint/244_dyl_70022' 2022-10-08 10:56:08 +08:00
曹延义
bfa7cdbdd7 * Optimize page style. 2022-09-30 13:59:18 +08:00
曹延义
3911275e4f * Modify click style. 2022-09-30 13:36:56 +08:00
dingyongliang
6cbce4d471 * fix danger label overlay. 2022-09-30 05:20:38 +00:00
dingyongliang
768f91b1f5 * task #70022, optimize program style. 2022-09-30 05:20:38 +00:00
曹延义
250a75c1de * Adjust code. 2022-09-30 13:13:52 +08:00
曹延义
d3f1bb0b09 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_28201 2022-09-30 13:13:49 +08:00
曹延义
e1212f0160 * Fix bug #28201. 2022-09-30 09:58:11 +08:00
tianshujie
b4530e1a74 * Fix bug #28184. 2022-09-30 09:19:15 +08:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
李玉春
7d24a5ce0d Merge branch 'sprint/244_tianshujie_fixbug' into 'master'
Sprint/244 tianshujie fixbug

See merge request easycorp/zentaopms!5633
2022-09-30 00:58:12 +00:00
wangyidong
a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tianshujie
fc8f8117a3 * Fix bug #28184. 2022-09-29 18:14:13 +08:00
xieqiyu
bc0aba20b9 * Fix bug#27008. 2022-09-29 08:42:57 +00:00
曹延义
feb98f882c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug 2022-09-29 09:16:40 +08:00
李玉春
befe790a5f Merge branch 'sprint/244_tianshujie_70482' into 'sprint/244'
Sprint/244 tianshujie 70482

See merge request easycorp/zentaopms!5600
2022-09-29 01:08:46 +00:00
wangzemei
f0e61febec Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_70009 2022-09-28 16:34:31 +08:00
dingyongliang
bbd8f8c2e5 * change danger label position. 2022-09-28 08:14:41 +00:00
dingyongliang
dfe949d04f * task #70025, change program and project color. 2022-09-28 08:14:38 +00:00
tianshujie
c96db5b857 * Finish task #70482. 2022-09-28 15:31:44 +08:00
曹延义
e363bb4ef9 Merge branch 'sprint/244' into sprint/244_wangzemei_70009 2022-09-28 15:19:58 +08:00
tianshujie
51fb885b08 * Finish task #70482. 2022-09-28 15:10:49 +08:00
曹延义
b232a4eb68 * Modify batch edit project for program page. 2022-09-28 14:45:20 +08:00
曹延义
d231cad850 * Modify batch edit style. 2022-09-28 14:32:19 +08:00
tianshujie
0266e470c9 * Finish task #70009. 2022-09-28 11:23:40 +08:00
tianshujie
e033345aea * Finish task #70009. 2022-09-28 11:18:17 +08:00
tanghucheng
83dbebc5b8 * Task#70759 Add relation productID for copyProject. 2022-09-28 11:16:33 +08:00
tianshujie
3979c28fb2 * Finish task #70487. 2022-09-28 11:05:50 +08:00
曹延义
46474331ba * Modify batch edit style for product list page. 2022-09-28 11:00:45 +08:00
曹延义
ca5110623e * Add project checkbox style. 2022-09-28 10:09:32 +08:00
tianshujie
4f8bc6a9ad * Finish task #70489,70488. 2022-09-28 10:06:55 +08:00
曹延义
6cb187bec1 * Modify product page style. 2022-09-27 16:26:24 +08:00
曹延义
79009a9d80 * Modify checkbox display. 2022-09-27 15:52:29 +08:00
wangyuting2
80fe821de6 * Finish task #70571. 2022-09-27 01:33:34 +00:00
wangzemei
0d0eca9ff8 * finish task#70009 2022-09-26 14:38:18 +08:00
wangyidong
0ba479e9e5 * finish task #70196. 2022-09-26 13:15:48 +08:00
曹延义
b5e9d3e5ba * Code for task #70502. 2022-09-26 11:10:15 +08:00