 王怡栋
|
307629f078
|
* change nodeletereleased param to withreleased.
|
2022-11-23 17:23:02 +08:00 |
|
|
王怡栋
|
cb00dd2f6e
|
Merge branch 'sprint/konglingmao_feedback1514' into 'master'
+ Resolved feedback #1514, notice error when project required.
See merge request easycorp/zentaopms!6341
|
2022-11-23 09:20:17 +00:00 |
|
|
王怡栋
|
c2c238ecc1
|
Merge branch 'master_bug_23269' into 'master'
* Fix bug #30162.
See merge request easycorp/zentaopms!6339
|
2022-11-23 08:31:05 +00:00 |
|
|
王怡栋
|
0330c90d05
|
Merge branch 'zentaopms_263_bug_30165' into 'master'
* Fix bug #30165,#30170.
See merge request easycorp/zentaopms!6336
|
2022-11-23 08:13:59 +00:00 |
|
|
王怡栋
|
03d888faf2
|
Merge branch 'bug_26556' into 'master'
* Fix bug#26556
See merge request easycorp/zentaopms!6334
|
2022-11-23 08:13:40 +00:00 |
|
|
王怡栋
|
0f5110c024
|
Merge branch 'sprint/hufangzhou_changelog' into 'master'
* Adjust the changelog.
See merge request easycorp/zentaopms!6333
|
2022-11-23 08:13:20 +00:00 |
|
|
王怡栋
|
df41806707
|
Merge branch 'zentaopms_263_wangyuting3' into 'master'
* Optimize set module page css.
See merge request easycorp/zentaopms!6331
|
2022-11-23 08:13:06 +00:00 |
|
|
王怡栋
|
e8ebacaf09
|
Merge branch 'zentaopms_263_bug_#30085' into 'master'
* Fix bug #30085.
See merge request easycorp/zentaopms!6329
|
2022-11-23 08:12:49 +00:00 |
|
|
王怡栋
|
105a72f34c
|
* fix bug #30158.
|
2022-11-23 14:55:44 +08:00 |
|
|
王怡栋
|
1bf75c2d0a
|
Merge branch 'zentaopms_263_bug_#30151' into 'master'
* Fix bug #30151.
See merge request easycorp/zentaopms!6328
|
2022-11-23 06:12:20 +00:00 |
|
|
王怡栋
|
af88ae8739
|
* fix for show bug openedBuild and reslovedBuild.
|
2022-11-23 14:05:51 +08:00 |
|
|
王怡栋
|
65e48a1c49
|
Merge branch 'zentaopms_263_bug#30141' into 'master'
* Fix bug #30141.
See merge request easycorp/zentaopms!6322
|
2022-11-23 05:45:20 +00:00 |
|
|
王怡栋
|
2cd292eedf
|
Merge branch 'zentaopms_263_bug#29641' into 'master'
* Fix bug #29641.
See merge request easycorp/zentaopms!6321
|
2022-11-23 05:45:06 +00:00 |
|
|
王怡栋
|
476ceeaa6a
|
Merge branch 'bug_27991' into 'master'
Bug 27991
See merge request easycorp/zentaopms!6319
|
2022-11-23 05:44:52 +00:00 |
|
|
王怡栋
|
838f499ca6
|
Merge branch 'zentaopms_263_bug_#30104' into 'master'
* Fix bug #30104.
See merge request easycorp/zentaopms!6318
|
2022-11-23 05:44:05 +00:00 |
|
|
王怡栋
|
3dd409514c
|
Merge branch 'zentaopms_263_wangyuting2' into 'master'
* Optimize project build css.
See merge request easycorp/zentaopms!6315
|
2022-11-23 05:43:50 +00:00 |
|
|
王怡栋
|
0f7d90ca2b
|
Merge branch 'zentaopms_263_sort_features'
|
2022-11-23 13:43:10 +08:00 |
|
|
王怡栋
|
6cd5d4c2d4
|
Merge branch 'master' into 'zentaopms_263_sort_features'
# Conflicts:
# module/custom/config.php
|
2022-11-23 05:42:45 +00:00 |
|
|
王怡栋
|
d63eb75150
|
Merge branch 'zentaopms_263_bug#30130' into 'master'
* Fix bug #30130.
See merge request easycorp/zentaopms!6324
|
2022-11-23 05:40:47 +00:00 |
|
|
王怡栋
|
1e4b1f1aec
|
Merge branch 'zentaopms_263_bug#30123' into 'master'
* Fix bug #30123.
See merge request easycorp/zentaopms!6325
|
2022-11-23 05:40:21 +00:00 |
|
|
王怡栋
|
4f78b87c4c
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Fix feedback #1526.
See merge request easycorp/zentaopms!6327
|
2022-11-23 05:39:56 +00:00 |
|
|
王怡栋
|
cedec7a5e6
|
Merge branch 'zentaopms_263_bug_#30113' into 'master'
* Fix bug #30113.
See merge request easycorp/zentaopms!6326
|
2022-11-23 05:38:40 +00:00 |
|
|
王怡栋
|
db4bd4ebd6
|
* fix bug #29996.
|
2022-11-23 13:12:53 +08:00 |
|
|
王怡栋
|
d98c9413f0
|
* fix bug #30074.
|
2022-11-23 11:09:47 +08:00 |
|
|
王怡栋
|
23e9d91bf9
|
Merge branch 'zentaopms_263_task_#77137' into 'master'
* Disabled current mode button.
See merge request easycorp/zentaopms!6316
|
2022-11-23 02:35:42 +00:00 |
|
|
王怡栋
|
fb86a78032
|
* fix bug #30124.
|
2022-11-23 10:00:41 +08:00 |
|
|
王怡栋
|
cc0fb8eeef
|
Merge branch 'master_bug_23269' into 'master'
* Fix bug #23269.
See merge request easycorp/zentaopms!6306
|
2022-11-23 01:55:01 +00:00 |
|
|
王怡栋
|
abca6db236
|
Merge branch 'zentaopms_263_bug#30045' into 'master'
* Fix bug #30045.
See merge request easycorp/zentaopms!6308
|
2022-11-23 01:54:26 +00:00 |
|
|
王怡栋
|
1c008655e1
|
Merge branch 'zentaopms_263_bug#29994' into 'master'
* Fix bug #29994.
See merge request easycorp/zentaopms!6311
|
2022-11-23 01:53:52 +00:00 |
|
|
王怡栋
|
c82784f408
|
Merge branch 'zentaopms_263_wangyuting' into 'master'
* Optimize code with review code.
See merge request easycorp/zentaopms!6312
|
2022-11-23 01:53:20 +00:00 |
|
|
王怡栋
|
f53e8d7664
|
Merge branch 'zentaopms_263_task_#77137' into 'master'
* Finish task #77137.
See merge request easycorp/zentaopms!6313
|
2022-11-23 01:52:41 +00:00 |
|
|
王怡栋
|
3de3777bfa
|
* adjust for getBuildPairs.
|
2022-11-22 17:25:29 +08:00 |
|
|
王怡栋
|
d09370ba2d
|
* fix bug #30077.
|
2022-11-22 17:25:29 +08:00 |
|
|
王怡栋
|
142893f511
|
Merge branch 'zentaopms_263_wangyuting' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!6303
|
2022-11-22 08:40:00 +00:00 |
|
|
王怡栋
|
f4edba03f1
|
Merge branch 'zentaopms_263_wangyuting' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!6302
|
2022-11-22 08:31:35 +00:00 |
|
|
王怡栋
|
04ced67953
|
Merge branch 'zentaopms_263_task_#77143' into 'master'
* Finish task #77143.
See merge request easycorp/zentaopms!6301
|
2022-11-22 08:31:21 +00:00 |
|
|
王怡栋
|
72106fa341
|
Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.
See merge request easycorp/zentaopms!6300
|
2022-11-22 08:02:34 +00:00 |
|
|
王怡栋
|
827f04e98a
|
* fix bug #30094.
|
2022-11-22 15:34:40 +08:00 |
|
|
王怡栋
|
a1cded3942
|
Merge branch 'zentaopms_263_task#77131'
|
2022-11-22 15:08:29 +08:00 |
|
|
王怡栋
|
0699b9e061
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-22 15:07:51 +08:00 |
|
|
王怡栋
|
b996270738
|
* code for task #77138.
|
2022-11-22 14:56:48 +08:00 |
|
|
王怡栋
|
c8abe9f23a
|
Merge branch 'zentaopms_263_task#77140' into 'master'
* Finish task #77140.
See merge request easycorp/zentaopms!6297
|
2022-11-22 06:39:17 +00:00 |
|
|
王怡栋
|
18d88bad03
|
Merge branch 'tianshujie_fixbug' into 'master'
* Fixed pager jump error in the use case list.
See merge request easycorp/zentaopms!6294
|
2022-11-22 06:01:41 +00:00 |
|
|
王怡栋
|
44caf18a51
|
Merge branch 'zentaopms_263_task#77130' into 'master'
* Finish task #77130.
See merge request easycorp/zentaopms!6292
|
2022-11-22 06:01:07 +00:00 |
|
|
王怡栋
|
a2d5371030
|
* code for task #77138,77135,77134,77133,77132,77129.
|
2022-11-22 13:54:33 +08:00 |
|
|
王怡栋
|
bac4eeab8b
|
* code for task #77135.
|
2022-11-22 13:39:28 +08:00 |
|
|
王怡栋
|
3ac62d87a1
|
* code for task #77138.
|
2022-11-22 12:07:53 +08:00 |
|
|
王怡栋
|
816abf82d4
|
Merge branch 'zentaopms_263_task#77136' into 'master'
* Finish task #77136.
See merge request easycorp/zentaopms!6290
|
2022-11-22 02:24:55 +00:00 |
|
|
王怡栋
|
3b6b770d72
|
* fix bug #30068.
|
2022-11-22 09:45:05 +08:00 |
|
|
王怡栋
|
d30344e2ca
|
* fix bug #29555.
|
2022-11-22 09:01:12 +08:00 |
|
|
王怡栋
|
52c59a98e0
|
* fix bug #30005.
|
2022-11-22 09:01:12 +08:00 |
|
|
王怡栋
|
d16ba0ba54
|
Merge branch 'zentaopms_263_bug#29949' into 'master'
* Fix bug #29949.
See merge request easycorp/zentaopms!6283
|
2022-11-21 08:53:55 +00:00 |
|
|
王怡栋
|
62cd6de63a
|
Merge branch 'zentaopms_263_wangyuting' into 'master'
Zentaopms 263 wangyuting
See merge request easycorp/zentaopms!6282
|
2022-11-21 08:53:38 +00:00 |
|
|
王怡栋
|
cb1015130a
|
Merge branch 'zentaopms_263_bug#29639' into 'master'
* Fix bug #29639.
See merge request easycorp/zentaopms!6280
|
2022-11-21 08:53:18 +00:00 |
|
|
王怡栋
|
f3d4aa99b0
|
Merge branch 'zentaopms_263_bug#30039' into 'master'
* Fix bug #30039.
See merge request easycorp/zentaopms!6279
|
2022-11-21 08:52:59 +00:00 |
|
|
王怡栋
|
5d92d10f6f
|
Merge branch 'zentaopms_263_bug#29950' into 'master'
* Fix bug #29950.
See merge request easycorp/zentaopms!6278
|
2022-11-21 08:52:44 +00:00 |
|
|
王怡栋
|
566083b6fe
|
Merge branch 'sprint/wangzemei/29616' into 'master'
* fix bug 29616
See merge request easycorp/zentaopms!6285
|
2022-11-21 08:52:15 +00:00 |
|
|
王怡栋
|
7a47096356
|
* fix bug #30007.
|
2022-11-21 14:10:53 +08:00 |
|
|
王怡栋
|
b816b78e4a
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #30011.
See merge request easycorp/zentaopms!6272
|
2022-11-21 05:27:54 +00:00 |
|
|
王怡栋
|
223546510d
|
Merge branch 'zentaopms_263_bug#29561' into 'master'
* Fix bug #29561.
See merge request easycorp/zentaopms!6270
|
2022-11-21 05:27:16 +00:00 |
|
|
王怡栋
|
3370266e03
|
Merge branch 'zentaopms_263_bug#28274' into 'master'
* Fix bug #28274.
See merge request easycorp/zentaopms!6267
|
2022-11-21 05:26:39 +00:00 |
|
|
王怡栋
|
26d0d54c22
|
Merge branch 'zentaopms_263_bug#30000' into 'master'
* Fix bug #30000.
See merge request easycorp/zentaopms!6266
|
2022-11-21 05:26:23 +00:00 |
|
|
王怡栋
|
2fb3ed6fd9
|
Merge branch 'zentaopms_263_bug_subprogram' into 'master'
* Display all products of the top program.
See merge request easycorp/zentaopms!6265
|
2022-11-21 05:26:07 +00:00 |
|
|
王怡栋
|
2020fd2ae7
|
Merge branch 'zentaopms_263_bug#30003' into 'master'
* Fix bug #30003.
See merge request easycorp/zentaopms!6264
|
2022-11-21 05:25:28 +00:00 |
|
|
王怡栋
|
111f145d61
|
* fix bug #29953.
|
2022-11-21 13:23:13 +08:00 |
|
|
王怡栋
|
3852627523
|
* fix bug #29557.
|
2022-11-21 11:30:59 +08:00 |
|
|
王怡栋
|
d9e22f5976
|
* fix bug #29670.
|
2022-11-21 10:48:07 +08:00 |
|
|
王怡栋
|
e993d07670
|
* fix bug for show build.
|
2022-11-21 09:29:19 +08:00 |
|
|
王怡栋
|
e55339258b
|
Merge branch 'master_feedback_1353' into 'master'
* Resolved feedback #1353.
See merge request easycorp/zentaopms!6015
|
2022-11-21 01:16:39 +00:00 |
|
|
王怡栋
|
68e6f5695f
|
Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.
See merge request easycorp/zentaopms!6261
|
2022-11-21 00:53:18 +00:00 |
|
|
王怡栋
|
e1a7dfb06e
|
Merge branch 'sprint/hufangzhou_sql' into 'master'
* Adjust the standard sql.
See merge request easycorp/zentaopms!6262
|
2022-11-21 00:51:03 +00:00 |
|
|
王怡栋
|
40e9827d45
|
Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug
See merge request easycorp/zentaopms!6260
|
2022-11-18 08:29:41 +00:00 |
|
|
王怡栋
|
1db91b628a
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29442#29695
See merge request easycorp/zentaopms!6258
|
2022-11-18 08:28:55 +00:00 |
|
|
王怡栋
|
29cddd773a
|
* fix bug #75779.
|
2022-11-18 16:25:14 +08:00 |
|
|
王怡栋
|
9274950e61
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #24065,23090.
See merge request easycorp/zentaopms!6256
|
2022-11-18 07:24:22 +00:00 |
|
|
王怡栋
|
c14659e8d8
|
Merge branch 'zentaopms_258_bug#28221' into 'master'
* Fix bug #28221.
See merge request easycorp/zentaopms!6254
|
2022-11-18 07:23:35 +00:00 |
|
|
王怡栋
|
d8f5a8bb60
|
Merge branch 'tianshujie_css' into 'master'
* Modify the execution name width problem in the execution list.
See merge request easycorp/zentaopms!6253
|
2022-11-18 07:23:13 +00:00 |
|
|
王怡栋
|
28f7de276c
|
Merge branch 'master_xieqiyu_76490' into 'master'
* Fix bug#29677.
See merge request easycorp/zentaopms!6252
|
2022-11-18 07:22:17 +00:00 |
|
|
王怡栋
|
7961c8bc55
|
Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468
See merge request easycorp/zentaopms!6251
|
2022-11-18 07:22:01 +00:00 |
|
|
王怡栋
|
68eb73e7ff
|
Merge branch 'zentaopms_261_bug_#29977' into 'master'
* Fix bug #29977.
See merge request easycorp/zentaopms!6250
|
2022-11-18 07:21:02 +00:00 |
|
|
王怡栋
|
c4c367d34a
|
Merge branch 'cyy_bug' into 'master'
* Fix bug #29974.
See merge request easycorp/zentaopms!6249
|
2022-11-18 07:20:38 +00:00 |
|
|
王怡栋
|
350d74575e
|
Merge branch 'master_xieqiyu_29990' into 'master'
* Fix bug#29990.
See merge request easycorp/zentaopms!6248
|
2022-11-18 07:20:08 +00:00 |
|
|
王怡栋
|
abfdcaa4f5
|
Merge branch 'zentaopms_261_bug_#29948' into 'master'
* Fix bug #29948.
See merge request easycorp/zentaopms!6247
|
2022-11-18 07:19:49 +00:00 |
|
|
王怡栋
|
c291211ac9
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76459
See merge request easycorp/zentaopms!6246
|
2022-11-18 07:19:36 +00:00 |
|
|
王怡栋
|
47dd0a2a4d
|
Merge branch 'zentaopms_258_bug#29942' into 'master'
* Fix bug #29942.
See merge request easycorp/zentaopms!6245
|
2022-11-18 07:19:03 +00:00 |
|
|
王怡栋
|
a8e22a8884
|
Merge branch 'zentaopms_261_bug_#29653' into 'master'
* Fix bug #29653.
See merge request easycorp/zentaopms!6244
|
2022-11-18 07:18:49 +00:00 |
|
|
王怡栋
|
6164fa0c69
|
Merge branch 'zentaopms_258_bug#29959' into 'master'
* Fix bug #29959.
See merge request easycorp/zentaopms!6243
|
2022-11-18 07:18:30 +00:00 |
|
|
王怡栋
|
07117610a7
|
Merge branch 'zentaopms_261_bug_#29931' into 'master'
* Fix bug #29931.
See merge request easycorp/zentaopms!6242
|
2022-11-18 07:17:53 +00:00 |
|
|
王怡栋
|
988f80e133
|
Merge branch 'zentaopms261_wyd' into 'master'
* adjust for create release.
See merge request easycorp/zentaopms!6257
|
2022-11-18 07:10:55 +00:00 |
|
|
王怡栋
|
07c1b0cc45
|
* adjust for create release.
|
2022-11-18 15:09:21 +08:00 |
|
|
王怡栋
|
8aeb743c8f
|
Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd
See merge request easycorp/zentaopms!6255
|
2022-11-18 06:42:59 +00:00 |
|
|
王怡栋
|
1c0129945c
|
* code for task #76439,76440.
|
2022-11-18 14:25:24 +08:00 |
|
|
王怡栋
|
fb9aa7d0dd
|
* code for task #76438.
|
2022-11-18 10:57:15 +08:00 |
|
|
王怡栋
|
db540eb67a
|
* code for task #76438.
|
2022-11-18 10:53:30 +08:00 |
|
|
王怡栋
|
cd0500cdf9
|
Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix unlink btn class bug.
See merge request easycorp/zentaopms!6240
|
2022-11-18 02:35:25 +00:00 |
|
|
王怡栋
|
94d49f0799
|
Merge branch 'master_xieqiyu_76453' into 'master'
* Fix bug#29969.
See merge request easycorp/zentaopms!6238
|
2022-11-18 02:34:21 +00:00 |
|
|
王怡栋
|
b0d617966e
|
Merge branch 'sprint/zentaopms262_mayue_bug#29944' into 'master'
* Fix bug #29944.
See merge request easycorp/zentaopms!6241
|
2022-11-18 02:34:04 +00:00 |
|
|
王怡栋
|
a73719e9ed
|
Merge branch 'master_xieqiyu_76419' into 'master'
* Fix bug#29742.
See merge request easycorp/zentaopms!6237
|
2022-11-18 02:11:06 +00:00 |
|
|
王怡栋
|
787128c30e
|
Merge branch 'cyy_bug' into 'master'
Cyy bug
See merge request easycorp/zentaopms!6235
|
2022-11-18 02:10:53 +00:00 |
|
|
王怡栋
|
d599d1849e
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29947 task #76414
See merge request easycorp/zentaopms!6232
|
2022-11-18 02:10:34 +00:00 |
|