Commit Graph
1092 Commits
Author SHA1 Message Date
王怡栋 4fa8895df3 Merge branch 'sprint/210_mayue_task#58767' into 'master'
Sprint/210 mayue task#58767

See merge request easycorp/zentaopms!4228
2022-06-29 09:12:50 +00:00
mayue 5feb83eef7 * Optimize code. 2022-06-29 16:54:27 +08:00
mayue 02b6efaee0 * Optimize code. 2022-06-29 16:53:05 +08:00
mayue 9802debcad * Optimize code. 2022-06-29 16:51:06 +08:00
mayue 6289859fb2 * Finish task #58767. 2022-06-29 16:40:57 +08:00
xieqiyu 36d6687438 * Fix bug#24394. 2022-06-29 14:18:35 +08:00
mayue b33c652953 * Add some code. 2022-06-28 16:01:28 +08:00
孙广明 0c1c8ab16d Merge branch 'sprint/210_mayue_bug#24408' into 'master'
* Fix bug #24408.

See merge request easycorp/zentaopms!4172
2022-06-28 05:04:23 +00:00
mayue c860a20edf * Fix bug #24408. 2022-06-28 10:15:36 +08:00
xieqiyu b55f45be0f * Finish task#58592. 2022-06-28 09:49:22 +08:00
xieqiyu 9b1c865964 * Code for task#57854. 2022-06-27 17:11:59 +08:00
xieqiyu 8dd618528a * Fix test bug. 2022-06-27 16:51:53 +08:00
xieqiyu 08faa3edff * Finish task#57854. 2022-06-27 13:33:11 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
mayue c15bda57a8 * Fix bug #24062. 2022-06-23 14:58:39 +08:00
mayue a0fd431401 * Optimize code. 2022-06-21 15:23:12 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
xieqiyu 783d4471b0 * Fix bug#23797. 2022-06-16 15:50:25 +08:00
xieqiyu c7919c48d0 * Fix bug#23597. 2022-06-13 13:17:25 +08:00
tanghucheng 415542746b * Fix bug #23374. 2022-06-09 14:54:54 +08:00
王怡栋 fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
xieqiyu bb574373b4 * Finish task#56388. 2022-06-08 11:27:23 +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
tianshujie a396ad68c4 * Fix bug #23348,23349. 2022-06-07 13:55:45 +08:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
sunjun 136d48f85e fixbug_sunjun_22971 2022-06-02 06:14:57 +00:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
zhouxin cda4d7e809 * Adjust code. 2022-06-01 08:56:49 +00:00
zhouxin bc803e56c8 * Finish task #55676. 2022-06-01 07:34:04 +00:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
liumengyi d93d30e2d7 * Optimize code for task #55677. 2022-06-01 14:39:11 +08:00
liumengyi 61ef8e945f * Fix bug for #task #55677. 2022-06-01 14:27:56 +08:00
liumengyi 499024e935 * Finish tash #55677. 2022-06-01 10:36:46 +08:00
孙华伟 c9f567453e *Fix bug #23034. 2022-05-31 14:41:55 +08:00
孙华伟 6b69778c43 *Fix bug #23034. 2022-05-31 10:17:15 +08:00
孙广明 d6017ab11e * Plan module order by path. 2022-05-27 08:47:19 +08:00
mayue b2f72aaeff * Fix bug #22905. 2022-05-26 10:16:45 +08:00
liumengyi 6c97c84844 * Fix bug #22562. 2022-05-25 13:21:50 +08:00
zenggang 7d5615ffac * Adjust story sort default to desc 2022-05-24 09:10:28 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
hufangzhou 3179fd289b * Fix bug #22669. 2022-05-19 16:10:17 +08:00
hufangzhou 4845901d39 * Delete the unsed code. 2022-05-19 15:52:16 +08:00
hufangzhou 331e31c911 * Fix bug #22672. 2022-05-19 15:43:38 +08:00
李玉春 c8312488ff Merge branch 'sprint/191_liumengyi_54319' into 'master'
* Finish task #54319.

See merge request easycorp/zentaopms!3501
2022-05-19 02:45:28 +00:00
liumengyi cac837c0f9 * Code format for task #54319. 2022-05-19 10:36:46 +08:00
tianshujie 244a281a47 * Finish task #54329. 2022-05-19 09:57:00 +08:00
liumengyi f473c18251 * Finish task #54319. 2022-05-19 09:44:50 +08:00
tianshujie db940f77fd * Finish task #54329. 2022-05-19 09:43:34 +08:00