Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
50,657 Commits 2 Branches 292 Tags
1bd84b68c73ff1e6d3c7cf0f34e077e7fe83a29f
Commit Graph
50657 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 1bd84b68c7 Merge branch 'bugfix/liwenrui/chatavatarpermission' into 'master' 
修复禅道客户端中上传群头像功能可能无权使用的问题

See merge request easycorp/zentaopms!6871
 2023-02-07 06:56:40 +00:00
王怡栋 a1aa283d77 Merge branch 'master_xieqiyu_31948' into 'master' 
* Code for bug#31948.

See merge request easycorp/zentaopms!6872
 2023-02-07 06:56:13 +00:00
王怡栋 a3580b9526 Merge branch 'dev/gfl_task_#83732' into 'master' 
Dev/gfl task #83732

See merge request easycorp/zentaopms!6870
 2023-02-07 06:53:05 +00:00
xieqiyu e260ad29a0 * Code for bug#31948. 2023-02-07 14:43:20 +08:00
Wenrui LI 8cdf9aad53 * add missing permission for chat avatar upload. 2023-02-07 14:41:53 +08:00
guofeilong f3bff30d3a * Code for update theme css in zui. 2023-02-07 14:18:57 +08:00
guofeilong c66b3dd489 * Code for update zui.css 2023-02-07 14:07:44 +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
王怡栋 45d1ee9054 Merge branch 'zentaopms_wangyuting' into 'master' 
* Fix webhook content is markdown bug.

See merge request easycorp/zentaopms!6868
 2023-02-07 03:08:09 +00:00
王怡栋 388ae5dae0 Merge branch 'dev/gfl_task_#83732' into 'master' 
* Code for task #83732

See merge request easycorp/zentaopms!6869
 2023-02-07 03:07:52 +00:00
guofeilong fd254834fe * Code for task #83732 2023-02-07 10:52:56 +08:00
liuhong db4eb4b63c * Adjust code. 2023-02-07 02:47:26 +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
hufangzhou 1aaa267cff * Add the comment. 2023-02-06 06:43:02 +00: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
王怡栋 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
liuhong 27a5843cad * Adjuct code for feedback #1836. 2023-02-03 06:09:53 +00: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