Commit Graph
1112 Commits
Author SHA1 Message Date
liumengyi fa1b2ce2b1 * Fix bug #25063. 2022-07-14 08:54:44 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
王怡栋 a97b35f2bc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* code rollback

See merge request easycorp/zentaopms!4410
2022-07-07 08:13:20 +00:00
lanzongjun 6555c7a30a * fix bug #24937 2022-07-07 15:40:38 +08:00
王怡栋 7c432a46b0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #24937

See merge request easycorp/zentaopms!4407
2022-07-07 05:36:54 +00:00
lanzongjun ec9c9f2a0e * fix bug #24937 2022-07-07 13:32:34 +08:00
刘刚 ff94cac738 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24898.

See merge request easycorp/zentaopms!4399
2022-07-07 02:36:20 +00:00
daitingting a588add16f * Fix bug #24898. 2022-07-07 02:16:18 +00:00
lanzongjun d664bc44b0 * fix bug #24785 2022-07-06 15:39:33 +08:00
刘刚 d3174ab36c Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10

See merge request easycorp/zentaopms!4368
2022-07-06 03:07:19 +00:00
daitingting be44e76cb9 * Finish task #59646. 2022-07-05 09:20:47 +00:00
王怡栋 1a82574947 Merge branch 'sprint/master_zhouxudong_22964' into 'master'
Sprint/master zhouxudong 22964

See merge request easycorp/zentaopms!4315
2022-07-04 06:56:52 +00:00
wangyidong c88aa6b8f1 Merge branch 'zentaomax35' 2022-07-04 14:16:06 +08:00
zhouxudong 2b644837a0 * Fix bug #23596. 2022-07-04 00:30:07 +00:00
zhouxudong c568a46744 * Fix bug #22964. 2022-07-01 07:20:01 +00:00
lanzongjun 8bc8979c20 * fix bug #24071 2022-07-01 10:59:06 +08:00
王怡栋 531a112d7d Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
Sprint/208 tianshujie fixbug

See merge request easycorp/zentaopms!4259
2022-06-30 05:17:58 +00:00
tianshujie 7528cdfdcf * Fix bug #24554. 2022-06-30 13:16:31 +08:00
xieqiyu d641d96641 * Fix bug#24275. 2022-06-30 09:44:43 +08:00
王怡栋 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