Commit Graph
38289 Commits
Author SHA1 Message Date
xieqiyu 0946351076 * Fix bug#22144. 2022-05-05 11:17:45 +08:00
孙广明 eafc0916a6 Merge branch 'sprint/tianshujie_bug22139' into 'master'
* Fix bug #22139.

See merge request easycorp/zentaopms!3229
2022-05-05 02:11:36 +00:00
tianshujie 025fc5b0b0 * Fix bug #22139. 2022-05-05 10:09:40 +08:00
孙广明 d0ef8f574c Merge branch 'sprint/scx_feedbackclose' into 'master'
* Close feedback api.

See merge request easycorp/zentaopms!3226
2022-04-29 08:53:24 +00:00
李玉春 71a2c032f5 Merge branch 'cyy_1914' into 'master'
* Fix bug #1914.

See merge request easycorp/zentaopms!3228
2022-04-29 08:51:06 +00:00
caoyanyi 614329cbe8 * Fix bug #1914. 2022-04-29 16:44:59 +08:00
朱金勇 fa9e263bce Merge branch 'sprint/sunhao/bug16382' into 'master'
* bug #16382, fix position for #notifyEmailLabel.

See merge request easycorp/zentaopms!3227
2022-04-29 08:43:24 +00:00
Hao Sun f46b84446e * bug #16382, fix position for #notifyEmailLabel. 2022-04-29 16:39:08 +08:00
= 7d106cf4d3 * Close feedback api. 2022-04-29 16:38:10 +08:00
zhujinyong 342667de6c Merge branch 'api_zry' 2022-04-29 16:36:25 +08:00
zhengrunyu b2f1929673 * Delete black. 2022-04-29 16:02:35 +08:00
zhengrunyu 15d243767d * Fix api. 2022-04-29 15:56:01 +08:00
李玉春 eea036c1ee Merge branch 'sprint/sunhao/bug20570' into 'master'
* update zui.js, fix js error in ie 11.

See merge request easycorp/zentaopms!3224
2022-04-29 07:37:55 +00:00
李玉春 83b9cf3de8 Merge branch 'sprint/sunhao/kindeditor' into 'master'
* update kindeditor.

See merge request easycorp/zentaopms!3223
2022-04-29 07:37:40 +00:00
李玉春 452f40d2fc Merge branch 'devops_zg' into 'master'
Fix refresh jump to other branches

See merge request easycorp/zentaopms!3212
2022-04-29 07:29:50 +00:00
Hao Sun 6dba3bc41c * update zui.js, fix js error in ie 11. 2022-04-29 15:24:23 +08:00
Hao Sun db9b293ea0 * update kindeditor. 2022-04-29 15:23:03 +08:00
孙广明 234baf4594 Merge branch 'liyuchun_fixbug_22098' into 'master'
* Fix bug #21887.

See merge request easycorp/zentaopms!3222
2022-04-29 07:12:02 +00:00
孙广明 ef62cf94aa Merge branch 'sprint/scx_feedbackassign' into 'master'
* Feedback assign api.

See merge request easycorp/zentaopms!3220
2022-04-29 07:11:21 +00:00
liyuchun d1afd5983d * Delete unused code. 2022-04-29 06:57:57 +00:00
liyuchun a9223eac92 * Delete unused code. 2022-04-29 06:57:13 +00:00
liyuchun a0f8bda990 * Fix bug #21887. 2022-04-29 06:56:02 +00:00
孙广明 44462c6ab9 Merge branch 'master_xieqiyu_22117' into 'master'
* Fix bug#22117. Add file link.

See merge request easycorp/zentaopms!3221
2022-04-29 06:53:56 +00:00
xieqiyu 084834471b * Fix bug#22117. Add file link. 2022-04-29 14:51:36 +08:00
= 0e372e50b7 * Feedback assign api. 2022-04-29 14:35:28 +08:00
孙广明 c444c2bf37 Merge branch 'sprint/scx_executionbug' into 'master'
* Add $bug->productStatus, fix bug #21375.

See merge request easycorp/zentaopms!3218
2022-04-29 06:13:38 +00:00
孙广明 cb29044669 Merge branch 'master_xieqiyu_22117' into 'master'
* Fix bug#22117.

See merge request easycorp/zentaopms!3219
2022-04-29 06:13:25 +00:00
xieqiyu b6650b012f * Fix bug#22117. 2022-04-29 14:05:22 +08:00
= 8349bfa5cf * Add $bug->productStatus, fix bug #21375. 2022-04-29 13:43:43 +08:00
王怡栋 5daf355f32 Merge branch 'fixbug' into 'master'
* Fix bug for gantt.

See merge request easycorp/zentaopms!3217
2022-04-29 05:38:38 +00:00
李玉春 06a38f17e3 Merge branch 'sprint/renying_Fixbug#21999' into 'master'
Sprint/renying fixbug#21999

See merge request easycorp/zentaopms!3215
2022-04-29 05:34:30 +00:00
tanghucheng f67e77e4e6 * Fix bug for gantt. 2022-04-29 13:17:26 +08:00
renying d17854d07d Fixbug#21999 2022-04-29 05:11:53 +00:00
孙广明 2f819fcffe Merge branch 'master_xieqiyu_22114' into 'master'
* Fix bug#22114.

See merge request easycorp/zentaopms!3216
2022-04-29 03:48:40 +00:00
孙广明 eda1a49379 Merge branch 'sprint/scx_feedbackedit' into 'master'
* Edit feedback api.

See merge request easycorp/zentaopms!3214
2022-04-29 03:48:14 +00:00
xieqiyu 88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
renying a2430ed507 Fixbug#21999 2022-04-29 03:13:32 +00:00
renying e06c2e8666 Fixbug#21999 2022-04-29 03:10:49 +00:00
王怡栋 f005a22eb8 Merge branch 'sprint/fixbug_liumengyi' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3213
2022-04-29 03:09:44 +00:00
liumengyi d4ee5f773a * Fix bug. 2022-04-29 11:03:01 +08:00
renying 6a5e9b8657 Fixbug#21999 2022-04-29 02:50:51 +00:00
zenggang ac8225544f * Fix refresh jump to other branches 2022-04-29 02:43:57 +00:00
= af8a97cf59 * Edit feedback api. 2022-04-29 10:42:26 +08:00
孙广明 9d5cbd6c66 Merge branch 'liyuchun_fixbug_22098' into 'master'
Liyuchun fixbug 22098

See merge request easycorp/zentaopms!3211
2022-04-29 02:31:26 +00:00
孙广明 a734294394 Merge branch 'sunhuawei_fixbug_22072' into 'master'
*Fix bug#22072.

See merge request easycorp/zentaopms!3210
2022-04-29 01:29:00 +00:00
孙华伟 92ccb504e0 Update buildform.html.php 2022-04-29 01:27:01 +00:00
liyuchun 0ac82f343c * Fix bug #21887. 2022-04-29 01:25:53 +00:00
孙华伟 d8a79b8ad9 Update buildform.html.php 2022-04-29 01:23:56 +00:00
孙华伟 92adbdef92 *Optimize the code. 2022-04-29 09:19:27 +08:00
孙华伟 ae1c8cbc61 *Fix bug#22072. 2022-04-29 09:10:39 +08:00