Commit Graph
51592 Commits
Author SHA1 Message Date
wangxuepeng 8564f6fe0e * Fix bug #32166. 2023-02-23 07:52:27 +00:00
wangxuepeng 7f420cd374 * Fix bug #32166. 2023-02-23 07:32:36 +00:00
王怡栋 65991d0a05 Merge branch 'dev/gfl_admin_css_refactors' into 'master'
* Code for css refactors in admin.

See merge request easycorp/zentaopms!7053
2023-02-23 07:19:31 +00:00
王怡栋 4ad622823f Merge branch 'cyy_dropdown' into 'master'
* Modify closed block style for execution drop down menu.

See merge request easycorp/zentaopms!7050
2023-02-23 07:19:18 +00:00
tianshujie b350a3aff4 * Fix bug #32412. 2023-02-23 14:52:18 +08:00
tianshujie d53ba15bc0 * Update icon for admin menu. 2023-02-23 14:36:07 +08:00
zhujinyong d66127270b * Fix bug #32303. 2023-02-23 14:33:16 +08:00
guofeilong c1153374fa * Code for css refactors in admin. 2023-02-23 14:11:18 +08:00
tianshujie a11b0a52a2 * Modify menu order for admin module. 2023-02-23 13:38:52 +08:00
caoyanyi 8a0e17506f * Modify closed block style for execution drop down menu. 2023-02-23 12:12:56 +08:00
孙广明 61bc2f5a3a Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug #32183, #32400..

See merge request easycorp/zentaopms!7049
2023-02-23 04:02:22 +00:00
孙广明 f5ec563a83 Merge branch 'sprint/hufangzhou_bug_32397' into 'master'
* Fix bug #32397.

See merge request easycorp/zentaopms!7048
2023-02-23 04:02:04 +00:00
孙广明 d4ef7e25fd Merge branch 'sprint/hufangzhou_bug' into 'master'
* Fix the bug of has product waterfall project.

See merge request easycorp/zentaopms!7046
2023-02-23 04:01:41 +00:00
孙广明 4a60b5e049 Merge branch 'sprint/hufangzhou_fixcode' into 'master'
* Remove the uninitialized value.

See merge request easycorp/zentaopms!7045
2023-02-23 04:01:21 +00:00
Yagami 09c6c38389 * Fix bug #32383. 2023-02-23 11:03:34 +08:00
liumengyi c7be7a041e * Fix bug #32400. 2023-02-23 02:53:21 +00:00
liumengyi 36e9f275c9 * Fix bug #32183. 2023-02-23 02:47:31 +00:00
hufangzhou f92716a360 * Fix bug #32397. 2023-02-23 02:30:17 +00:00
Yagami f836e0cd96 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-23 10:19:49 +08:00
Yagami 290487a68a * Fix bug #32263. 2023-02-23 10:19:19 +08:00
hufangzhou 42ffe61dc4 * Fix the bug of has product waterfall project. 2023-02-23 01:55:24 +00:00
孙广明 0d0d6c15c1 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Modify language item, and fix bug #32353.

See merge request easycorp/zentaopms!7043
2023-02-23 01:47:08 +00:00
Yagami 840c89f2e3 * Fix bug #32266. 2023-02-23 09:29:33 +08:00
Yagami d4e4b91625 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-23 09:26:43 +08:00
Yagami 02559581d0 * Fix bug #32267. 2023-02-23 09:26:17 +08:00
liumengyi 510d2e7644 * Fix bug #32353. 2023-02-23 01:23:17 +00:00
wangyidong 35083408c9 * remove useless code. 2023-02-23 09:18:49 +08:00
hufangzhou 166e496346 * Fix the issue 'Refactor this file to either declare symbols or cause side effects, but not both.'. 2023-02-23 01:13:42 +00:00
hufangzhou c2a9a39b10 * Remove the uninitialized value. 2023-02-23 01:01:22 +00:00
liumengyi 776df103cf * Modify language item. 2023-02-23 00:51:21 +00:00
孙广明 dd10524b68 Merge branch 'sprint/hufangzhou_issue_755' into 'master'
* Resolve issue #755.

See merge request easycorp/zentaopms!7042
2023-02-23 00:31:00 +00:00
hufangzhou cd44e32af6 * Resolve issue #755. 2023-02-23 00:19:44 +00:00
王怡栋 3c62d387a3 Merge branch 'dev/gfl_admin_view_refactors' into 'master'
* Code for admin view refactors.

See merge request easycorp/zentaopms!7041
2023-02-22 09:18:07 +00:00
guofeilong a08e498530 * Code for admin view refactors. 2023-02-22 17:17:01 +08:00
guofeilong 966511dc89 * Code for admin view refactors. 2023-02-22 17:08:49 +08:00
孙广明 f37937cd8f Merge branch 'sprint/292_liumengyi_32337' into 'master'
* Fix bug #32337.

See merge request easycorp/zentaopms!7038
2023-02-22 09:07:27 +00:00
孙广明 0b0d592647 Merge branch 'wxp_bug32388' into 'master'
* Fix bug #32388.

See merge request easycorp/zentaopms!7039
2023-02-22 09:07:13 +00:00
孙广明 aaabc5a335 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Only get system classify value.

See merge request easycorp/zentaopms!7035
2023-02-22 09:06:57 +00:00
孙广明 007b01c6ea Merge branch 'sprint/hufangzhou_bug_32372' into 'master'
* Fix bug #32372, #32373.

See merge request easycorp/zentaopms!7040
2023-02-22 09:06:39 +00:00
hufangzhou 553d78a8b3 * Fix bug #32372, #32373. 2023-02-22 09:05:53 +00:00
liumengyi bcae665178 * Fix bug #32337. 2023-02-22 08:56:31 +00:00
wangxuepeng 7ce34db406 * Fix bug #32388. 2023-02-22 08:56:08 +00:00
孙广明 4872692846 Merge branch 'wxp_bug32375' into 'master'
Wxp bug32375

See merge request easycorp/zentaopms!7037
2023-02-22 08:26:38 +00:00
wangxuepeng d20c27d18d * Fix bug #32375. 2023-02-22 08:24:23 +00:00
wangxuepeng f710936784 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into wxp_bug32375 2023-02-22 08:20:10 +00:00
wangxuepeng 16109dc94b * Fix bug #32375. 2023-02-22 08:17:21 +00:00
王怡栋 15f781ccdb Merge branch 'tsj_fixbug' into 'master'
* Modify menu param.

See merge request easycorp/zentaopms!7036
2023-02-22 08:15:04 +00:00
王怡栋 4363ce8031 Merge branch 'ticket_398' into 'master'
* Adjust code for feedback #2274.

See merge request easycorp/zentaopms!7034
2023-02-22 08:14:40 +00:00
tianshujie 12cdb2f6d7 * Modify menu param. 2023-02-22 16:11:21 +08:00
liumengyi 7198c095e5 * Only get system classify value. 2023-02-22 07:58:41 +00:00