Commit Graph

1315 Commits

Author SHA1 Message Date
xieqiyu
4813aea7b3 * Fix bug#30214. 2022-11-24 14:31:10 +08:00
孙广明
f689432ec8 Merge branch 'sprint/zentaopms262_mayue_bug#29958' into 'master'
* Fix bug #29958.

See merge request easycorp/zentaopms!6275
2022-11-22 02:19:26 +00:00
mayue
94bf632389 * Fix bug #29958. 2022-11-22 10:15:33 +08:00
Yagami
ae9764ebd1 * Finish task #77013. 2022-11-22 09:30:28 +08:00
xieqiyu
679f2641aa * Fallback code for bug#29896. 2022-11-16 17:19:43 +08:00
xieqiyu
2a7493ac78 * Fix bug#29896. 2022-11-16 15:48:18 +08:00
daitingting
8e872c71e3 * Fix bug #29623. 2022-11-15 06:49:19 +00:00
tianshujie
0544c75976 * Modify the project list name display question. 2022-11-11 09:20:55 +08:00
孙广明
78b1d5b847 Merge branch 'cyy_bug' into 'master'
* Modify secondary menu error.

See merge request easycorp/zentaopms!6078
2022-11-08 04:26:00 +00:00
caoyanyi
8570e9a061 * Modify secondary menu error. 2022-11-08 11:47:57 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi
abe3332930 * Fix bug #29224, 29094. 2022-11-03 14:56:55 +08:00
tianshujie
9a4b253718 * Change the color of the program name when hover. 2022-11-03 09:11:33 +08:00
daitingting
cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
daitingting
8ad4ae27ef * Doing task #73985. 2022-11-01 08:41:11 +00:00
daitingting
219f7d6a24 * Optimize codes. 2022-11-01 06:19:45 +00:00
tianshujie
c51a1b9233 * Finish task #74082. 2022-10-31 16:58:31 +08:00
daitingting
dc4940c39d * Fix bug #28966. 2022-10-28 08:11:24 +00:00
wangyidong
d1f11b72d8 * fix bug #29065. 2022-10-28 14:08:53 +08:00
wangyidong
9f18188062 * fix bug #29062. 2022-10-28 13:13:01 +08:00
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