 孙广明
|
1ce9112928
|
Merge branch 'liyuchun_57658'
|
2022-06-23 09:14:54 +08:00 |
|
|
孙广明
|
124701de98
|
Merge branch 'master' into 'liyuchun_57658'
# Conflicts:
# module/repo/control.php
|
2022-06-23 01:14:27 +00:00 |
|
|
李玉春
|
69fa9aa6ed
|
Merge branch 'cyy_optimize' into 'master'
* Adjust style and codes.
See merge request easycorp/zentaopms!4073
|
2022-06-23 01:02:57 +00:00 |
|
|
caoyanyi
|
08a3e4e816
|
* Adjust code.
|
2022-06-23 08:48:22 +08: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 |
|
|
王怡栋
|
4dab93ee3b
|
Merge branch 'sprint/master_zhouxudong_57864' into 'master'
* Finish task #57864.
See merge request easycorp/zentaopms!4082
|
2022-06-23 00:40:27 +00:00 |
|
|
王怡栋
|
f72b89a56e
|
Merge branch 'sprint/master_zhouxudong_57848' into 'master'
Sprint/master zhouxudong 57848
See merge request easycorp/zentaopms!4085
|
2022-06-23 00:39:59 +00:00 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
王怡栋
|
d00f32f34f
|
Merge branch 'master_xieqiyu_57875' into 'master'
* Finish task#57875.
See merge request easycorp/zentaopms!4084
|
2022-06-23 00:37:37 +00:00 |
|
|
朱金勇
|
46f3d0d26a
|
Merge branch 'sprint/sunhao/task57850' into 'master'
* update picker lib.
See merge request easycorp/zentaopms!4081
|
2022-06-23 00:36:55 +00:00 |
|
|
xieqiyu
|
2703bc9ba7
|
* Finish task#57875.
|
2022-06-23 08:33:37 +08:00 |
|
|
zhouxudong
|
666be69169
|
* Finish task #57848.
|
2022-06-23 00:33:03 +00:00 |
|
|
孙广明
|
4b1d8f4fe5
|
Merge branch 'sprint/206_liumengyi_24133' into 'master'
* Fix bug #24133.
See merge request easycorp/zentaopms!4078
|
2022-06-23 00:27:35 +00:00 |
|
|
caoyanyi
|
dd5cf777d9
|
* Modify function name.
|
2022-06-23 08:23:55 +08:00 |
|
|
李玉春
|
e308778583
|
Merge branch 'cyy_23862' into 'master'
* Fix bug #23862.
See merge request easycorp/zentaopms!4064
|
2022-06-23 00:16:10 +00:00 |
|
|
Hao Sun
|
631e65c121
|
* update picker lib.
|
2022-06-22 12:24:05 +00:00 |
|
|
zhouxudong
|
bc416e40fc
|
* Finish task #57864.
|
2022-06-22 10:11:06 +00:00 |
|
|
zhouxudong
|
8c4cd735e5
|
* Finish task #57848.
|
2022-06-22 10:00:49 +00:00 |
|
|
zhouxudong
|
3c091e8281
|
* Finish task #57848.
|
2022-06-22 09:46:26 +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 |
|
|
朱金勇
|
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 |
|
|
liumengyi
|
2bc2c16cc5
|
* Fix bug #24133.
|
2022-06-22 17:27:36 +08: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 |
|
|
leiyong
|
aeaf517513
|
* Keep 2 decimal places.
|
2022-06-22 09:17:10 +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 |
|
|
leiyong
|
3d1a9eb517
|
* Finish task#57878.
|
2022-06-22 08:48:19 +00:00 |
|
|
xieqiyu
|
91ae053816
|
* Code for task#57851.
|
2022-06-22 16:41:36 +08:00 |
|
|
caoyanyi
|
0c894a4355
|
* Adjust style and codes.
|
2022-06-22 16:32:57 +08:00 |
|
|
leiyong
|
df2ef74d07
|
* Finish task#57878.
|
2022-06-22 08:23:43 +00: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 |
|