 liyuchun
|
016ded0c2c
|
* Fix bug #27032.
|
2022-09-01 14:05:32 +08:00 |
|
|
liyuchun
|
2fa11c196e
|
* Fix bug #27041.
|
2022-09-01 13:31:51 +08:00 |
|
|
孙广明
|
2dc4419048
|
Merge branch 'liyuchun_65984' into 'zenops_44'
* Finish task #65983.
See merge request easycorp/zentaopms!5225
|
2022-09-01 05:02:20 +00:00 |
|
|
liyuchun
|
889529b96e
|
* Finish task #65983.
|
2022-09-01 09:15:58 +08:00 |
|
|
孙广明
|
8337296a4b
|
Merge branch 'liyuchun_65984' into 'zenops_44'
Liyuchun 65984
See merge request easycorp/zentaopms!5200
|
2022-08-31 06:23:32 +00:00 |
|
|
liyuchun
|
c076825df5
|
Merge branch 'zenops_44' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_44
|
2022-08-30 16:59:26 +08:00 |
|
|
liyuchun
|
d9642d657f
|
* Finish task #65984.
|
2022-08-30 16:58:48 +08:00 |
|
|
caoyanyi
|
20d6ee9e10
|
Merge branch 'master' into zenops_44
|
2022-08-30 16:39:58 +08:00 |
|
|
王怡栋
|
9b456c830c
|
Merge branch 'max44_tanghucheng' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!5197
zentaopms_17.6
|
2022-08-30 06:53:55 +00:00 |
|
|
tanghucheng
|
5cb74fee0b
|
* Fix bug .
|
2022-08-30 14:50:49 +08:00 |
|
|
王怡栋
|
c6f4f5445f
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug flex
See merge request easycorp/zentaopms!5196
|
2022-08-30 06:36:30 +00:00 |
|
|
lanzongjun
|
8dc6585522
|
* fix bug flex
|
2022-08-30 14:35:05 +08:00 |
|
|
王怡栋
|
cf4abbc1f7
|
Merge branch 'master_xieqiyu_27042' into 'master'
* Fix bug#27042.
See merge request easycorp/zentaopms!5195
|
2022-08-30 06:35:01 +00:00 |
|
|
xieqiyu
|
6cfb7f414f
|
* Fix bug#27042.
|
2022-08-30 14:32:54 +08:00 |
|
|
王怡栋
|
8a704ec3cd
|
Merge branch 'sprint/hufangzhou_27046' into 'master'
* Fix bug #27046.
See merge request easycorp/zentaopms!5194
|
2022-08-30 06:07:47 +00:00 |
|
|
hufangzhou
|
a8669f9404
|
* Fix bug #27046.
|
2022-08-30 14:06:09 +08:00 |
|
|
孙广明
|
1fc1eb600e
|
Merge branch 'liyuchun_65976' into 'zenops_44'
Liyuchun 65976
See merge request easycorp/zentaopms!5186
|
2022-08-30 01:26:11 +00:00 |
|
|
孙广明
|
4b73d8a02b
|
Merge branch 'liyuchun_65983' into 'zenops_44'
* Finish task #65978.
See merge request easycorp/zentaopms!5178
|
2022-08-30 01:25:35 +00:00 |
|
|
liyuchun
|
f7c9667736
|
Merge branch 'zenops_44' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_44
|
2022-08-30 09:13:57 +08:00 |
|
|
liyuchun
|
39dddce524
|
* Fix bug #26980.
|
2022-08-30 09:13:34 +08:00 |
|
|
王怡栋
|
b9c8994857
|
Merge branch 'sprint/ZUI_guofeilong_fix_confilc_problem' into 'master'
* Fix confilct problem
See merge request easycorp/zentaopms!5191
|
2022-08-30 00:47:30 +00:00 |
|
|
guofeilong
|
e23fec4835
|
* Fix confilct problem
|
2022-08-30 00:43:41 +00:00 |
|
|
王怡栋
|
11f225dfb0
|
Merge branch 'master_liuhong_66461' into 'master'
*Fix bug #66461.
See merge request easycorp/zentaopms!5180
|
2022-08-30 00:31:45 +00:00 |
|
|
liuhong
|
806dddb5e0
|
*Fix bug #66461.
|
2022-08-30 00:30:00 +00:00 |
|
|
王怡栋
|
22b6282461
|
Merge branch 'master_liuhong_26239' into 'master'
*Fix bug before 26239.
See merge request easycorp/zentaopms!5177
|
2022-08-30 00:17:12 +00:00 |
|
|
李玉春
|
e0f7cde28a
|
Merge branch 'cyy_bug' into 'zenops_44'
* Modify file not open.
See merge request easycorp/zentaopms!5190
|
2022-08-29 09:13:55 +00:00 |
|
|
caoyanyi
|
c072744ace
|
* Modify file not open.
|
2022-08-29 17:12:48 +08:00 |
|
|
李玉春
|
0c70cc0109
|
Merge branch 'sprint/sunhao/zui' into 'master'
*fix $.createLink missing extra params.
See merge request easycorp/zentaopms!5188
|
2022-08-29 09:09:10 +00:00 |
|
|
Hao Sun
|
2a63d83df8
|
*fix $.createLink missing extra params.
|
2022-08-29 09:03:13 +00:00 |
|
|
李玉春
|
1ff554ea69
|
Merge branch 'cyy_bug' into 'zenops_44'
Cyy bug
See merge request easycorp/zentaopms!5187
|
2022-08-29 08:59:02 +00:00 |
|
|
liyuchun
|
c2e7a209e3
|
* Adjsut code.
|
2022-08-29 16:45:46 +08:00 |
|
|
caoyanyi
|
dd7283082e
|
* Optimize repo view style.
|
2022-08-29 16:44:40 +08:00 |
|
|
liyuchun
|
007aec70c8
|
* Fix error when update commit.
|
2022-08-29 16:43:17 +08:00 |
|
|
liyuchun
|
82996a13de
|
* Reduction code.
|
2022-08-29 16:11:00 +08:00 |
|
|
liyuchun
|
088c55f390
|
* Add history log.
|
2022-08-29 16:09:22 +08:00 |
|
|
王怡栋
|
09b0a8c3c5
|
Merge branch 'fixbug' into 'master'
* Fix bug #26984.
See merge request easycorp/zentaopms!5182
|
2022-08-29 08:06:33 +00:00 |
|
|
王怡栋
|
f42b17f605
|
Update control.php
|
2022-08-29 08:06:10 +00:00 |
|
|
王怡栋
|
5b56d7b2f1
|
Merge branch 'sprint/231_zg_bugs' into 'master'
* Fix sprint231 bugs
See merge request easycorp/zentaopms!5184
|
2022-08-29 08:03:22 +00:00 |
|
|
王怡栋
|
5d36f71815
|
Merge branch 'master_xieqiyu_27010' into 'master'
* Fix bug#27010.
See merge request easycorp/zentaopms!5185
|
2022-08-29 08:02:35 +00:00 |
|
|
xieqiyu
|
ea98130180
|
* Fix bug#27010.
|
2022-08-29 15:35:01 +08:00 |
|
|
caoyanyi
|
bf204a96d0
|
* Fix bug #26981.
|
2022-08-29 15:27:35 +08:00 |
|
|
zenggang
|
062af71ff8
|
* Fix sprint231 bugs
|
2022-08-29 07:23:32 +00:00 |
|
|
孙广明
|
870765fe8b
|
Merge branch 'sprint/235_liumengyi_fixbug' into 'master'
* Fix bug #23957, #26846.
See merge request easycorp/zentaopms!5183
|
2022-08-29 07:18:01 +00:00 |
|
|
tanghucheng
|
8514669f10
|
* Fix bug #26996.
|
2022-08-29 15:15:57 +08:00 |
|
|
liumengyi
|
9b0f6544df
|
* Fix bug #23957, #26846.
|
2022-08-29 15:11:21 +08:00 |
|
|
tanghucheng
|
ddb8ddaacf
|
＊ Code for bug #26984.
|
2022-08-29 15:03:20 +08:00 |
|
|
tanghucheng
|
9b2613b6e7
|
* Fix bug #26984.
|
2022-08-29 14:59:37 +08:00 |
|
|
孙广明
|
469ea747cc
|
Merge branch 'sprint/tianshujie_bug26936' into 'master'
* Fix bug #26936.
See merge request easycorp/zentaopms!5181
|
2022-08-29 06:52:31 +00:00 |
|
|
tianshujie
|
a072b794e5
|
* Fix bug #26936.
|
2022-08-29 14:51:21 +08:00 |
|
|
liuhong
|
e69ab6d423
|
*Fix bug #66461.
|
2022-08-29 05:55:32 +00:00 |
|