 liumengyi
|
2bc2c16cc5
|
* Fix bug #24133.
|
2022-06-22 17:27:36 +08: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 |
|
|
王怡栋
|
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 |
|
|
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 |
|
|
李玉春
|
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 |
|
|
zhouxin
|
46cef64035
|
* Add badge.
|
2022-06-22 02:48:36 +00:00 |
|
|
hufangzhou
|
ac69cd1afb
|
* Finish task #57883.
|
2022-06-22 10:39:55 +08:00 |
|
|
王怡栋
|
0e847b9645
|
Merge branch 'sprint/206_liumengyi_58063' into 'sprint/206'
Sprint/206 liumengyi 58063
See merge request easycorp/zentaopms!4053
|
2022-06-22 02:39:17 +00:00 |
|
|
孙广明
|
6ab82bfcb9
|
Merge branch 'sprint/206_tianshujie_57893' into 'sprint/206'
Sprint/206 tianshujie 57893
See merge request easycorp/zentaopms!4052
|
2022-06-22 02:06:42 +00:00 |
|
|
liumengyi
|
2fce450bb8
|
* Fix bug for task #58063.
|
2022-06-22 09:54:08 +08:00 |
|
|
wangyidong
|
c219ffdc7c
|
* adjust for upgrade lite version.
|
2022-06-22 09:53:27 +08:00 |
|
|
孙广明
|
1ebe8d8f06
|
Merge branch 'sprint/207_mayue_bug#23982' into 'master'
* Fix bug #23982.
See merge request easycorp/zentaopms!4049
|
2022-06-22 01:49:36 +00:00 |
|
|
王怡栋
|
aabcddbc1b
|
Merge branch 'sprint/205_hufangzhou_57855' into 'master'
* Fix bug for the character width.
See merge request easycorp/zentaopms!4051
|
2022-06-22 01:46:18 +00:00 |
|
|
tianshujie
|
3c428752cc
|
* Finish task #57893.
|
2022-06-22 09:45:54 +08:00 |
|
|
hufangzhou
|
49b9f3dffb
|
* Fix bug for the character width.
|
2022-06-22 09:32:07 +08:00 |
|
|
zenggang
|
5bad1b3167
|
* Code for task #57907
|
2022-06-22 01:26:42 +00:00 |
|
|
zhouxin
|
a29205235b
|
* Finish task #57655.
|
2022-06-22 01:23:19 +00:00 |
|
|
mayue
|
0ae4dc0878
|
* Fix bug #23982.
|
2022-06-22 09:19:32 +08:00 |
|
|
孙广明
|
0234c82b19
|
Merge branch 'sprint/206_tianshujie_lang' into 'master'
* Finish story #32623.
See merge request easycorp/zentaopms!4048
|
2022-06-22 01:12:35 +00:00 |
|
|
liumengyi
|
8c229fa6bc
|
* Finish task #58063.
|
2022-06-22 08:59:29 +08:00 |
|