Commit Graph
32185 Commits
Author SHA1 Message Date
liumengyi 47ec417f16 * Fix bug #22689. 2022-05-19 15:39:10 +08:00
wangyidong 8c4931f287 * hold files. 2022-05-19 13:49:07 +08:00
王怡栋 557304ec0b Merge branch 'sprint/189_hufangzhou_updatemax' into 'sprint/189_package'
* Add the upgrade program of max.

See merge request easycorp/zentaopms!3510
2022-05-19 05:34:50 +00:00
wangyidong f289e08b9d * use buildOperateMenu method for build and projectrelease module. 2022-05-19 13:34:02 +08:00
hufangzhou c1186efeda * Add the upgrade program of max. 2022-05-19 13:07:30 +08:00
hufangzhou 82c4eba324 * Fix bug #22637. 2022-05-18 16:36:34 +08:00
王怡栋 276d1b2197 Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570

See merge request easycorp/zentaopms!3477
2022-05-18 05:35:22 +00:00
lanzongjun 867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00
lanzongjun ece8976470 * fix bug #22570 2022-05-18 13:20:43 +08:00
wangyidong cceff98fd5 * Add id for post data. 2022-05-18 10:47:23 +08:00
王怡栋 94f34f045f Merge branch 'sprint/189_wangyuting_fixbug#22573' into 'sprint/189_package'
* Fix bug #22573.

See merge request easycorp/zentaopms!3464
2022-05-18 01:51:43 +00:00
wangyuting2 04041e6fb5 * Fix bug #22572. 2022-05-18 09:41:15 +08:00
wangyuting2 af47d16938 * Fix bug #22573. 2022-05-18 09:27:14 +08: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
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
wangyuting2 f5638d6481 * Fix buildOperateMenu bug. 2022-05-17 16:56:25 +08: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
王怡栋 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
王怡栋 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
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
hufangzhou 03556828a6 * Fix an error of sso. 2022-05-16 13:11:08 +08: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
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
xieqiyu e1942b98b2 * Show execution deadline at burn in view page. 2022-05-16 11:13:11 +08: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
hufangzhou 091c3e1ca4 * Add the comment. 2022-05-16 10:03:15 +08:00
hufangzhou 28d4ca7ff4 * Add the score auto test case. 2022-05-16 09:56:18 +08:00
zhouxudong a5783fa37c * Fix bug #22441. 2022-05-16 01:55:08 +00:00
zhouxudong d1d05a067e * Fix bug #22441. 2022-05-16 01:38:43 +00:00
tianshujie bc694cb2f4 * Delete extra blank lines. 2022-05-16 09:24:58 +08:00
tianshujie aaea60f6ad * Fix bug #22489. 2022-05-16 09:13:18 +08:00
hufangzhou 5b20d429b4 * Fix the bug of login failed. 2022-05-16 09:03:13 +08:00
王怡栋 9bc0b237e4 Merge branch 'master_xieqiyu_22409' into 'master'
* Fix bug#22409.

See merge request easycorp/zentaopms!3389
2022-05-16 00:59:34 +00:00