 孙广明
|
d6a88be36e
|
Merge branch 'cherry-pick-67052054' into 'sprint/189_package'
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
See merge request easycorp/zentaopms!3457
|
2022-05-18 00:47:35 +00:00 |
|
|
王怡栋
|
5278958100
|
Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570
See merge request easycorp/zentaopms!3459
|
2022-05-18 00:43:53 +00:00 |
|
|
lanzongjun
|
6e0e9d2348
|
* fix bug #22570
|
2022-05-18 08:43:08 +08:00 |
|
|
王怡栋
|
54fb1db3e5
|
Merge branch 'sprint/daitingting_buildFlow' into 'sprint/189_package'
* Build flow menu.
See merge request easycorp/zentaopms!3460
|
2022-05-18 00:36:17 +00:00 |
|
|
daitingting
|
244f061700
|
* Build flow menu.
|
2022-05-17 09:14:29 +00:00 |
|
|
lanzongjun
|
54db8e3f91
|
Merge branch 'sprint/189_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_package
|
2022-05-17 17:13:30 +08:00 |
|
|
lanzongjun
|
10eebbd136
|
* fix bug #22570
|
2022-05-17 17:13:17 +08:00 |
|
|
wangyidong
|
415d9ed538
|
* adjust for merge master code.
|
2022-05-17 17:12:12 +08:00 |
|
|
王怡栋
|
59ad893467
|
Merge branch 'sprint/189_wangyuting_fixbug' into 'sprint/189_package'
* Fix buildOperateMenu bug.
See merge request easycorp/zentaopms!3456
|
2022-05-17 09:00:20 +00:00 |
|
|
wangyuting2
|
f5638d6481
|
* Fix buildOperateMenu bug.
|
2022-05-17 16:56:25 +08:00 |
|
|
王怡栋
|
ebd8840dbb
|
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
* Fix bug #22520
See merge request easycorp/zentaopms!3435
(cherry picked from commit 670520548f)
faf8ee28 * Fix bug #22520
|
2022-05-17 08:49:15 +00:00 |
|
|
王怡栋
|
9ca1be70c7
|
Merge branch '189_tanghucheng_fixbug' into 'sprint/189_package'
* Fix bug.
See merge request easycorp/zentaopms!3442
|
2022-05-17 07:28:08 +00:00 |
|
|
tanghucheng
|
d3dc4ebe43
|
* Fix bug.
|
2022-05-17 06:00:26 +00:00 |
|
|
wangyidong
|
f9b06ea3f9
|
* adjust for workflow field name.
|
2022-05-17 13:50:20 +08:00 |
|
|
wangyidong
|
b86fb91604
|
* adjust for storyClosedReason field.
|
2022-05-17 10:53:43 +08:00 |
|
|
王怡栋
|
166ef2e441
|
Merge branch '189package_xieqiyu_22496' into 'sprint/189_package'
* Fix bug#22496.
See merge request easycorp/zentaopms!3430
|
2022-05-16 09:24:58 +00:00 |
|
|
xieqiyu
|
12844f3dc8
|
* Fix bug#22496.
|
2022-05-16 16:39:10 +08:00 |
|
|
wangyidong
|
759ace3700
|
* code for task #54026.
|
2022-05-16 16:36:04 +08:00 |
|
|
wangyidong
|
f1702375c1
|
* adjust for action position field.
|
2022-05-16 15:29:25 +08:00 |
|
|
wangyidong
|
7e80b5a6f7
|
Merge branch 'devplat16_wangyidong_54037' into sprint/189_package
|
2022-05-16 15:24:21 +08:00 |
|
|
王怡栋
|
cdd560f7ba
|
Merge branch 'sprint/189_package' into 'devplat16_wangyidong_54037'
# Conflicts:
# db/update16.5.sql
|
2022-05-16 07:23:27 +00:00 |
|
|
wangyidong
|
e51b5309d1
|
* fix bug for api.
|
2022-05-16 14:17:36 +08:00 |
|
|
王怡栋
|
77308c7fc1
|
Merge branch 'sprint/189_hufangzhou_sso' into 'master'
* Fix an error of sso.
See merge request easycorp/zentaopms!3419
|
2022-05-16 05:57:59 +00:00 |
|
|
王怡栋
|
0d87358352
|
Merge branch 'sprint/189_hufangzhou_22250' into 'master'
* Fix bug #22250.
See merge request easycorp/zentaopms!3420
|
2022-05-16 05:57:41 +00:00 |
|
|
王怡栋
|
91829138c4
|
Merge branch 'sprint/master_zhouxudong_22523' into 'master'
* Fix bug #22523.
See merge request easycorp/zentaopms!3421
|
2022-05-16 05:56:10 +00:00 |
|
|
zhouxudong
|
9e4d86d6d8
|
* FIx bug #22523.
|
2022-05-16 05:54:54 +00:00 |
|
|
zhouxudong
|
89a150e856
|
* Fix bug #22523.
|
2022-05-16 05:48:54 +00:00 |
|
|
hufangzhou
|
7cc75bf80a
|
* Fix bug #22250.
|
2022-05-16 13:43:36 +08:00 |
|
|
wangyidong
|
d2f84bb3f6
|
* code for task #54037.
|
2022-05-16 13:37:06 +08:00 |
|
|
hufangzhou
|
03556828a6
|
* Fix an error of sso.
|
2022-05-16 13:11:08 +08:00 |
|
|
王怡栋
|
c3d5036eea
|
Merge branch 'fixbug' into 'master'
* Fix bug for sql.
See merge request easycorp/zentaopms!3414
|
2022-05-16 05:07:16 +00:00 |
|
|
王怡栋
|
cd2b17e27b
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of burn when have no data in burn datatable.
See merge request easycorp/zentaopms!3417
|
2022-05-16 05:06:14 +00:00 |
|
|
王怡栋
|
2cdf81eda4
|
Merge branch 'sprint/master_zhouxudong_22441' into 'master'
Sprint/master zhouxudong 22441
See merge request easycorp/zentaopms!3411
|
2022-05-16 05:05:37 +00:00 |
|
|
王怡栋
|
80c36bb26f
|
Merge branch 'sprint/master_zhouxudong_22514' into 'master'
* Fix bug #22514.
See merge request easycorp/zentaopms!3418
|
2022-05-16 05:03:42 +00:00 |
|
|
zhouxudong
|
ec0f0b4a95
|
* Fix bug #22514.
|
2022-05-16 04:01:58 +00:00 |
|
|
xieqiyu
|
ae00461660
|
* Fix bug of burn when have no data in burn datatable.
|
2022-05-16 11:50:54 +08:00 |
|
|
王怡栋
|
71e39dafb2
|
Merge branch 'sprint/189_hufangzhou_deletefile' into 'master'
* Delete the unused file.
See merge request easycorp/zentaopms!3416
|
2022-05-16 03:33:09 +00:00 |
|
|
zhouxudong
|
53102c368e
|
* Fix bug #22441.
|
2022-05-16 03:28:40 +00:00 |
|
|
hufangzhou
|
3f060b57fe
|
* Delete the unused file.
|
2022-05-16 11:27:00 +08:00 |
|
|
王怡栋
|
48e5aff46d
|
Merge branch 'master_xieqiyu_showDeadline' into 'master'
* Show execution deadline at burn in view page.
See merge request easycorp/zentaopms!3415
|
2022-05-16 03:15:17 +00:00 |
|
|
xieqiyu
|
e1942b98b2
|
* Show execution deadline at burn in view page.
|
2022-05-16 11:13:11 +08:00 |
|
|
tanghucheng
|
0c3eb1a759
|
* Fix bug for sql.
|
2022-05-16 02:44:03 +00:00 |
|
|
王怡栋
|
19d32ad6ec
|
Merge branch 'sprint/189_hufangzhou_deletefiles' into 'master'
* Delete the files during upgrade.
See merge request easycorp/zentaopms!3392
|
2022-05-16 02:12:01 +00:00 |
|
|
hufangzhou
|
8baa5938de
|
* Retain necessary files.
|
2022-05-16 10:10:56 +08:00 |
|
|
王怡栋
|
b47dc7a794
|
Merge branch 'hufangzhou_score_autotest' into 'master'
* Add the score auto test case.
See merge request easycorp/zentaopms!3412
|
2022-05-16 02:04:58 +00:00 |
|
|
hufangzhou
|
091c3e1ca4
|
* Add the comment.
|
2022-05-16 10:03:15 +08:00 |
|
|
zhujinyong
|
2c3756a915
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-05-16 10:02:33 +08:00 |
|
|
zhujinyong
|
f97bb8f1b5
|
+ Fix api: parent field of project.
|
2022-05-16 10:02:05 +08:00 |
|
|
王怡栋
|
e1553f2329
|
Merge branch 'master_xieqiyu_unittest' into 'master'
* Add unit test of search module.
See merge request easycorp/zentaopms!3407
|
2022-05-16 02:01:09 +00:00 |
|
|
hufangzhou
|
28d4ca7ff4
|
* Add the score auto test case.
|
2022-05-16 09:56:18 +08:00 |
|