Commit Graph
42444 Commits
Author SHA1 Message Date
王怡栋 0420767f2f Merge branch 'sprint/217_25551' into 'master'
* Fix bug#25551,25591,25593

See merge request easycorp/zentaopms!4627
2022-07-22 02:20:54 +00:00
王怡栋 366a220180 Merge branch 'sprint/master_zhouxudong_61115' into 'master'
* Finish task #61115 #61114.

See merge request easycorp/zentaopms!4632
2022-07-22 02:14:07 +00:00
zenggang c368f63f6d * Adjust code 2022-07-22 02:01:47 +00:00
zenggang dba57b45cd * Adjust code 2022-07-22 01:04:24 +00:00
王怡栋 71dd54df7a Merge branch 'master_liuhong_24666' into 'master'
Master liuhong 24666

See merge request easycorp/zentaopms!4624
2022-07-22 01:01:47 +00:00
王怡栋 95a0ac4315 Merge branch 'cyy_24558' into 'master'
* Fix bug #24558.

See merge request easycorp/zentaopms!4625
2022-07-22 01:01:13 +00:00
wangyidong 1e800bbb5c * fix bug #25600. 2022-07-22 08:53:27 +08:00
wangyidong 8acfb0b8df Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-22 08:30:31 +08:00
wangyidong b9eca6ff93 * fix bug #25557. 2022-07-22 08:30:10 +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
caoyanyi be04d6e492 * Adjust codes. 2022-07-21 17:09:26 +08:00
zenggang 2c2141e055 * Fix bug#25591,25593 2022-07-21 09:04:46 +00:00
wangyidong a8e07852e8 * fix bug for contribute bug. 2022-07-21 17:02:28 +08:00
caoyanyi aaeebc1abd * Adjust codes. 2022-07-21 17:01:39 +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
zhouxudong 098c3ae333 * Finish task #61115 #61114. 2022-07-21 08:52:50 +00:00
tianshujie 06b864abf4 * Remove redundant parameters. 2022-07-21 16:39:43 +08:00
zenggang 27e19c459a * Fix bug#25551 2022-07-21 08:23:50 +00: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
caoyanyi 0eba61ac66 * Fix bug #24750. 2022-07-21 13:58:39 +08:00
caoyanyi 28ce2717db * Fix bug #24582. 2022-07-21 13:28:26 +08:00
caoyanyi df93073fe4 * Fix bug #24576. 2022-07-21 13:24:43 +08:00
caoyanyi cb09c1e3ff * Fix bug #24558. 2022-07-21 13:19:29 +08: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
liuhong e858799e11 *Fix bug #24666 2022-07-21 04:23:38 +00:00
liuhong 25a0350108 * Fix bug#24666. 2022-07-21 04:20:57 +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