Commit Graph
35109 Commits
Author SHA1 Message Date
孙广明 ec9ff2d44d Merge branch 'sprint/220_liumengyi_fixissue' into 'master'
* Fix issue #695, #696.

See merge request easycorp/zentaopms!4675
2022-07-27 05:43:20 +00:00
hufangzhou c4296b1b9f * Compatible with zentaomax. 2022-07-27 13:35:06 +08:00
孙广明 61babc61a5 Merge branch 'sprint/scx_userapi' into 'master'
* Add User api param.

See merge request easycorp/zentaopms!4645
2022-07-27 05:10:22 +00:00
liumengyi 757a39e21b * Fix issue #696. 2022-07-27 13:06:34 +08:00
liumengyi 0ba22df874 * Fix issue #695. 2022-07-27 13:06:12 +08:00
李玉春 8e0a5d4eee Merge branch 'cyy_git_tag' into 'master'
* Modify tag get.

See merge request easycorp/zentaopms!4670
2022-07-27 02:10:11 +00:00
王怡栋 0b87a710f1 Merge branch 'sprint/master_zhouxudong_25703' into 'master'
* Fix bug #25703.

See merge request easycorp/zentaopms!4673
2022-07-27 02:06:23 +00:00
王怡栋 8eb24df570 Merge branch 'sprint220_zg_61964' into 'master'
Sprint220 zg 61964

See merge request easycorp/zentaopms!4663
2022-07-27 02:05:06 +00:00
zenggang 4bd33b9cba * Adjust code 2022-07-27 01:53:26 +00:00
zhouxudong 38ae663640 * Fix bug #25703. 2022-07-27 01:52:04 +00:00
zenggang 3897108473 * Adjust code 2022-07-27 01:23:11 +00:00
liumengyi f9c408db4c * Fix bug for dynamic view. 2022-07-27 09:20:58 +08:00
caoyanyi a3a27c51ec * Adjust code. 2022-07-27 08:56:35 +08:00
caoyanyi a57bae6c2b * Add language. 2022-07-27 08:52:56 +08:00
王怡栋 c6dc59a9e3 Merge branch 'master_xieqiyu_25708' into 'master'
* Fix bug#25708.

See merge request easycorp/zentaopms!4669
2022-07-27 00:52:01 +00:00
hufangzhou 4c7699178a * Modify the object id equal zero for custom type doc. 2022-07-27 08:48:42 +08:00
李玉春 8fe00ca4cd Merge branch 'master' into 'cyy_repo'
# Conflicts:
#   db/update17.3.sql
2022-07-27 00:31:56 +00:00
xieqiyu 94c72b04e1 * Fix bug#25708. 2022-07-27 08:29:42 +08:00
王怡栋 6b9c9c4893 Merge branch 'sprint/master_zhouxudong_25696' into 'master'
* Fix bug #25696.

See merge request easycorp/zentaopms!4664
2022-07-27 00:28:49 +00:00
caoyanyi 3b3bf589f9 * Adjust codes. 2022-07-27 08:27:57 +08:00
hufangzhou 8883ac8e77 * Finish task #62132, #62133, #62134, #62135, #62136. 2022-07-26 18:14:09 +08:00
tianshujie a84a4098e9 * Fix bug #25721. 2022-07-26 17:18:35 +08:00
tianshujie a2f203990e * Fixed burnout chart display in execution list. 2022-07-26 17:05:13 +08:00
zhouxudong 3e842a6316 * Fix bug #25696. 2022-07-26 08:53:24 +00:00
zenggang 0baf0d5fda * Finish task#62107 2022-07-26 08:51:47 +00:00
caoyanyi 228898dd1b * Modify repo url. 2022-07-26 16:22:10 +08:00
王怡栋 f4b971d877 Merge branch 'sprint/220_liumengyi_25699' into 'master'
* Fix bug #25699, #25700.

See merge request easycorp/zentaopms!4661
2022-07-26 08:16:38 +00:00
王怡栋 a83f7c629a Merge branch 'sprint/220_liumengyi_24009' into 'master'
* Fix bug #24009.

See merge request easycorp/zentaopms!4660
2022-07-26 08:16:08 +00:00
王怡栋 8456a1da21 Merge branch 'sprint/220_liumengyi_62026' into 'master'
* Fix bug #23200.

See merge request easycorp/zentaopms!4659
2022-07-26 08:13:44 +00:00
liumengyi cc459683b1 * Fix bug #25699. 2022-07-26 16:07:11 +08:00
liumengyi 1284608659 * Fix bug #25700. 2022-07-26 16:06:57 +08:00
zenggang bdc6e88244 * Adjust code 2022-07-26 08:03:25 +00:00
liumengyi 30b7ecbee7 * Fix bug #24009. 2022-07-26 16:02:47 +08:00
zenggang 85bee8b23d * Adjust code 2022-07-26 07:55:52 +00:00
zenggang b176ea0967 * Adjust code 2022-07-26 07:33:14 +00:00
caoyanyi 91a99a6cdb * Modify mr diff. 2022-07-26 15:21:03 +08:00
王怡栋 649950fa21 Merge branch 'sprint/master_zhouxudong_25672' into 'master'
* Fix bug #25672.

See merge request easycorp/zentaopms!4657
2022-07-26 07:14:19 +00:00
caoyanyi 542156de2a * Add actions. 2022-07-26 14:54:48 +08:00
liumengyi 174d226f86 * Fix bug #62026. 2022-07-26 14:53:15 +08:00
caoyanyi a1ec9e1d9f * Modify css. 2022-07-26 14:40:39 +08:00
caoyanyi 4c8474d335 * Modify gitea use git command. 2022-07-26 14:40:17 +08:00
caoyanyi ee213327b3 Merge branch 'master' into cyy_repo 2022-07-26 14:35:40 +08:00
liumengyi 26b412ef35 * Fix bug #25688. 2022-07-26 14:23:46 +08:00
zenggang 6f3544c2d2 * Adjust code 2022-07-26 06:07:10 +00:00
zenggang 7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
zhouxudong b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +00:00
孙广明 867f5467d9 * Fix bug #25678. 2022-07-26 13:20:41 +08:00
李玉春 0ae6d0440f Merge branch 'cyy_optimize' into 'master'
Cyy optimize

See merge request easycorp/zentaopms!4648
2022-07-26 05:06:07 +00:00
王怡栋 f16edca7bf Merge branch 'sprint/220_tianshujie_61965' into 'master'
Sprint/220 tianshujie 61965

See merge request easycorp/zentaopms!4655
2022-07-26 05:04:41 +00:00
王怡栋 284aea9aac Merge branch 'sprint/220_liumengyi_61971' into 'master'
* Finish task #61971,#61972,#61973,#61974,#61975,#61976.

See merge request easycorp/zentaopms!4651
2022-07-26 05:01:29 +00:00