Commit Graph
2898 Commits
Author SHA1 Message Date
王怡栋 a6916a73c5 Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527

See merge request easycorp/zentaopms!4326
2022-07-05 02:07:26 +00:00
tianshujie 0da2ce9dd3 * Finish task #59975. 2022-07-05 09:46:34 +08:00
tianshujie 17a8e9dcd5 * Changing the name of a function. 2022-07-05 08:47:45 +08:00
zhouxudong 6003adcd19 * Finish task #59527. 2022-07-05 00:43:34 +00:00
zhouxudong 1c00265c79 * Finish task #59527 #59572. 2022-07-04 07:21:39 +00:00
王怡栋 04b2a5994f Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554

See merge request easycorp/zentaopms!4317
2022-07-04 06:59:21 +00:00
tianshujie 6fc6d25a48 * Finish task #58554. 2022-07-04 14:48:24 +08:00
tianshujie 31ea99dae1 * Finish task #58556. 2022-07-04 14:12:48 +08:00
孙广明 52a588ec90 * Code for kanban error. 2022-07-01 14:38:20 +08:00
liumengyi cc8c52ae8d * Fix bug #24611. 2022-06-30 16:44:18 +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 6f72eb53ce fixbug_lang 2022-06-30 06:51:28 +00:00
xieqiyu 1b338f5cf5 * Fix bug#24216. 2022-06-30 14:09:52 +08:00
sunjun db7d9edd07 fixbug_lang 2022-06-30 01:41:25 +00:00
tianshujie 20c4a2b8b4 * Resolve issue #687. 2022-06-29 13:53:51 +08:00
tianshujie d597775c7e * Finish task #58560. 2022-06-29 08:35:21 +08:00
tianshujie 12fd7102a1 * Finish task #58556. 2022-06-28 17:55:19 +08:00
mayue c1c145e4b7 * Fix bug #24482. 2022-06-28 16:27:10 +08:00
tianshujie 1cacd32453 * Finish task #58560. 2022-06-28 11:27:15 +08:00
tianshujie 3a380aee1d * Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560. 2022-06-28 11:23:20 +08:00
tianshujie 6be5803453 * Delete extra blank lines. 2022-06-28 10:43:33 +08:00
tianshujie 26f37ec09c * Finish task #58560. 2022-06-27 15:38:33 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
wangzemei b11a919ccd * Fix bug #24000 2022-06-21 06:08:36 +00:00
zhouxin 600a10d7ac * Fix bug #23635. 2022-06-17 05:09:13 +00:00
zhouxin a6c7038d6c * Code for review. 2022-06-17 03:19:45 +00:00
wangyidong 182f601ed2 * fix bug #23740. 2022-06-17 10:32:31 +08:00
王怡栋 b6ec24a3d3 Merge branch 'sprint/hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!3994
2022-06-17 00:26:06 +00:00
hufangzhou 64a0dab834 * Add the new version. 2022-06-16 18:04:47 +08:00
孙广明 3f83669de2 Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.

See merge request easycorp/zentaopms!3992
2022-06-16 09:28:33 +00:00
leiyong f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +00:00
孙广明 bfa7047dff Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug

See merge request easycorp/zentaopms!3970
2022-06-16 05:17:36 +00:00
孙广明 31838f2a25 * Fix bug #23704. 2022-06-16 13:08:56 +08:00
xieqiyu e2361820ba * Fix bug#56936. 2022-06-16 11:13:17 +08:00
王怡栋 06a6d3f112 Merge branch 'sprint/master_zhouxudong_23687' into 'master'
* Fix bug #23687.

See merge request easycorp/zentaopms!3950
2022-06-16 00:31:01 +00:00
zhouxudong 6059c89194 * Fix bug #23687. 2022-06-15 09:13:37 +00:00
tanghucheng 7d8325f469 * Fix bug #23775. 2022-06-15 16:12:03 +08:00
朱金勇 cb9a0b6af9 Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Finish task#56933.

See merge request easycorp/zentaopms!3916
2022-06-14 09:44:45 +00:00
leiyong b6f5c18dc9 * Finish task#56933. 2022-06-14 07:56:43 +00:00
xieqiyu ee6c3a53c0 * Finish task#56936. 2022-06-13 15:12:20 +08:00
孙广明 5c1f32c3d9 Merge branch 'sprint_194' into 'master'
sprint_194 add project in batchcreate view

See merge request easycorp/zentaopms!3876
2022-06-13 02:06:00 +00:00
sunjun 385e4b23e3 sprint_194 2022-06-13 02:05:02 +00:00
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
zhouxin 8a588426fd * Fix bug #56479. 2022-06-10 07:53:00 +00:00
sunjun a69d10d9db sprint_194 add project in batchcreate view 2022-06-10 06:36:12 +00:00
wangyidong 9b699300ff * code for bug #23516. 2022-06-09 16:50:07 +08:00
王怡栋 ad0ebf0aa1 Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
#   module/execution/js/kanban.js
2022-06-09 07:24:23 +00:00