 王怡栋
|
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 |
|
|
王怡栋
|
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 |
|
|
孙广明
|
c41b4f6e69
|
Merge branch 'sprint205_leiyong_task_57901' into 'sprint/205'
Sprint205 leiyong task 57901
See merge request easycorp/zentaopms!4032
|
2022-06-21 06:45:17 +00: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
|
b0645c9cdd
|
* Adjust CSS.
|
2022-06-21 02:13:42 +00:00 |
|
|
leiyong
|
725f37fcd0
|
* Finish task#57868.
|
2022-06-20 09:55:19 +00:00 |
|
|
leiyong
|
bb125909dc
|
Finish task#57864.
|
2022-06-20 09:44:25 +00:00 |
|
|
leiyong
|
101c0f58a5
|
* Finish task#57863.
|
2022-06-20 06:58:29 +00:00 |
|
|
zhouxudong
|
19d289455a
|
* Finish task #57880 #57881 #57866.
|
2022-06-20 06:34:29 +00:00 |
|
|
zhouxudong
|
85dac08786
|
* Fix bug #23693.
|
2022-06-15 06:22:17 +00:00 |
|
|
zhouxudong
|
6307cd07e2
|
* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.* Fix bug #23693.
|
2022-06-15 06:20:28 +00:00 |
|
|
xieqiyu
|
771db77e9f
|
* Finish task#56907.
|
2022-06-13 14:03:54 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
xieqiyu
|
36e609f808
|
* Fix bug#23116.
|
2022-06-06 16:52:30 +08:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
leiyong
|
ea4eb1d2de
|
* Finish task#54979.
|
2022-05-26 07:28:03 +00:00 |
|
|
zenggang
|
c1f648d22a
|
* Fix bug#22957
|
2022-05-26 05:36:53 +00:00 |
|
|
tianshujie
|
ad49931b1d
|
* Add testcase of block module.
|
2022-05-13 22:32:17 +08:00 |
|
|
tianshujie
|
2835c2a3e8
|
* Add testcase of block module.
|
2022-05-13 11:13:36 +08:00 |
|
|
wangyidong
|
9508d7729b
|
* code for bug #21400.
|
2022-04-27 09:55:50 +08:00 |
|
|
wangyidong
|
66df7b4990
|
* code for bug #15377.
|
2022-04-26 16:43:10 +08:00 |
|