Commit Graph
38912 Commits
Author SHA1 Message Date
孙广明 59b7e2675c * Remove unused code. 2022-05-17 11:18:05 +08:00
孙广明 46e4eae295 * Finish task #54205. 2022-05-17 11:15:33 +08:00
孙广明 c4e649ef25 * Finish task #54186. 2022-05-17 09:35:32 +08:00
孙广明 397930ac4e * Code for task #54189. 2022-05-17 08:56:07 +08:00
孙广明 175c38ef9d Merge branch 'bug_22471' into 'master'
* Fix bug#22471

See merge request easycorp/zentaopms!3413
2022-05-16 06:14:40 +00:00
李玉春 8d8a321ed6 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #22490.

See merge request easycorp/zentaopms!3422
2022-05-16 06:14:07 +00: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
tianshujie f328086daf * Fix bug #22490. 2022-05-16 13:43:08 +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
zenggang ef4c0d9849 * Fix bug#22471 2022-05-16 02:46:27 +00: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
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
李玉春 4d086ec901 Merge branch 'sprint/tianshujie_bug22489' into 'master'
* Fix bug #22489.

See merge request easycorp/zentaopms!3409
2022-05-16 01:27:47 +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
朱金勇 f6bad14832 Merge branch 'sprint/189_hufangzhou_refer' into 'master'
* Fix the bug of login failed.

See merge request easycorp/zentaopms!3408
2022-05-16 01:04:08 +00: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
孙广明 d4bc3efcbf Merge branch 'testcase_zhouxin_3' into 'master'
Add testcase.

See merge request easycorp/zentaopms!3406
2022-05-16 00:53:58 +00:00
zhouxin 9556bc3e9b Adjust code. 2022-05-16 00:51:58 +00:00
孙广明 b2dc18e4ac Merge branch 'zg_unit' into 'master'
* Program getlist method unit

See merge request easycorp/zentaopms!3401
2022-05-16 00:51:05 +00:00
孙广明 659a967bd1 Merge branch 'sprint/tianshujie_case' into 'master'
Sprint/tianshujie case

See merge request easycorp/zentaopms!3403
2022-05-16 00:50:42 +00:00
zhouxin 24e2138aef Add testcase. 2022-05-16 00:46:04 +00:00
zenggang e1307f1dc7 * Adjust code 2022-05-16 00:36:40 +00:00
李玉春 8dc60251fc Merge branch 'sprint/189_liumengyi_fixbug' into 'master'
* Fix bug for update.

See merge request easycorp/zentaopms!3405
2022-05-16 00:30:19 +00:00