Commit Graph
42426 Commits
Author SHA1 Message Date
tianshujie 29a889ddcf * Fix bug #24702. 2022-07-22 12:03:23 +08:00
tianshujie 5818db887f * Fix bug #25122. 2022-07-22 10:28:42 +08:00
tianshujie 0976ce4cd5 * Fix bug #25567. 2022-07-22 10:09:27 +08:00
孙广明 8e39468c6a Merge branch 'sprint/217_liumengyi_fixbug' into 'master'
* Fix bug #25554, #25558, #25559, #25570.

See merge request easycorp/zentaopms!4629
2022-07-21 09:41:20 +00:00
liumengyi 0d7bc07e69 * Optimize code for bug #25559. 2022-07-21 17:40:26 +08:00
孙广明 59a81e4466 Merge branch 'sprint/217_liumengyi_24337' into 'master'
* Fix bug #24337.

See merge request easycorp/zentaopms!4622
2022-07-21 09:39:30 +00:00
liumengyi 9be334f34b * Fix bug #25554, #25558, #25559, #25570. 2022-07-21 17:38:27 +08:00
孙广明 6650fd9bad Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4630
2022-07-21 09:37:47 +00:00
tianshujie 4b59c7025a * Fix page error problem. 2022-07-21 17:34:07 +08:00
liumengyi 14cf90f0e5 * Fix bug #25554, #25558, #25559, #25570. 2022-07-21 17:24:51 +08:00
wangyidong ca3194e041 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-21 16:57:28 +08:00
wangyidong 6576f0ccc4 * fix bug #25531,25536,25541,25550,25552,25561 2022-07-21 16:56:14 +08:00
tianshujie 06b864abf4 * Remove redundant parameters. 2022-07-21 16:39:43 +08:00
朱金勇 e938a86fb5 Merge branch 'sprint/sunhao/zui_table' into 'master'
* update zui table, optimize UI for nested mode.

See merge request easycorp/zentaopms!4626
2022-07-21 08:21:43 +00:00
Hao Sun be417874c2 * update zui table, optimize UI for nested mode. 2022-07-21 07:03:08 +00:00
孙广明 41c90492e6 Merge branch 'sprint/217_zg_bugs' into 'master'
* Fix sprint217 bugs.

See merge request easycorp/zentaopms!4623
2022-07-21 06:06:03 +00:00
孙广明 49517aec09 * Modify execution-all default param. 2022-07-21 13:13:43 +08:00
王怡栋 dcd013186a Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4620
2022-07-21 05:08:47 +00:00
zenggang b4553aa11a * Adjust code 2022-07-21 04:12:29 +00:00
zenggang 0655809533 * Fix sprint217 bugs. 2022-07-21 04:06:11 +00:00
tianshujie 68da0b31d2 * Modify the return link for the delete project method. 2022-07-21 11:35:11 +08:00
孙广明 9134845142 * Fix project admin bug. 2022-07-21 11:31:14 +08:00
孙广明 f4c75cd9af * Code for my-block. 2022-07-21 11:28:40 +08:00
tianshujie b8124e12f4 * Fix bug #25435. 2022-07-21 11:27:55 +08:00
tianshujie e122aa3be7 * Fix bug #25435. 2022-07-21 11:11:21 +08:00
王怡栋 167d746156 Merge branch 'cyy_25543' into 'master'
* Fix bug #25543.

See merge request easycorp/zentaopms!4621
2022-07-21 03:04:05 +00:00
caoyanyi 76f13a8b85 * Modify gitea delete merge request. 2022-07-21 10:54:18 +08:00
liumengyi 96c59fdf52 * Fix bug #24337. 2022-07-21 10:22:00 +08:00
caoyanyi f9704cbb1b * Adjust code. 2022-07-21 10:15:59 +08:00
王怡栋 70d17e226b Merge branch 'sprint/master_zhouxudong_61442' into 'master'
* Finish task #61442.

See merge request easycorp/zentaopms!4611
2022-07-21 02:04:09 +00:00
王怡栋 660f0d0d85 Merge branch 'sprint/master_zhouxudong_61441' into 'master'
Sprint/master zhouxudong 61441

See merge request easycorp/zentaopms!4606
2022-07-21 02:03:20 +00:00
caoyanyi 2ef6ab7949 * Fix bug #25543. 2022-07-21 10:01:49 +08:00
tianshujie f32443218c * Fix bug #25461. 2022-07-21 09:56:25 +08:00
tianshujie 1f00ba8c03 * Modify the return link for the delete project method. 2022-07-21 09:51:50 +08:00
孙广明 165dc24575 Merge branch 'sprint/217_liumengyi_25079' into 'master'
* Fix bug #25079.

See merge request easycorp/zentaopms!4619
2022-07-21 01:51:23 +00:00
liumengyi 8aa6469edb * Fix bug #25079. 2022-07-21 09:48:58 +08:00
zhouxudong 9d5f891419 * Finish task #61441. 2022-07-21 01:40:43 +00:00
zhouxudong a49f1b9961 * Finish task #61442. 2022-07-21 01:38:12 +00:00
tianshujie e0537276bd * Delete useless code. 2022-07-21 09:30:35 +08:00
zhouxudong 1c4c282aee * Finish task #61441. 2022-07-21 01:29:57 +00:00
王怡栋 1a8a06ecc7 Merge branch 'sprint/217_liumengyi_25230' into 'master'
* Fix bug #25230.

See merge request easycorp/zentaopms!4618
2022-07-21 01:26:48 +00:00
liumengyi 72ed2599d1 * Fix bug #25230. 2022-07-21 09:22:20 +08:00
王怡栋 623877555d Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!4613
2022-07-21 01:18:53 +00:00
tianshujie 03f9bca910 * Fix bug #25465. 2022-07-21 08:46:07 +08:00
王怡栋 2228d3dad8 Merge branch 'sprint/217_liumengyi_24796' into 'master'
* Fix bug #24796.

See merge request easycorp/zentaopms!4617
2022-07-21 00:41:24 +00:00
liumengyi 59968a12e4 * Fix bug #24796. 2022-07-21 08:40:56 +08:00
王怡栋 08bc30c893 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4616
2022-07-20 09:29:29 +00:00
王怡栋 c0d3c1da7f Merge branch 'sprint/217_zg_61182' into 'master'
* Finish task#61182,61168

See merge request easycorp/zentaopms!4615
2022-07-20 09:29:07 +00:00
tianshujie 93f70dcf70 * Modify the jump link after saving the created program. 2022-07-20 17:25:25 +08:00
wangyidong 2cf2c96ebd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 17:25:00 +08:00