Commit Graph
41562 Commits
Author SHA1 Message Date
王怡栋 26e6c3cdb3 Merge branch 'master_xieqiyu_29159' into 'master'
* Code for bug#29159.

See merge request easycorp/zentaopms!6890
2023-02-08 08:29:30 +00:00
王怡栋 2a6360f45f Merge branch 'ticket_329' into 'master'
Ticket 329

See merge request easycorp/zentaopms!6886
2023-02-08 08:28:54 +00:00
王怡栋 6cc3863a63 Merge branch 'fixbug_tanghucheng' into 'master'
* Fix bug for import testcase.

See merge request easycorp/zentaopms!6884
2023-02-08 08:28:23 +00:00
王怡栋 3d032b1cf6 Merge branch 'bug_31963' into 'master'
* Fix bug#31963

See merge request easycorp/zentaopms!6883
2023-02-08 08:28:00 +00:00
王怡栋 054c55b38d Merge branch 'sprint/hufangzhou_284_changelog' into 'master'
* Complete changelog.

See merge request easycorp/zentaopms!6882
2023-02-08 08:27:48 +00:00
xieqiyu e00862dd0c * Code for bug#29159. 2023-02-08 16:16:33 +08:00
Yagami c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
孙广明 5611c2c285 Merge branch 'zenops_61' into 'master'
* Add show/hide password.

See merge request easycorp/zentaopms!6888
2023-02-08 07:14:32 +00:00
zenggang 8a645d03ae * Fix bug#31963 2023-02-08 05:55:45 +00:00
tanghucheng 3e70f86ca2 * Fix bug for import testcase. 2023-02-08 13:55:25 +08:00
hufangzhou 1546a7da88 * Complete changelog. 2023-02-08 13:16:39 +08:00
孙广明 99446cf8d3 Merge branch 'zhouxin_feedback_313' into 'master'
* Resolve feedback #313.

See merge request easycorp/zentaopms!6861
2023-02-08 03:23:03 +00:00
zhaoke 37ae4b9af5 * Add show/hide password. 2023-02-08 03:07:09 +00:00
hufangzhou 025aa5dc4b * Add the new version. 2023-02-08 02:44:44 +00:00
liuhong 7342444023 * Adjust code for 329. 2023-02-08 02:24:05 +00:00
liuhong bf85280dcd * Adjust code for 329. 2023-02-08 02:07:02 +00:00
王怡栋 fd92f0e6ae Merge branch 'zenops_61' into 'master'
Zenops 61

See merge request easycorp/zentaopms!6876
2023-02-08 01:55:38 +00:00
zhouxin 26abc21883 * Adjust code. 2023-02-08 09:26:12 +08:00
xieqiyu 975b755c54 * Code for bug#31949. 2023-02-08 08:48:09 +08:00
xieqiyu bfe1a0ef5e * Code for bug#31949. 2023-02-08 08:37:38 +08:00
liuhong 5156963cec * Adjust code for 329. 2023-02-07 07:23:34 +00:00
xieqiyu e260ad29a0 * Code for bug#31948. 2023-02-07 14:43:20 +08:00
王怡栋 64a0c67f38 Merge branch 'ticket_330' into 'master'
Ticket 330

See merge request easycorp/zentaopms!6866
2023-02-07 03:09:06 +00:00
王怡栋 d98c613ff6 Merge branch 'ticket_325' into 'master'
* Adjuct code for feedback #1836.

See merge request easycorp/zentaopms!6867
2023-02-07 03:08:48 +00:00
liuhong db4eb4b63c * Adjust code. 2023-02-07 02:47:26 +00:00
zhaoke a31485ec89 Merge branch 'master' into zenops_61 2023-02-07 02:04:56 +00:00
zhaoke d5090f876e * Fix update not check unique. 2023-02-07 02:03:23 +00:00
wangyuting2 d0d3b94b99 * Fix webhook content is markdown bug. 2023-02-07 09:38:48 +08:00
liuhong bb6a0ee14c * Fix feedback #2118. 2023-02-07 01:09:32 +00:00
liuhong f6f4d0cc8a * Adjust code for feedback #2118. 2023-02-07 00:25:24 +00:00
王怡栋 ac066acdc9 Merge branch 'master_xieqiyu_83681' into 'master'
* Code for task#83681.

See merge request easycorp/zentaopms!6863
2023-02-06 09:23:47 +00:00
王怡栋 26fa30840f Merge branch 'zentaopms_wangyuting2' into 'master'
* Finish task #84089. Fix bug #31946.

See merge request easycorp/zentaopms!6862
2023-02-06 09:23:33 +00:00
王怡栋 6d105678b0 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix the bug of not updating the weekly report.

See merge request easycorp/zentaopms!6860
2023-02-06 09:20:09 +00:00
王怡栋 91b5f22ed9 Merge branch 'dev/gfl_fix_style_bug_in_browseList' into 'master'
* Code for change pd-l in a to pd-r in icon

See merge request easycorp/zentaopms!6859
2023-02-06 09:18:39 +00:00
xieqiyu 91efd85783 * Code for task#83681. 2023-02-06 15:56:49 +08:00
wangyuting2 b37af3c3a7 * Fix bug #84089. 2023-02-06 15:35:33 +08:00
zhouxin c7a767521c * Resolve feedback #313. 2023-02-06 14:27:23 +08:00
liuhong 9d189f06ef * Adjust code for feedback #2118. 2023-02-06 06:10:46 +00:00
wangyuting2 775c16402c * Optimize code. 2023-02-06 13:24:45 +08:00
Yagami 33fc8fd620 * Code for php version bug. 2023-02-06 13:24:02 +08:00
wangyuting2 34e4445859 * Fix the bug of not updating the weekly report. 2023-02-06 13:07:03 +08:00
guofeilong 6e345d7525 * Code for change pd-l in a to pd-r in icon 2023-02-06 10:40:25 +08:00
liuhong 2ba474e4a4 * Adjust Ticket 330. 2023-02-06 02:37:22 +00:00
wangyidong 9b2050098d * fix bug #29748. 2023-02-03 17:17:39 +08:00
王怡栋 9d34521ef7 Merge branch 'master_xieqiyu_28270' into 'master'
* Code for bug#28270.

See merge request easycorp/zentaopms!6858
2023-02-03 09:14:46 +00:00
xieqiyu 2ab3b9f8cb * Code for bug#28270. 2023-02-03 16:59:43 +08:00
zenggang 41829d9fa6 *Fix bug#31894 2023-02-03 08:57:34 +00:00
guofeilong b5df472639 * Code for css in preference.html.php . 2023-02-03 16:27:52 +08:00
zenggang ecee798f48 * Fix bugs 2023-02-03 08:26:26 +00:00
王怡栋 b1bd43c331 Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug...

See merge request easycorp/zentaopms!6852
2023-02-03 07:59:06 +00:00