 李玉春
|
3c59f5c4a0
|
Merge branch 'sprint/191_tianshujie_fixbug' into 'master'
* Fix bug #22617.
See merge request easycorp/zentaopms!3540
|
2022-05-20 03:09:22 +00:00 |
|
|
tianshujie
|
4ff0410aca
|
* Fix bug #22617.
|
2022-05-20 10:45:48 +08:00 |
|
|
孙广明
|
97f5dcdc9f
|
Merge branch 'sprint190_zg_bugs' into 'master'
* Fix bug#22554,22673,22555
See merge request easycorp/zentaopms!3508
|
2022-05-20 01:41:31 +00:00 |
|
|
孙广明
|
747a7af788
|
Merge branch 'sprint190_zg_54192' into 'master'
* Add project name
See merge request easycorp/zentaopms!3516
|
2022-05-20 01:40:18 +00:00 |
|
|
zhouxudong
|
ab9f80ecfb
|
* Finish task #54478.
|
2022-05-19 08:52:19 +00:00 |
|
|
zenggang
|
de835ecb3e
|
* Fix bug#22555
|
2022-05-19 08:08:39 +00:00 |
|
|
zenggang
|
463ff11e9d
|
* Add project name
|
2022-05-19 07:03:55 +00:00 |
|
|
孙广明
|
6f150a9ea8
|
Merge branch 'master' into 'sprint/191_zhouxin_54352'
# Conflicts:
# module/datatable/config.php
|
2022-05-19 03:18:24 +00:00 |
|
|
zhouxin
|
f08ea8b043
|
* Adjust code.
|
2022-05-19 03:15:13 +00:00 |
|
|
zhouxin
|
235b04f76e
|
* Finis task #54352.
|
2022-05-19 02:02:22 +00:00 |
|
|
孙华伟
|
b59fb9cc1c
|
*Fix bug#22616.
|
2022-05-18 13:43:48 +08:00 |
|
|
liumengyi
|
2f8e2e03e3
|
* Finish task #54336.
|
2022-05-18 08:54:40 +08:00 |
|
|
孙广明
|
268d3c3bcf
|
* Finish task #54218.
|
2022-05-17 16:04:39 +08:00 |
|
|
孙广明
|
270715e54b
|
Merge branch 'sprint_sunjun_631' into 'master'
Sprint sunjun 631
See merge request easycorp/zentaopms!3410
|
2022-05-17 01:15:01 +00:00 |
|
|
sunjun
|
7e9466abbd
|
sprint_sunjun_631
|
2022-05-16 21:08:04 +08:00 |
|
|
zhouxudong
|
53102c368e
|
* Fix bug #22441.
|
2022-05-16 03:28:40 +00:00 |
|
|
sunjun
|
073ee90d40
|
sprint_sunjun_631
|
2022-05-16 11:10:20 +08:00 |
|
|
zhouxudong
|
a5783fa37c
|
* Fix bug #22441.
|
2022-05-16 01:55:08 +00:00 |
|
|
zhouxudong
|
d1d05a067e
|
* Fix bug #22441.
|
2022-05-16 01:38:43 +00:00 |
|
|
sunjun
|
d26e9a0c94
|
sprint_sunjun_631
|
2022-05-16 09:13:55 +08:00 |
|
|
sunjun
|
249190e049
|
sprint_sunjun_631
|
2022-05-16 09:11:50 +08:00 |
|
|
sunjun
|
a4f026d786
|
sprint_sunjun_631
|
2022-05-16 09:08:47 +08:00 |
|
|
xieqiyu
|
8c50568213
|
* Restore the code of task#53671.
|
2022-05-15 21:28:31 +08:00 |
|
|
sunjun
|
f5fe24b54f
|
sprint_sunjun_631
|
2022-05-15 12:47:45 +08:00 |
|
|
sunjun
|
4863551658
|
sprint_sunjun_631
|
2022-05-14 21:06:48 +08:00 |
|
|
sunjun
|
9ad4d27dc4
|
sprint_sunjun_631
|
2022-05-14 20:32:54 +08:00 |
|
|
sunjun
|
e9aab00257
|
sprint_sunjun_631
|
2022-05-14 19:39:22 +08:00 |
|
|
sunjun
|
730561654f
|
sprint_sunjun_631
|
2022-05-13 05:41:39 +00:00 |
|
|
sunjun
|
845c84a1eb
|
*sprint_sunjun_631
|
2022-05-13 02:53:47 +00:00 |
|
|
xieqiyu
|
89491d97de
|
* Resolve issue#629.
|
2022-05-13 03:02:26 +08:00 |
|
|
xieqiyu
|
914f474592
|
* Code for task#53666.
|
2022-05-12 22:58:17 +08:00 |
|
|
王怡栋
|
a9d13faa1a
|
Merge branch 'master' into 'sprint/189_zhouxudong_53651'
# Conflicts:
# module/execution/js/edit.js
|
2022-05-12 05:20:13 +00:00 |
|
|
王怡栋
|
5674160b7e
|
Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666
See merge request easycorp/zentaopms!3353
|
2022-05-12 05:05:25 +00:00 |
|
|
zhouxudong
|
f98d82234a
|
* Finish task #53651.
|
2022-05-12 03:57:23 +00:00 |
|
|
zhouxudong
|
65fff67e58
|
* finish task #53651.
|
2022-05-12 00:30:00 +00:00 |
|
|
xieqiyu
|
612a2b656e
|
* Adjust code style.
|
2022-05-12 00:18:05 +08:00 |
|
|
xieqiyu
|
dab8c1bb1e
|
* Modify review code.
|
2022-05-12 10:55:50 +08:00 |
|
|
xieqiyu
|
ffa1ec828d
|
* Code for task#53661.
|
2022-05-12 10:38:22 +08:00 |
|
|
xieqiyu
|
691de86d4a
|
* Code for task#53661.
|
2022-05-12 08:15:25 +08:00 |
|
|
xieqiyu
|
ce7c0afdc1
|
* Finish task#53666.
|
2022-05-11 18:24:13 +08:00 |
|
|
zhouxudong
|
a0f2b068dc
|
* Fix bug #22339.
|
2022-05-11 08:51:36 +00:00 |
|
|
zhouxudong
|
675d2c2e86
|
* Fix bug #22339.
|
2022-05-11 08:49:22 +00:00 |
|
|
wangyuting2
|
3380222afc
|
* Fix build action menu bug.
|
2022-05-11 16:11:34 +08:00 |
|
|
wangyuting2
|
d4ed89e64a
|
* Finish task #53548.
|
2022-05-11 15:05:13 +08:00 |
|
|
孙广明
|
622185aa65
|
Merge branch 'sprint/189_zhouxudong_53651' into 'master'
Sprint/189 zhouxudong 53651
See merge request easycorp/zentaopms!3323
|
2022-05-11 05:51:12 +00:00 |
|
|
zhouxudong
|
ca827e1d6c
|
* Finish task #53651.
|
2022-05-11 05:32:48 +00:00 |
|
|
王怡栋
|
82968630b0
|
Merge branch 'master_xieqiyu_53671' into 'master'
Master xieqiyu 53671
See merge request easycorp/zentaopms!3322
|
2022-05-11 05:17:05 +00:00 |
|
|
zhouxudong
|
da5cd2aa44
|
* Finish task #53651.
|
2022-05-11 03:02:28 +00:00 |
|
|
xieqiyu
|
c77a6505d3
|
* Finish task#53671.
|
2022-05-11 09:01:17 +08:00 |
|
|
zhouxudong
|
1723a78c92
|
* Finish task #53651.
|
2022-05-10 09:11:06 +00:00 |
|