 朱金勇
|
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 |
|
|
朱金勇
|
626fc121a1
|
Merge branch 'sprint/sunhao/task57850' into 'master'
* update picker with new option "checkable".
See merge request easycorp/zentaopms!4077
|
2022-06-22 09:43:04 +00:00 |
|
|
hufangzhou
|
ee7960af51
|
* Fix bug #24157,#24155,#24154.
|
2022-06-22 17:42:59 +08:00 |
|
|
孙广明
|
5bc619b929
|
Merge branch 'fixbug_custom' into 'master'
fixbug_custom
See merge request easycorp/zentaopms!4079
|
2022-06-22 09:30:04 +00:00 |
|
|
sunjun
|
b76b5ae8fc
|
fixbug_custom
|
2022-06-22 09:29:11 +00:00 |
|
|
王怡栋
|
9d264f0514
|
Merge branch 'master_xieqiyu_57851' into 'master'
* Finish task#57851.
See merge request easycorp/zentaopms!4072
|
2022-06-22 09:22:22 +00:00 |
|
|
wangyidong
|
2a948b5de6
|
Merge branch 'sprint/205'
|
2022-06-22 17:21:32 +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 |
|
|
Hao Sun
|
cdb889d707
|
* update picker with new option "checkable".
|
2022-06-22 09:18:22 +00:00 |
|
|
孙广明
|
bc35c845ec
|
Merge branch 'fixbug_doc' into 'master'
fixbug_doc
See merge request easycorp/zentaopms!4076
|
2022-06-22 09:12:40 +00:00 |
|
|
hufangzhou
|
c7a3a89c5b
|
* Fix bug #24153.
|
2022-06-22 17:11:20 +08:00 |
|
|
sunjun
|
ddd5818fc1
|
fixbug_doc
|
2022-06-22 09:10:27 +00:00 |
|
|
王怡栋
|
c070183b29
|
Merge branch 'sprint/205_hufangzhou_24151' into 'master'
* Fix bug #24151.
See merge request easycorp/zentaopms!4075
|
2022-06-22 08:53:20 +00:00 |
|
|
hufangzhou
|
48fb1a45f0
|
* Fix bug #24151.
|
2022-06-22 16:50:42 +08:00 |
|
|
xieqiyu
|
91ae053816
|
* Code for task#57851.
|
2022-06-22 16:41:36 +08:00 |
|
|
xieqiyu
|
1bc779acd9
|
* Finish task#57851.
|
2022-06-22 16:20:14 +08:00 |
|
|
王怡栋
|
3b6ecf50ef
|
Merge branch 'sprint/206_tianshujie_57898' into 'master'
* Fix bug #23930.
See merge request easycorp/zentaopms!4071
|
2022-06-22 08:18:35 +00:00 |
|
|
王怡栋
|
7f7188a6c2
|
Merge branch 'fixbug' into 'master'
* Fix bug #24078.
See merge request easycorp/zentaopms!4070
|
2022-06-22 08:18:14 +00:00 |
|
|
tanghucheng
|
1968070dd4
|
* Fix bug #24078.
|
2022-06-22 15:44:26 +08:00 |
|
|
李玉春
|
7df829be39
|
Merge branch 'zenops_zhouxin_fixbug' into 'master'
* Adjust code.
See merge request easycorp/zentaopms!4069
|
2022-06-22 07:33:37 +00:00 |
|
|
王怡栋
|
b802c0a8fd
|
Merge branch 'sprint/206_tianshujie_lang' into 'master'
* Added German and French.
See merge request easycorp/zentaopms!4068
|
2022-06-22 07:32:36 +00:00 |
|
|
zhouxin
|
0e1dff66a8
|
* Adjust code.
|
2022-06-22 07:30:56 +00:00 |
|
|
tianshujie
|
e2669481c7
|
* Added German and French.
|
2022-06-22 15:28:45 +08:00 |
|
|
wangyidong
|
a762d70878
|
Merge branch 'sprint/206'
|
2022-06-22 15:26:33 +08:00 |
|
|
王怡栋
|
03c76b1565
|
Merge branch 'master' into 'sprint/206'
# Conflicts:
# db/update17.1.sql
|
2022-06-22 07:26:11 +00:00 |
|
|
李玉春
|
497b32f627
|
Merge branch 'zenops_36' into 'master'
Zenops 36
See merge request easycorp/zentaopms!4066
|
2022-06-22 07:18:41 +00:00 |
|
|
孙广明
|
a7bcfb4224
|
Merge branch 'sprint/207_mayue_bug#24049' into 'master'
* Fix bug #24049;
See merge request easycorp/zentaopms!4065
|
2022-06-22 07:06:20 +00:00 |
|
|
mayue
|
c3109321a6
|
* Fix bug #24049;
|
2022-06-22 15:04:28 +08:00 |
|
|
孙广明
|
3b86bcb73d
|
Merge branch 'zg_58291' into 'master'
* Finish task#58291
See merge request easycorp/zentaopms!4062
|
2022-06-22 06:05:39 +00:00 |
|
|
孙广明
|
2b29927fa9
|
Merge branch 'zg_57907' into 'master'
* Code for task #57907
See merge request easycorp/zentaopms!4050
|
2022-06-22 06:05:24 +00:00 |
|
|
孙广明
|
b65967c622
|
Merge branch 'sprint_57888' into 'sprint/206'
*Finish task #57888
See merge request easycorp/zentaopms!4063
|
2022-06-22 06:04:51 +00:00 |
|
|
sunjun
|
2514a53fde
|
fixbug
|
2022-06-22 06:03:07 +00:00 |
|
|
sunjun
|
c883c3b7a3
|
fixbug
|
2022-06-22 05:58:31 +00:00 |
|
|
孙广明
|
491f5051d1
|
Merge branch 'sprint_206_58289' into 'sprint/206'
sprint_206_58259
See merge request easycorp/zentaopms!4061
|
2022-06-22 05:51:17 +00:00 |
|
|
sunjun
|
b0fbce7fd4
|
*Finish task #57888
|
2022-06-22 05:48:13 +00:00 |
|
|
zenggang
|
ba8f8b2644
|
* Finish task#58291
|
2022-06-22 05:35:32 +00:00 |
|
|
王怡栋
|
68f18a695d
|
Merge branch 'sprint/205_hufangzhou_57883' into 'master'
* Finish task #57883.
See merge request easycorp/zentaopms!4055
|
2022-06-22 05:31:58 +00:00 |
|
|
李玉春
|
2b94fe3a83
|
Merge branch 'cyy_mr' into 'zenops_36'
* Modify repo id save.
See merge request easycorp/zentaopms!4058
|
2022-06-22 05:03:50 +00:00 |
|
|
caoyanyi
|
2d96651ad9
|
* Modify repo id save.
|
2022-06-22 11:57:02 +08:00 |
|
|
wangyidong
|
1e7ec30f10
|
* fix bug for build url in PATH_INFO.
|
2022-06-22 11:45:26 +08:00 |
|
|
孙广明
|
4433b96281
|
Merge branch 'sprint205_leiyong_feishu' into 'sprint/205'
Sprint205 leiyong feishu
See merge request easycorp/zentaopms!4057
|
2022-06-22 03:17:31 +00:00 |
|
|
sunjun
|
138aa7d507
|
sprint_206_58259
|
2022-06-22 03:16:39 +00:00 |
|
|
孙广明
|
e225a1bf6e
|
Merge branch 'sprint_206_57892' into sprint/206
|
2022-06-22 11:10:45 +08:00 |
|
|
孙广明
|
1b562972e8
|
Merge branch 'sprint/206' into 'sprint_206_57892'
# Conflicts:
# module/doc/model.php
|
2022-06-22 03:10:18 +00:00 |
|
|
liumengyi
|
38f48bd103
|
* Optimize code for task#57892.
|
2022-06-22 11:08:42 +08:00 |
|
|
tianshujie
|
20de2fde71
|
* Fix bug #23930.
|
2022-06-22 11:04:10 +08:00 |
|
|
liumengyi
|
5ce8133079
|
* Fix bug for task #57891 #57890 #57889 #57886 #57885 #57892 #57887.
|
2022-06-22 10:58:57 +08:00 |
|
|
leiyong
|
a5df9de8ad
|
* Finish task#57901.
|
2022-06-22 02:58:47 +00:00 |
|
|
李玉春
|
9ac2f27b24
|
Merge branch 'zenops36_zhouxin_57655' into 'zenops_36'
* Finish task #57655.
See merge request easycorp/zentaopms!4054
|
2022-06-22 02:58:37 +00:00 |
|
|
zhouxin
|
4cf1630ae3
|
* Adjust code.
|
2022-06-22 02:55:18 +00:00 |
|