 王怡栋
|
71ab49c34e
|
Merge branch 'sprint/master_zhouxudong_59529' into 'master'
* Finish task #59534 #59530 #59529.
See merge request easycorp/zentaopms!4325
|
2022-07-05 02:09:08 +00:00 |
|
|
mayue
|
a9773c6be0
|
* Finish task #59700.
|
2022-07-04 17:22:22 +08:00 |
|
|
zhouxudong
|
0b309f63bd
|
* Finish task #59534 #59530 #59529.
|
2022-07-04 08:54:44 +00:00 |
|
|
xieqiyu
|
ff682ac683
|
* Fix bug#23977.
|
2022-06-30 09:04:15 +08:00 |
|
|
王怡栋
|
e05ac602cc
|
Merge branch 'master_xieqiyu_58567' into 'master'
Master xieqiyu 58567
See merge request easycorp/zentaopms!4197
|
2022-06-28 09:31:57 +00:00 |
|
|
xieqiyu
|
92926fce1d
|
* Finish task#58567.
|
2022-06-28 16:48:45 +08:00 |
|
|
leiyong
|
a5b4a79ea8
|
* Adjust code.
|
2022-06-28 05:26:37 +00:00 |
|
|
王怡栋
|
2f837a3970
|
Merge branch 'sprint209_leiyong_task_58598' into 'master'
Sprint209 leiyong task 58598
See merge request easycorp/zentaopms!4167
|
2022-06-28 01:42:06 +00:00 |
|
|
leiyong
|
f8087acd1d
|
* Finish task#58598.
|
2022-06-27 08:49:52 +00:00 |
|
|
hufangzhou
|
f9f3b0c716
|
* Code for task #58568.
|
2022-06-27 14:52:11 +08:00 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
|
王怡栋
|
9ffdc942c2
|
Merge branch 'master' into 'sprint/205'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
|
2022-06-22 09:21:12 +00:00 |
|
|
hufangzhou
|
ac69cd1afb
|
* Finish task #57883.
|
2022-06-22 10:39:55 +08:00 |
|
|
王怡栋
|
a3bb60c87d
|
Merge branch 'sprint/master_zhouxudong_57871' into 'sprint/205'
Sprint/master zhouxudong 57871
See merge request easycorp/zentaopms!4024
|
2022-06-21 06:03:28 +00:00 |
|
|
leiyong
|
725f37fcd0
|
* Finish task#57868.
|
2022-06-20 09:55:19 +00:00 |
|
|
zhouxudong
|
e2d00ec066
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 08:11:52 +00:00 |
|
|
zhouxudong
|
32c34c35e9
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 07:43:08 +00:00 |
|
|
tanghucheng
|
9d92db9900
|
* Fix bug #23891.
|
2022-06-17 15:25:12 +08:00 |
|
|
zhouxudong
|
d31dbf6002
|
* Fix contacts style for different theme.
|
2022-06-16 00:33:27 +00:00 |
|
|
王怡栋
|
99f6d0f16f
|
Merge branch 'sprint/master_zhouxudong_56918' into 'master'
* Finish task #56918.
See merge request easycorp/zentaopms!3929
|
2022-06-15 05:33:58 +00:00 |
|
|
zhouxudong
|
a5f8fdaef3
|
* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.
|
2022-06-15 01:42:32 +00:00 |
|
|
zhouxudong
|
6dc1ecfa95
|
* Finish task #56918.
|
2022-06-14 08:08:52 +00:00 |
|
|
zhouxudong
|
50571ec217
|
* Finish task #56915.
|
2022-06-14 03:13:14 +00:00 |
|
|
zhouxudong
|
fa4d314709
|
* Finish task #56915.
|
2022-06-14 01:09:07 +00:00 |
|
|
孙广明
|
a42ef81a50
|
Merge branch 'fixbug_sunjun_23572' into 'master'
fixbug_sunjun_23572
See merge request easycorp/zentaopms!3874
|
2022-06-13 00:54:52 +00:00 |
|
|
sunjun
|
c8bf2f2e67
|
fixbug_sunjun_23572
|
2022-06-13 00:17:47 +00:00 |
|
|
zhouxin
|
619e31e6f9
|
* Fix issue.
|
2022-06-10 08:10:41 +00:00 |
|
|
sunjun
|
e21aff2d5d
|
sprint_sunjun_201
|
2022-06-10 04:29:30 +00:00 |
|
|
zhouxin
|
c7aa2f7fff
|
* Adjust code.
|
2022-06-10 01:43:10 +00:00 |
|
|
zhouxin
|
ee8af517fa
|
* Finish task #56467.
|
2022-06-10 01:22:12 +00:00 |
|
|
孙广明
|
4d07a2d45b
|
Merge branch 'sprint/199_mayue_task56550,56553' into 'master'
* Finish task #56550,56553.
See merge request easycorp/zentaopms!3840
|
2022-06-10 01:02:07 +00:00 |
|
|
孙广明
|
f02350122a
|
Merge branch 'liyuchun_56551' into 'master'
Liyuchun 56551
See merge request easycorp/zentaopms!3822
|
2022-06-09 09:21:32 +00:00 |
|
|
mayue
|
edda32ba72
|
* Finish task #56550,56553.
|
2022-06-09 17:15:44 +08:00 |
|
|
zhouxin
|
5500e2fb58
|
* Fix bug for task #56458.
|
2022-06-09 08:54:56 +00:00 |
|
|
liyuchun
|
bd2503c558
|
Merge branch 'liyuchun_56551' of https://gitlab.zcorp.cc/easycorp/zentaopms into liyuchun_56551
|
2022-06-09 06:00:44 +00:00 |
|
|
liyuchun
|
975088c89d
|
* Adjust task width.
|
2022-06-09 05:59:43 +00:00 |
|
|
zhouxin
|
c056b7e567
|
* Finish task #56461,56462,56458,56465.
|
2022-06-09 05:18:27 +00:00 |
|
|
孙广明
|
07591cfd0f
|
Merge branch 'sprint_201_56459' into 'master'
Sprint 201 56459
See merge request easycorp/zentaopms!3802
|
2022-06-09 00:35:28 +00:00 |
|
|
sunjun
|
283df0a7b8
|
sprint_201_56459
|
2022-06-08 13:50:36 +00:00 |
|
|
sunjun
|
16e24ac37a
|
sprint_201_56459
|
2022-06-08 07:08:25 +00:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
zenggang
|
bb0cd23f51
|
* Adjust code
|
2022-05-27 07:33:26 +00:00 |
|
|
zenggang
|
c1f648d22a
|
* Fix bug#22957
|
2022-05-26 05:36:53 +00:00 |
|
|
zenggang
|
33a23e09c5
|
* Finish task#55172
|
2022-05-25 02:51:17 +00:00 |
|
|
sunjun
|
7174926385
|
fixbug
|
2022-05-20 05:25:11 +00:00 |
|
|
sunjun
|
8fe60b85d0
|
fixbug
|
2022-05-20 05:14:35 +00:00 |
|
|
sunjun
|
e1acea800f
|
fixbug_sunjun_22695
|
2022-05-20 05:11:52 +00:00 |
|
|
李玉春
|
2eaf30a558
|
Merge branch 'fixbug_sunjun_22696' into 'master'
fixbug_sunjun_22696
See merge request easycorp/zentaopms!3539
|
2022-05-20 03:02:22 +00:00 |
|
|
sunjun
|
ef9f67f252
|
fixbug
|
2022-05-20 02:55:37 +00:00 |
|