 liumengyi
|
d73346c395
|
* Finish task #61171, #61170.
|
2022-07-19 15:22:38 +08:00 |
|
|
zhouxudong
|
95dba9297d
|
* Fix bug #24894.
|
2022-07-15 05:43:51 +00:00 |
|
|
liumengyi
|
139b6b4f40
|
* Fix bug #25289.
|
2022-07-14 16:04:03 +08:00 |
|
|
孙广明
|
d8e313669e
|
Merge branch 'sprint/211_sunjun_60474' into 'master'
Sprint/211 sunjun 60474
See merge request easycorp/zentaopms!4503
|
2022-07-13 05:10:46 +00:00 |
|
|
zhouxudong
|
2196d2746d
|
* Finish task #60388.
|
2022-07-12 01:05:21 +00:00 |
|
|
sunjun
|
1404449da1
|
sprint/211_sunjun_60474
|
2022-07-11 09:09:29 +00:00 |
|
|
刘刚
|
f37e8309a3
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Finish task #59641.
See merge request easycorp/zentaopms!4444
|
2022-07-08 09:34:43 +00:00 |
|
|
liuruogu
|
3f7f25dd8a
|
* Finish task #59641.
|
2022-07-08 09:20:14 +00:00 |
|
|
刘刚
|
263419df29
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24959.
See merge request easycorp/zentaopms!4403
|
2022-07-07 03:13:21 +00:00 |
|
|
liuruogu
|
15d87d68e4
|
* Fix bug #24959.
|
2022-07-07 03:12:51 +00:00 |
|
|
liuruogu
|
bf62f6fa75
|
* Fix bug #24959.
|
2022-07-07 03:03:59 +00:00 |
|
|
王怡栋
|
4eb9fb5904
|
Merge branch 'master_xieqiyu_23949' into 'master'
* Fix bug#23949.
See merge request easycorp/zentaopms!4360
|
2022-07-06 01:48:28 +00:00 |
|
|
zhouxudong
|
7a9f685ecf
|
* Finish task #59533.
|
2022-07-06 01:13:31 +00:00 |
|
|
xieqiyu
|
a37d7e3ae8
|
* Fix bug#23949.
|
2022-07-05 22:02:45 +08:00 |
|
|
zhouxudong
|
c23b4fe7b6
|
* Finish task #59536 #59537.
|
2022-07-05 07:34:49 +00:00 |
|
|
刘刚
|
7450daec93
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Finish task #59641.
See merge request easycorp/zentaopms!4343
|
2022-07-05 07:02:00 +00:00 |
|
|
王怡栋
|
0833fddf40
|
Merge branch 'sprint212_leiyong_task_59539' into 'master'
Sprint212 leiyong task 59539
See merge request easycorp/zentaopms!4337
|
2022-07-05 06:41:07 +00:00 |
|
|
liuruogu
|
667b4fcd1a
|
* Finish task #59641.
|
2022-07-05 06:39:10 +00:00 |
|
|
liuruogu
|
31b7377446
|
* Finish task #59641.
|
2022-07-05 05:41:16 +00:00 |
|
|
王怡栋
|
e28ac4526d
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Finish task #59641.
See merge request easycorp/zentaopms!4328
|
2022-07-05 02:45:04 +00:00 |
|
|
liuruogu
|
e82585d3d7
|
* Finish task #59641.
|
2022-07-05 02:06:59 +00:00 |
|
|
liuruogu
|
80a7f810d6
|
* Finish task #59641.
|
2022-07-05 01:39:38 +00:00 |
|
|
leiyong
|
3660b6ef21
|
* Finish task#59539.
|
2022-07-05 01:22:01 +00:00 |
|
|
王怡栋
|
a5a8d418a0
|
Merge branch 'sprint/master_zhouxudong_24681' into 'master'
* Fix bug #24681.
See merge request easycorp/zentaopms!4311
|
2022-07-04 06:56:21 +00:00 |
|
|
wangyidong
|
c88aa6b8f1
|
Merge branch 'zentaomax35'
|
2022-07-04 14:16:06 +08:00 |
|
|
zhouxudong
|
7e612e94c6
|
* Fix bug #24681.
|
2022-07-04 00:17:43 +00:00 |
|
|
孙广明
|
5758f595e0
|
* Code for block bug.
|
2022-07-01 08:54:07 +08:00 |
|
|
王怡栋
|
70a58529fe
|
Merge branch 'master_xieqiyu_24227' into 'master'
* Fix bug#24227.
See merge request easycorp/zentaopms!4277
|
2022-06-30 08:35:25 +00:00 |
|
|
xieqiyu
|
552421f7db
|
* Fix bug#24227.
|
2022-06-30 15:49:24 +08:00 |
|
|
tanghucheng
|
9d0322a1b8
|
* Fix bug #24102.
|
2022-06-30 14:15:13 +08:00 |
|
|
tanghucheng
|
834245e103
|
* Fix bug #24437.
|
2022-06-29 16:06:54 +08:00 |
|
|
liumengyi
|
6c8c18ef61
|
* Fix bug #24468.
|
2022-06-28 15:48:16 +08:00 |
|
|
liumengyi
|
aa0a763a17
|
* Finish task #58559.
|
2022-06-28 13:56:52 +08:00 |
|
|
liumengyi
|
2379f0e4a4
|
* Finish task #58558, #58559.
|
2022-06-28 13:22:23 +08:00 |
|
|
孙广明
|
08b8b3557f
|
Merge branch 'sprint205_leiyong_bug_24036' into 'master'
* Adjust CSS.
See merge request easycorp/zentaopms!4138
|
2022-06-27 02:49:09 +00:00 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
|
leiyong
|
5d9ce4e512
|
* Adjust CSS.
|
2022-06-24 05:32:01 +00:00 |
|
|
leiyong
|
b74f79540c
|
* Fix bug#24036.
|
2022-06-24 02:22:22 +00:00 |
|
|
zhouxudong
|
cebd4f8d38
|
* Fix bug #24173.
|
2022-06-23 07:58:26 +00:00 |
|
|
leiyong
|
f1d9e3375f
|
* Fix bug#24031.
|
2022-06-23 01:16:26 +00:00 |
|
|
王怡栋
|
6fd3c28a23
|
Merge branch 'sprint205_leiyong_task_57878' into 'master'
Sprint205 leiyong task 57878
See merge request easycorp/zentaopms!4074
|
2022-06-23 00:41:00 +00:00 |
|
|
朱金勇
|
bdca637fcf
|
Merge branch 'sprint/205_hufangzhou_24153' into 'master'
* Fix bug #24157,#24155,#24154,#24153.
See merge request easycorp/zentaopms!4080
|
2022-06-22 09:44:34 +00:00 |
|
|
hufangzhou
|
ee7960af51
|
* Fix bug #24157,#24155,#24154.
|
2022-06-22 17:42:59 +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
|
c7a3a89c5b
|
* Fix bug #24153.
|
2022-06-22 17:11:20 +08:00 |
|
|
leiyong
|
3d1a9eb517
|
* Finish task#57878.
|
2022-06-22 08:48:19 +00:00 |
|
|
leiyong
|
df2ef74d07
|
* Finish task#57878.
|
2022-06-22 08:23:43 +00:00 |
|
|
tianshujie
|
e2669481c7
|
* Added German and French.
|
2022-06-22 15:28:45 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|