 孙广明
|
2fdb547f3e
|
Merge branch 'master' into 'master_271_78665'
# Conflicts:
# module/build/control.php
|
2022-12-09 08:58:55 +00:00 |
|
|
孙广明
|
a7d7ec312a
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30616
See merge request easycorp/zentaopms!6522
|
2022-12-09 08:55:12 +00:00 |
|
|
wangyidong
|
81d3403a20
|
* code for task #79279.
|
2022-12-09 16:54:17 +08:00 |
|
|
lanzongjun
|
e6301a8ec3
|
* Fix Bug #30616
|
2022-12-09 16:03:32 +08:00 |
|
|
liuhong
|
94b3f9bfd5
|
* resolve conflict task #78665
|
2022-12-09 07:21:08 +00:00 |
|
|
liuhong
|
dd13c3d947
|
* Adjust code task #78665.
|
2022-12-08 15:57:27 +00:00 |
|
|
liuhong
|
14d9f3a5eb
|
* Ajdust code Task #78665.
|
2022-12-08 15:54:45 +00:00 |
|
|
liuhong
|
11ca786545
|
* Fix stories and bug when no associate.
|
2022-12-08 15:35:48 +00:00 |
|
|
liuhong
|
207c5c7117
|
* Adjust code task #78665.
|
2022-12-08 14:40:21 +00:00 |
|
|
liuhong
|
0d9f59c49b
|
* Finish tash for Lang and multiple #78665.
|
2022-12-08 07:48:25 +00:00 |
|
|
liuhong
|
0094f902f5
|
* Finish Task #78665.
|
2022-12-08 06:55:05 +00:00 |
|
|
lanzongjun
|
47284dc742
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-08 14:45:33 +08:00 |
|
|
lanzongjun
|
e6989dc17c
|
* Finish Bug #30687
|
2022-12-08 14:32:27 +08:00 |
|
|
liuhong
|
8ad99f03a5
|
* Adjuct code #78665.
|
2022-12-08 04:24:10 +00:00 |
|
|
liuhong
|
35095aa0b4
|
* Adjust code #78665.
|
2022-12-08 02:06:21 +00:00 |
|
|
wangyidong
|
e4b9ef4536
|
* fix bug #30585.
|
2022-12-08 09:56:31 +08:00 |
|
|
liuhong
|
ec810545d5
|
* draft code for #78665.
|
2022-12-08 00:19:26 +00:00 |
|
|
lanzongjun
|
e6df8be8a6
|
add default branch
|
2022-12-07 09:21:19 +08:00 |
|
|
lanzongjun
|
a228bfdeeb
|
resolve conflict
|
2022-12-06 17:21:18 +08:00 |
|
|
lanzongjun
|
55aac8c426
|
* Finish Task #78664
|
2022-12-06 16:51:58 +08:00 |
|
|
wangyidong
|
0f1de8b84f
|
* code for task #78911
|
2022-12-06 13:43:17 +08:00 |
|
|
wangyidong
|
42e85ebbb8
|
* code for task #78384.
|
2022-12-05 10:10:59 +08:00 |
|
|
wangyidong
|
283b37b65e
|
* adjust for task #77615,77616.
|
2022-12-01 10:26:12 +08:00 |
|
|
wangyidong
|
df0997aa70
|
* change deletereleased param to noreleased.
|
2022-11-30 17:11:17 +08:00 |
|
|
王 于听
|
c96f03c532
|
Merge branch 'master' into 'zentaopms_266_bug#30341'
# Conflicts:
# module/testtask/control.php
|
2022-11-30 07:38:45 +00:00 |
|
|
wangyuting
|
069565c265
|
* Fix bug.
|
2022-11-30 07:37:21 +00:00 |
|
|
wangyidong
|
8efd793e38
|
* adjust for getBuildPairs method.
|
2022-11-30 14:04:32 +08:00 |
|
|
wangyuting
|
a4cc3fd11a
|
* Fix bug #30265.
|
2022-11-25 03:25:52 +00:00 |
|
|
wangyuting
|
40ef984250
|
* Optimize code.
|
2022-11-25 00:38:38 +00:00 |
|
|
wangyuting
|
3075732c2b
|
* Fix bug #30033.
|
2022-11-24 05:01:52 +00:00 |
|
|
王怡栋
|
105a72f34c
|
* fix bug #30158.
|
2022-11-23 14:55:44 +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 |
|
|
wangyuting
|
887afd1a5c
|
* Fix bug #30123.
|
2022-11-23 03:18:45 +00:00 |
|
|
wangyuting
|
f977d2d374
|
* Fix bug #30141.
|
2022-11-23 03:04:57 +00:00 |
|
|
王怡栋
|
3ac62d87a1
|
* code for task #77138.
|
2022-11-22 12:07:53 +08:00 |
|
|
王怡栋
|
e4c02e2857
|
Merge branch 'zentaopms_258_task#76435' into 'master'
* Finish task #76435、76436、76437.
See merge request easycorp/zentaopms!6234
|
2022-11-17 08:47:30 +00:00 |
|
|
wangyuting
|
97073567df
|
* Finish task #76435、76436、76437.
|
2022-11-17 08:42:31 +00:00 |
|
|
wangyuting
|
532bef39f3
|
* Finish task #76434.
|
2022-11-17 08:03:03 +00:00 |
|
|
wangyuting
|
f055b3ffc0
|
* Fix bug #29825.
|
2022-11-16 01:54:15 +00:00 |
|
|
王怡栋
|
72ad339e22
|
Merge branch 'zentaopms_258_task#76032' into 'master'
Zentaopms 258 task#76032
See merge request easycorp/zentaopms!6138
|
2022-11-14 09:06:29 +00:00 |
|
|
wangyuting
|
bb5b3426f6
|
* Finish task #76032.
|
2022-11-14 07:55:25 +00:00 |
|
|
wangyuting
|
5acbf81057
|
* Fix build pairs bug.
|
2022-11-14 06:04:19 +00:00 |
|
|
wangyuting
|
e94c895d51
|
* Optimize code.
|
2022-11-11 07:22:33 +00:00 |
|
|
wangyuting
|
bb49320ee7
|
* Fix bug.
|
2022-11-11 07:07:17 +00:00 |
|
|
wangyuting
|
2f5e0ac70d
|
* Finish task #75239.
|
2022-11-11 00:46:54 +00:00 |
|
|
wangyuting
|
8559d77319
|
* Optimize code.
|
2022-11-10 08:09:17 +00:00 |
|
|
wangyuting
|
59fe4826ca
|
* Finish task #75237.
|
2022-11-10 07:36:35 +00:00 |
|
|
Yagami
|
2133db01bf
|
* Code for release-build bug.
|
2022-11-08 16:15:01 +08:00 |
|
|
Yagami
|
c202a3275a
|
* Fix bug #29156.
|
2022-11-04 09:56:03 +08:00 |
|
|
Yagami
|
3d211b68b0
|
* Finish task #74209.
|
2022-11-01 16:09:54 +08:00 |
|