Commit Graph
50626 Commits
Author SHA1 Message Date
王怡栋 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
王怡栋 ca09570077 Merge branch 'dev/gfl_my_preference_css_refactors' into 'master'
* Code for css in preference.html.php .

See merge request easycorp/zentaopms!6857
2023-02-03 09:14:09 +00:00
xieqiyu 2ab3b9f8cb * Code for bug#28270. 2023-02-03 16:59:43 +08:00
guofeilong b5df472639 * Code for css in preference.html.php . 2023-02-03 16:27:52 +08: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
liuhong 3d24c6980f * Adjust code for 30389. 2023-02-03 07:33:01 +00:00
王怡栋 3ec34c9acd Merge branch 'master_xieqiyu_28704' into 'master'
* Code for bug#28704.

See merge request easycorp/zentaopms!6856
2023-02-03 06:46:28 +00:00
王怡栋 bc3ba1e05c Merge branch 'zentaopms284_bug#25538' into 'master'
* Fix bug #25538.

See merge request easycorp/zentaopms!6854
2023-02-03 06:39:06 +00:00
王怡栋 f6264aed8c Merge branch 'ticket_324' into 'master'
* Adjuct for ticket 324.

See merge request easycorp/zentaopms!6853
2023-02-03 06:36:09 +00:00
xieqiyu 3c8d8e27a6 * Code for bug#28704. 2023-02-03 14:34:16 +08:00
王怡栋 c1ea319bcd Merge branch 'dev/gfl_finish_bug_in_flow-item' into 'master'
* Code for style problem in flowchart

See merge request easycorp/zentaopms!6855
2023-02-03 06:28:02 +00:00
guofeilong df8608ddc9 * Code for style problem in flowchart 2023-02-03 14:23:22 +08:00
wangyuting2 f77ad21c48 * Fix bug #25538. 2023-02-03 13:59:59 +08:00
Yagami cf5c7a2fbc * Code for project required field. 2023-02-03 13:17:12 +08:00
朱金勇 88f2d3ef49 Merge branch 'fix/git' into 'master'
* Fix missing Gogs,Gitea.

See merge request easycorp/zentaopms!6845
2023-02-03 04:14:22 +00:00
liuhong 9c248696e8 * Adjuct for ticket 324. 2023-02-03 03:33:58 +00:00
王怡栋 4f3fa1662f Merge branch 'master_xieqiyu_30064' into 'master'
* Code for bug#30064.

See merge request easycorp/zentaopms!6849
2023-02-03 02:07:42 +00:00
王怡栋 5e6a2e6026 Merge branch 'dev/gfl_updateCssFile_zui' into 'master'
* Code for css in admin theme.

See merge request easycorp/zentaopms!6851
2023-02-03 02:05:38 +00:00
guofeilong 03d869e8d3 * Code for css in admin theme. 2023-02-03 10:01:55 +08:00
liuhong a1cbb18b66 * Adjust code for 30389. 2023-02-03 01:51:32 +00:00
liuhong d9cb8817e3 * Adjuct code for 30389. 2023-02-03 01:50:17 +00:00
xieqiyu 16f0a9feec * Code for bug#30064. 2023-02-03 09:45:24 +08:00
wangyidong 1f1e8b0836 * fix bug #31519. 2023-02-03 08:48:18 +08:00
王怡栋 db6eaa622f Merge branch 'dev/gfl_add_icon_horn_and_download-alt' into 'master'
* code for add icon download-alt and horn

See merge request easycorp/zentaopms!6848
2023-02-02 08:57:33 +00:00
王怡栋 3f9c3e40e1 Merge branch 'zentaopms284_bug#31889' into 'master'
* Fix bug #31889.

See merge request easycorp/zentaopms!6846
2023-02-02 08:57:17 +00:00
王怡栋 2cbb844240 Merge branch 'sprint/f2039' into 'master'
* Fix feedback2039.

See merge request easycorp/zentaopms!6844
2023-02-02 08:53:20 +00:00
王怡栋 ee5db15cd3 Merge branch 'hufangzhou_autopack' into 'master'
* Add the mark for auto pack, and integrate the table creation statement.

See merge request easycorp/zentaopms!6847
2023-02-02 08:52:53 +00:00
guofeilong 8aa04874b3 * code for add icon download-alt and horn 2023-02-02 16:49:32 +08:00
hufangzhou c27e0ae9a6 * Add the mark for auto pack, and integrate the table creation statement. 2023-02-02 08:48:58 +00:00
wangyuting2 40e5f5bdde * Fix bug #31889. 2023-02-02 16:37:46 +08:00
wangyidong 81820d5145 * fix bug #31887. 2023-02-02 16:00:42 +08:00
Lufei 4a9cadf0b5 * Fix missing Gogs,Gitea. 2023-02-02 15:47:10 +08:00
liuhong 1fc15bd326 * Adjust code for 30389. 2023-02-02 07:14:17 +00:00
王怡栋 5c019e1a81 Merge branch 'dev/gfl_updatecssFile_zui' into 'master'
* code for theme class in task #83327

See merge request easycorp/zentaopms!6842
2023-02-02 06:45:56 +00:00
王怡栋 330da9b6b2 Merge branch 'master_bug' into 'master'
*Fix the testtask and testcase creatBug open new label.

See merge request easycorp/zentaopms!6841
2023-02-02 06:45:31 +00:00
王怡栋 a2f9c43632 Merge branch 'master_xieqiyu_31453' into 'master'
* Code for bug#31453.

See merge request easycorp/zentaopms!6840
2023-02-02 06:44:43 +00:00
guofeilong 6ba62547fb * code for theme class in task #83327 2023-02-02 14:39:32 +08:00
xieqiyu 7a0e43b41b * Code for bug#31453. 2023-02-02 14:12:29 +08:00
liuhong 2d3cfc3613 *Fix the testtask and testcase creatBug open new label. 2023-02-02 05:59:18 +00:00
liuhong 3a6f2986ab * Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389.* Fix bug #30389. 2023-02-02 05:54:47 +00:00
王怡栋 34ccab2ae9 Merge branch 'master_xieqiyu_31453' into 'master'
* Fix bug#31453.

See merge request easycorp/zentaopms!6838
2023-02-02 05:48:39 +00:00
王怡栋 d0c837df51 Merge branch 'master_xieqiyu_30968' into 'master'
* Fix bug#30968.

See merge request easycorp/zentaopms!6837
2023-02-02 05:46:18 +00:00
王怡栋 939089b325 Merge branch 'sprint/fixbug_tanghucheng' into 'master'
* Fix bug #25334.

See merge request easycorp/zentaopms!6836
2023-02-02 05:45:48 +00:00
朱金勇 20ba4f390c Merge branch 'fix/compatible' into 'master'
* Fix compatible error.

See merge request easycorp/zentaopms!6832
2023-02-02 03:46:31 +00:00
鲁飞 741917d2ab * Fix compatible error. 2023-02-02 03:46:31 +00:00
chaideqing 9d8914a776 * Fix feedback2039. 2023-02-02 03:20:03 +00:00
xieqiyu 1e11a3cb85 * Fix bug#31453. 2023-02-02 11:12:46 +08:00
xieqiyu 2468300051 * Fix bug#30968. 2023-02-02 10:06:33 +08:00
tanghucheng fe1f695c43 * Fix bug #24998. 2023-02-02 10:01:24 +08:00
tanghucheng e001f2a00b * Fix bug #25334. 2023-02-02 09:42:45 +08:00