Commit Graph
29096 Commits
Author SHA1 Message Date
songchenxuan 2df3d6aa39 * Fix bug 16377 2021-11-18 14:08:07 +08:00
zhujinyong 98a3b04e99 * Compatibility in scm. 2021-11-18 13:39:01 +08:00
zhujinyong 8c1cc5c875 * Update purifier library. 2021-11-18 13:35:32 +08:00
liyuchun 2582f32c78 Merge branch 'sprint/170_mayue_branch' into sprint/170 2021-11-18 13:17:10 +08:00
李玉春 e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00
李玉春 8639b02e76 Merge branch 'sprint/170_songchenxuan_44490' into 'sprint/170'
Sprint/170 songchenxuan 44490

See merge request easycorp/zentaopms!501
2021-11-18 05:12:40 +00:00
xieqiyu a9c2c09338 * Optimize the code. 2021-11-18 11:41:17 +08:00
李玉春 7f29d93489 Merge branch 'sprint/170_mayue_16332' into 'sprint/170'
* Fix bug #16332.

See merge request easycorp/zentaopms!506
2021-11-18 03:13:27 +00:00
李玉春 34ec52e679 Merge branch 'sprint/170_mayue_16333' into 'sprint/170'
* Fix bug #16333.

See merge request easycorp/zentaopms!507
2021-11-18 03:13:05 +00:00
xieqiyu 7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
mayue c9baf6fddd * Fix bug #16332. 2021-11-18 10:04:16 +08:00
mayue a0efdf92a8 * Fix bug #16333. 2021-11-18 09:58:40 +08:00
songchenxuan 000728b47e * Finish task 44490. 2021-11-18 09:11:57 +08:00
liyuchun c1bc3c48ad Merge branch 'sprint/173_lizhiqiang__16336' into sprint/170 2021-11-18 09:04:27 +08:00
李玉春 9c4b07e8b7 Merge branch 'sprint/170' into 'sprint/173_lizhiqiang__16336'
# Conflicts:
#   module/execution/view/bug.html.php
2021-11-18 01:04:00 +00:00
孙广明 66dd543027 Merge branch 'sprint/170_zhengrunyu_44597' into 'sprint/170'
*Finish task #44597.

See merge request easycorp/zentaopms!492
2021-11-18 00:58:13 +00:00
李玉春 fc7c9acb30 Merge branch 'sprint/170_tianshujie_16367' into 'sprint/170'
* Fix bug #16367.

See merge request easycorp/zentaopms!494
2021-11-18 00:57:39 +00:00
tianshujie 858f8327ef * Fix bug #16367. 2021-11-18 08:46:35 +08:00
xieqiyu 292b09bb28 * Delete unused code. 2021-11-17 23:23:00 +08:00
xieqiyu 84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
xieqiyu 47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
李玉春 ca4388dd7a Merge branch 'sprint/170_tianshujie_16396' into 'sprint/170'
* Fix bug #16396.

See merge request easycorp/zentaopms!498
2021-11-17 10:02:05 +00:00
lizhiqiang 791ea627de * Finish bug #16336. 2021-11-17 17:57:04 +08:00
tianshujie 8df6bbbc1e * Fix bug #16396. 2021-11-17 17:52:38 +08:00
tianshujie 8473895bd2 * Restore update logic. 2021-11-17 17:50:07 +08:00
李玉春 508539166d Merge branch 'sprint/170_mayue_16257' into 'sprint/170'
* Fix bug #16257.

See merge request easycorp/zentaopms!493
2021-11-17 09:45:57 +00:00
mayue bf7e878ae4 * Fix bug #16257. 2021-11-17 17:44:22 +08:00
songchenxuan c75f8941e5 * Finish task 44490 2021-11-17 17:44:10 +08:00
tianshujie b61872bcd0 * Fix bug #16367. 2021-11-17 17:43:42 +08:00
songchenxuan 59f3ac6661 * Finish task 44490 2021-11-17 17:42:10 +08:00
李玉春 0be7ff7a2a Merge branch 'sprint/170_mayue_16000' into 'sprint/170'
* Fix bug #16000.

See merge request easycorp/zentaopms!488
2021-11-17 09:40:45 +00:00
tianshujie 152e27b1a8 * Fix bug #16367. 2021-11-17 17:38:42 +08:00
songchenxuan 328527a5bd * Finish task 44490 2021-11-17 17:28:28 +08:00
zhengrunyu f47e855649 *Finish task #44597. 2021-11-17 17:25:37 +08:00
songchenxuan 5b00c80c4c * Finish task 44490 2021-11-17 17:19:29 +08:00
mayue 9979876a0d * Fix bug #16257. 2021-11-17 16:54:16 +08:00
李玉春 1863bf4024 Merge branch 'sprint/173_lizhiqiang_16373' into 'sprint/170'
*Finish bug #16363.

See merge request easycorp/zentaopms!491
2021-11-17 08:50:36 +00:00
李玉春 63edc9d1f9 Merge branch 'sprint/173_tianshujie_44502' into 'sprint/170'
Sprint/173 tianshujie 44502

See merge request easycorp/zentaopms!489
2021-11-17 08:37:55 +00:00
lizhiqiang 1fb7da9222 *Finish bug #16363. 2021-11-17 16:36:28 +08:00
tianshujie 77fd021410 * Fix bug #14101. 2021-11-17 16:33:49 +08:00
songchenxuan 8cd05d8301 * Finish task 44490. 2021-11-17 16:22:43 +08:00
zhengrunyu 36d7e664e6 *Finish task #44597. 2021-11-17 16:20:54 +08:00
songchenxuan 1dab48045e * Finish task 44490. 2021-11-17 15:39:30 +08:00
mayue 2f4ed8f1c0 * Fix bug #16000. 2021-11-17 15:00:40 +08:00
李玉春 1161128163 Merge branch 'sprint/170_lizhiqiang_44489' into 'sprint/170'
* Finish task#44489.

See merge request easycorp/zentaopms!485
2021-11-17 06:52:16 +00:00
lizhiqiang 6b2a45fa70 * Finish task#44489. 2021-11-17 14:47:49 +08:00
李玉春 3700fa0e63 Merge branch 'sprint/170_mayue_44493,44494' into 'sprint/170'
Sprint/170 mayue 44493,44494

See merge request easycorp/zentaopms!484
2021-11-17 06:44:22 +00:00
李玉春 4d605316d1 Merge branch 'sprint/170_lizhiqiang_44489' into 'sprint/170'
Finish task #44489.

See merge request easycorp/zentaopms!474
2021-11-17 06:36:07 +00:00
mayue 510c67ece7 * Finish task #44493,44494. 2021-11-17 14:34:00 +08:00
mayue 51709b88d5 * Finish task #44493,44494. 2021-11-17 14:32:24 +08:00