 田淑杰
|
db2851ceae
|
* Fix bug #28021.
|
2022-12-26 09:54:51 +08:00 |
|
|
田淑杰
|
e0a9509e87
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-26 08:32:30 +08:00 |
|
|
wangyidong
|
f0b1d7fbd2
|
* fix bug #29812.
|
2022-12-23 13:58:08 +08:00 |
|
|
wangyidong
|
f40926eed2
|
* fix bug #29852.
|
2022-12-23 12:04:57 +08:00 |
|
|
wangyidong
|
177dcb534f
|
* fix bug #29951.
|
2022-12-23 11:53:02 +08:00 |
|
|
wangyidong
|
a65844d582
|
* fix bug #30008.
|
2022-12-23 10:48:15 +08:00 |
|
|
wangyidong
|
0a3df6b5ec
|
* fix bug #30254.
|
2022-12-23 10:21:12 +08:00 |
|
|
wangyidong
|
13e8ae5728
|
* adjust code.
|
2022-12-23 08:11:36 +08:00 |
|
|
wangyidong
|
0369dba360
|
* adjust for execution field width for project build page.
|
2022-12-22 19:24:49 +08:00 |
|
|
朱金勇
|
92d3c36a9a
|
Merge branch 'fix_user_doccomment' into 'master'
* Fix doc comment for user module.
See merge request easycorp/zentaopms!6621
|
2022-12-22 09:05:20 +00:00 |
|
|
Lufei
|
b19ce38241
|
* Fix doc comment for user module.
|
2022-12-22 16:27:40 +08:00 |
|
|
caoyanyi
|
15ea4e0e22
|
* Optimize page style.
|
2022-12-22 16:24:43 +08:00 |
|
|
王怡栋
|
7be5f7b5a6
|
Merge branch 'sprint/272_wzm_31123' into 'sprint/272'
* fix bug 31123
See merge request easycorp/zentaopms!6619
|
2022-12-22 07:18:24 +00:00 |
|
|
王怡栋
|
747579cb2b
|
Merge branch 'sprint/feedback1799' into 'master'
Sprint/feedback1799
See merge request easycorp/zentaopms!6616
|
2022-12-22 07:17:39 +00:00 |
|
|
wangzemei
|
f2cb91a66b
|
* fix css
|
2022-12-22 15:15:36 +08:00 |
|
|
孙广明
|
d93c194410
|
Merge branch 'zhouxin_feedback_1807' into 'master'
* Fix bug for feedback 1807.
See merge request easycorp/zentaopms!6618
|
2022-12-22 06:41:56 +00:00 |
|
|
wangzemei
|
4af98c110d
|
* fix bug
|
2022-12-22 14:37:21 +08:00 |
|
|
zhouxin
|
14f967733f
|
* Fix bug for feedback 1807.
|
2022-12-22 06:31:58 +00:00 |
|
|
wangzemei
|
81edf30213
|
* fix bug 31123
|
2022-12-22 14:23:39 +08:00 |
|
|
tianshujie
|
34aae407f0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-22 13:22:36 +08:00 |
|
|
caoyanyi
|
b5092a22dd
|
* Fix bug #31133.
|
2022-12-22 12:25:56 +08:00 |
|
|
chaideqing
|
b72e6e2d0c
|
* Fix feedback 1799.
|
2022-12-22 12:13:52 +08:00 |
|
|
曹延义
|
7074488133
|
* Fix bug #31126.
|
2022-12-22 04:13:32 +00:00 |
|
|
chaideqing
|
435852fd14
|
* Fix feedback 1799 .
|
2022-12-22 11:53:20 +08:00 |
|
|
caoyanyi
|
2934b892af
|
* Modify system mode check.
|
2022-12-21 21:45:08 +08:00 |
|
|
tianshujie
|
a3bccd0eff
|
* code for task 79627
|
2022-12-21 19:44:02 +08:00 |
|
|
宋辰轩
|
5e5cfd3e64
|
* code for task 79627
|
2022-12-21 18:18:06 +08:00 |
|
|
wangyidong
|
e6eddbb075
|
* fix bug #30242.
|
2022-12-21 17:31:08 +08:00 |
|
|
wangyidong
|
d24441491c
|
* fix bug #30591.
|
2022-12-21 16:48:09 +08:00 |
|
|
孙广明
|
a712a8df5a
|
Merge branch 'zhouxin_feedback_1807' into 'master'
* Resolve feedback #1807.
See merge request easycorp/zentaopms!6612
|
2022-12-21 08:26:12 +00:00 |
|
|
wangyidong
|
b8b0affbee
|
* fix bug #30994.
|
2022-12-21 16:19:29 +08:00 |
|
|
wangzemei
|
d98f999afa
|
* Modify picture display
|
2022-12-21 16:16:57 +08:00 |
|
|
田淑杰
|
68bc0ba488
|
* Finish task #79635.
|
2022-12-21 16:12:30 +08:00 |
|
|
孙广明
|
f6c1d5ffca
|
Merge branch 'sprint/272_tsj_theme' into sprint/272
|
2022-12-21 16:00:12 +08:00 |
|
|
孙广明
|
dac9acb115
|
Merge branch 'sprint/272' into 'sprint/272_tsj_theme'
# Conflicts:
# module/block/view/visionswitch.html.php
|
2022-12-21 07:59:41 +00:00 |
|
|
zhouxin
|
e56ac56ca3
|
* Resolve feedback #1807.
|
2022-12-21 07:58:28 +00:00 |
|
|
田淑杰
|
a2fa75e05b
|
* Finish task #79626.
|
2022-12-21 15:54:42 +08:00 |
|
|
wangyidong
|
bc02660990
|
* code for task #80451.
|
2022-12-21 15:50:17 +08:00 |
|
|
王怡栋
|
9edf73ff68
|
Merge branch 'sprint/272_wzm_vision' into 'sprint/272'
* Optimized page display
See merge request easycorp/zentaopms!6609
|
2022-12-21 07:26:35 +00:00 |
|
|
wangzemei
|
d837b16812
|
* Optimized page display
|
2022-12-21 15:20:30 +08:00 |
|
|
wangzemei
|
68434d5018
|
* Optimized page display
|
2022-12-21 15:19:28 +08:00 |
|
|
wangyidong
|
034c750da5
|
* code for task #80457.
|
2022-12-21 15:15:28 +08:00 |
|
|
田淑杰
|
a3e5882fb3
|
* Finish task #79626.
|
2022-12-21 14:39:56 +08:00 |
|
|
王怡栋
|
ad2a39cac2
|
Merge branch 'sprint/272_wzm_31070' into 'sprint/272'
* fix 31070
See merge request easycorp/zentaopms!6608
|
2022-12-21 06:33:12 +00:00 |
|
|
田淑杰
|
bd5d882e35
|
* Finish task #79626.
|
2022-12-21 14:11:10 +08:00 |
|
|
wangzemei
|
0560303306
|
* fix 31070
|
2022-12-21 14:08:50 +08:00 |
|
|
caoyanyi
|
3a6ed5c082
|
* Optimize page style.
|
2022-12-21 11:52:31 +08:00 |
|
|
caoyanyi
|
449d18b712
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-21 11:44:46 +08:00 |
|
|
caoyanyi
|
a95a9e8d00
|
* Modify page style and language.
|
2022-12-21 11:44:28 +08:00 |
|
|
孙广明
|
5d99b865ad
|
Merge branch 'sprint/272_tsj' into 'sprint/272'
* Finish task #79625.
See merge request easycorp/zentaopms!6607
|
2022-12-21 03:28:11 +00:00 |
|