 王怡栋
|
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
|
808d67b879
|
* Adjust code.
|
2022-06-27 10:32:20 +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 |
|
|
zhouxudong
|
e2d00ec066
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 08:11:52 +00:00 |
|
|
zhouxudong
|
19d289455a
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 06:34:29 +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
|
1ad55fdd08
|
* Finish task #56915.
|
2022-06-14 06:39:25 +00:00 |
|
|
liyuchun
|
975088c89d
|
* Adjust task width.
|
2022-06-09 05:59:43 +00:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
zenggang
|
bb0cd23f51
|
* Adjust code
|
2022-05-27 07:33:26 +00:00 |
|
|
孙华伟
|
8caf05257c
|
*Fix bug #22989.
|
2022-05-26 15:27:54 +08:00 |
|
|
zenggang
|
c1f648d22a
|
* Fix bug#22957
|
2022-05-26 05:36:53 +00:00 |
|
|
sunjun
|
7174926385
|
fixbug
|
2022-05-20 05:25:11 +00:00 |
|
|
sunjun
|
e1acea800f
|
fixbug_sunjun_22695
|
2022-05-20 05:11:52 +00:00 |
|
|
zhouxudong
|
8b6c4b1e38
|
* Finish task #54471.
|
2022-05-19 06:03:18 +00:00 |
|
|
hufangzhou
|
0608a7dadb
|
* Fix bug #21304.
|
2022-04-02 10:55:16 +08:00 |
|
|
zhouxudong
|
b356c5fda0
|
*Fix bug #19293.
|
2022-02-14 16:59:47 +08:00 |
|
|
李玉春
|
052da8f12b
|
Merge branch 'sprint/fixbug_19294' into 'master'
Sprint/fixbug 19294
See merge request easycorp/zentaopms!1757
|
2022-02-11 01:22:53 +00:00 |
|
|
周旭东
|
5ba86b7707
|
Update execution.zh-cn.css
|
2022-02-11 01:20:38 +00:00 |
|
|
周旭东
|
a909b67371
|
Update execution.en.css
|
2022-02-11 01:20:25 +00:00 |
|
|
zhouxudong
|
6ddf3fdc98
|
*Fix bug #19294.
|
2022-02-11 08:59:20 +08:00 |
|
|
孙广明
|
c2f7881b41
|
Merge branch 'sprint/fixbug_19293' into 'master'
Sprint/fixbug 19293
See merge request easycorp/zentaopms!1733
|
2022-02-09 05:05:33 +00:00 |
|
|
周旭东
|
218eab7fa1
|
Update execution.css
|
2022-02-09 02:00:31 +00:00 |
|
|
zhouxudong
|
c38b5803a5
|
*Fix bug #19292.
|
2022-02-09 09:24:26 +08:00 |
|
|
周旭东
|
4ec0dc2b9a
|
Update execution.css
|
2022-02-09 01:13:58 +00:00 |
|
|
zhouxudong
|
87445eca72
|
*Fix bug #19293.
|
2022-02-09 09:10:41 +08:00 |
|
|
zhouxudong
|
b05b565abe
|
*Fix bug #19294.
|
2022-02-08 17:22:18 +08:00 |
|
|
zhouxin
|
71cd99f3e3
|
Fix bugs.
|
2022-02-07 07:38:08 +00:00 |
|
|
dingna
|
2dd70ed7e4
|
* Finish task#43900.
|
2021-11-03 16:02:06 +08:00 |
|
|
dingna
|
7b19208c1b
|
* Finish task#43900.
|
2021-11-03 13:50:07 +08:00 |
|
|
liyuchun
|
3170d8eb24
|
* Code for task #41764.
|
2021-09-01 11:33:29 +08:00 |
|
|
liyuchun
|
49b75957c2
|
* Code for task #41764.
|
2021-08-29 22:30:05 +08:00 |
|
|
liyuchun
|
18352e76b0
|
* Code for task #41764.
|
2021-08-29 22:28:09 +08:00 |
|
|
Hao Sun
|
c45e3985d9
|
* refactor the avatar usage with html::avatar.
|
2021-08-25 14:35:12 +08:00 |
|
|
holan20180123
|
2187c2bbe8
|
* Finish task #40523.
|
2021-07-27 09:39:04 +08:00 |
|
|
tianshujie98
|
3214ac9d49
|
* Adjust page.
|
2021-07-23 10:20:32 +08:00 |
|
|
holan20180123
|
ea9cc9cb2f
|
* Finish task #37099.
|
2021-03-31 13:22:46 +08:00 |
|
|
leiyong
|
fe7fce9512
|
* Adjust code.
|
2021-03-24 10:29:10 +08:00 |
|
|
zhujinyong
|
f54307a4cc
|
* Fix code style.
|
2021-03-10 23:07:20 +08:00 |
|
|
tianshujie98
|
33bcb0922e
|
* Finish task #36438.
|
2021-03-09 17:28:23 +08:00 |
|
|
holan20180123
|
faf9dcaf50
|
* Finish task #36448.
|
2021-03-08 09:25:16 +08:00 |
|