Commit Graph
1769 Commits
Author SHA1 Message Date
孙广明 d5c7586a47 * Fix menu bug. 2022-07-15 10:33:58 +08:00
tianshujie dee593663b * Fix bug #25309. 2022-07-14 16:19:14 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
孙广明 0264b6c3f9 Merge branch 'sprint/scx_translate' into 'master'
Sprint/scx translate

See merge request easycorp/zentaopms!4429
2022-07-08 07:11:20 +00:00
zhouxudong f7b8ef064f * Fix bug #24844. 2022-07-08 05:51:40 +00:00
宋辰轩 5c103233e3 * Edit design module lang. 2022-07-08 10:54:34 +08:00
caoyanyi 99fa5aaae3 * Add gitea module. 2022-07-07 08:29:46 +08:00
王怡栋 29bed0101b Merge branch 'sprint/master_zhouxudong_59525' into 'master'
Sprint/master zhouxudong 59525

See merge request easycorp/zentaopms!4365
2022-07-06 02:17:24 +00:00
zhouxudong bf19599c0e * Finish task #59525. 2022-07-06 02:15:33 +00:00
孙广明 d175ae0f5e Merge branch 'master' into 'liyuchun_59437'
# Conflicts:
#   module/repo/control.php
2022-07-05 09:20:43 +00:00
liyuchun 8a3d924e2b * Finish task #59451. 2022-07-05 08:42:48 +00:00
王怡栋 ae7cc6764d Merge branch 'sgm_kanban' into 'master'
* Finish task #59701.

See merge request easycorp/zentaopms!4348
2022-07-05 07:08:41 +00:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
liyuchun 0044a55b76 * Finish task #59439. 2022-07-05 05:48:02 +00:00
caoyanyi b2085d27c6 * Modify language. 2022-07-05 13:03:26 +08:00
liyuchun dd893ce8e1 * Finish task #59437,59438. 2022-07-04 07:36:29 +00:00
caoyanyi 30850025f5 * Modify tab menu. 2022-07-04 10:44:06 +08:00
孙广明 c4d5027b86 Merge branch 'fixbug_lang' into 'master'
Fixbug lang

See merge request easycorp/zentaopms!4271
2022-06-30 07:10:37 +00:00
sunjun db7d9edd07 fixbug_lang 2022-06-30 01:41:25 +00:00
xieqiyu 3dff44e506 * Fix bug#24370. 2022-06-30 08:24:25 +08:00
tanghucheng a8834418f1 * Fix bug #24340. 2022-06-27 16:50:39 +08:00
tianshujie 9edd795598 * Fix bug #23398. 2022-06-23 15:40:52 +08:00
tianshujie bf7f947f72 * Finish task #58288. 2022-06-23 15:05:22 +08:00
tianshujie 6643dd1254 * Resolve issue #681. 2022-06-23 15:04:52 +08:00
李玉春 497b32f627 Merge branch 'zenops_36' into 'master'
Zenops 36

See merge request easycorp/zentaopms!4066
2022-06-22 07:18:41 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
caoyanyi dfbf69a211 * Finish task #57664. 2022-06-21 10:33:12 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
孙广明 6446a75af5 * Change zentao license. 2022-06-02 16:32:59 +08:00
liumengyi e661948d67 * Finish story #32879,#32887,#32935,#32934. 2022-05-31 09:21:05 +08:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
sunjun 5590973533 sprint_sunjun_29766 2022-05-24 07:03:03 +00:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
hufangzhou 60f8ffd05e * Resolve issue #634. 2022-05-12 16:24:09 +08:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
tanghucheng a2c8d78177 * Fix bug . 2022-04-28 19:59:39 +08:00
mayue 05639579e0 * Fix bug. 2022-04-20 17:02:32 +08:00
zenggang 217cc71960 * Fix bug#14478,19305 2022-04-19 09:21:02 +00:00
tianshujie 4503f0b9d8 * Fix bug #12208. 2022-04-01 15:50:34 +08:00
Zongjun Lan 4206ffb843 * fix bug #21181 2022-03-29 09:53:04 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxin b9d8edc02a Fix bug #17224. 2022-03-17 02:51:52 +00:00
hufangzhou 8187472563 * Fix bug #20665. 2022-03-14 09:06:42 +08:00
王怡栋 da92204f31 * code for lite version. 2022-03-07 09:59:56 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
zhengrunyu 13882f5a5b * Fix bug. 2022-02-24 13:59:37 +08:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00