Commit Graph

686 Commits

Author SHA1 Message Date
孙广明
04932fc4b0 Merge branch 'sprint/195_mayue_bug#22881' into 'master'
* Fix bug #22881.

See merge request easycorp/zentaopms!3579
2022-05-25 03:29:21 +00:00
李玉春
10691aa653 Merge branch 'fixbug_sunjun_22556' into 'master'
Fixbug sunjun 22556

See merge request easycorp/zentaopms!3553
2022-05-25 02:28:26 +00:00
mayue
623cc446f9 * Fix bug #22881. 2022-05-25 02:28:08 +00:00
zenggang
7d5615ffac * Adjust story sort default to desc 2022-05-24 09:10:28 +00:00
mayue
db30dd1cad * Optimize code. 2022-05-24 08:37:10 +00:00
sunjun
838a8ccb95 fixbug_sunjun_22556 2022-05-24 07:36:58 +00:00
mayue
37125b72bc * Finish task #55175. 2022-05-24 07:34:38 +00:00
孙广明
77dd8b3b64 Merge branch 'sprint/matser_zhouxudong_22722' into 'master'
Sprint/matser zhouxudong 22722

See merge request easycorp/zentaopms!3560
2022-05-24 06:34:08 +00:00
zhouxudong
189ea8b1a7 * Fix bug #22722. 2022-05-24 06:33:04 +00:00
zhouxudong
3012bbd26c * Fix bug #22722. 2022-05-24 03:02:05 +00:00
zhouxudong
b57ec6aef4 * Fix bug #22722. 2022-05-24 02:59:16 +00:00
zhouxudong
d41ea8cfc2 * Finish bug #22722. 2022-05-24 02:42:29 +00:00
wangyidong
967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
sunjun
29c329e8d4 fixbug_sunjun_22556 2022-05-24 01:51:00 +00:00
sunjun
fa22cfdd6a fixbug_sunjun_22556 2022-05-24 01:46:53 +00:00
李玉春
3c59f5c4a0 Merge branch 'sprint/191_tianshujie_fixbug' into 'master'
* Fix bug #22617.

See merge request easycorp/zentaopms!3540
2022-05-20 03:09:22 +00:00
tianshujie
4ff0410aca * Fix bug #22617. 2022-05-20 10:45:48 +08:00
孙广明
97f5dcdc9f Merge branch 'sprint190_zg_bugs' into 'master'
* Fix bug#22554,22673,22555

See merge request easycorp/zentaopms!3508
2022-05-20 01:41:31 +00:00
孙广明
747a7af788 Merge branch 'sprint190_zg_54192' into 'master'
* Add project name

See merge request easycorp/zentaopms!3516
2022-05-20 01:40:18 +00:00
zhouxudong
ab9f80ecfb * Finish task #54478. 2022-05-19 08:52:19 +00:00
zenggang
de835ecb3e * Fix bug#22555 2022-05-19 08:08:39 +00:00
zenggang
463ff11e9d * Add project name 2022-05-19 07:03:55 +00:00
wangyidong
f289e08b9d * use buildOperateMenu method for build and projectrelease module. 2022-05-19 13:34:02 +08:00
孙广明
6f150a9ea8 Merge branch 'master' into 'sprint/191_zhouxin_54352'
# Conflicts:
#   module/datatable/config.php
2022-05-19 03:18:24 +00:00
zhouxin
f08ea8b043 * Adjust code. 2022-05-19 03:15:13 +00:00
zhouxin
235b04f76e * Finis task #54352. 2022-05-19 02:02:22 +00:00
孙华伟
b59fb9cc1c *Fix bug#22616. 2022-05-18 13:43:48 +08:00
liumengyi
2f8e2e03e3 * Finish task #54336. 2022-05-18 08:54:40 +08:00
孙广明
268d3c3bcf * Finish task #54218. 2022-05-17 16:04:39 +08:00
孙广明
270715e54b Merge branch 'sprint_sunjun_631' into 'master'
Sprint sunjun 631

See merge request easycorp/zentaopms!3410
2022-05-17 01:15:01 +00:00
sunjun
7e9466abbd sprint_sunjun_631 2022-05-16 21:08:04 +08:00
zhouxudong
53102c368e * Fix bug #22441. 2022-05-16 03:28:40 +00:00
sunjun
073ee90d40 sprint_sunjun_631 2022-05-16 11:10:20 +08:00
zhouxudong
a5783fa37c * Fix bug #22441. 2022-05-16 01:55:08 +00:00
zhouxudong
d1d05a067e * Fix bug #22441. 2022-05-16 01:38:43 +00:00
sunjun
d26e9a0c94 sprint_sunjun_631 2022-05-16 09:13:55 +08:00
sunjun
249190e049 sprint_sunjun_631 2022-05-16 09:11:50 +08:00
sunjun
a4f026d786 sprint_sunjun_631 2022-05-16 09:08:47 +08:00
xieqiyu
8c50568213 * Restore the code of task#53671. 2022-05-15 21:28:31 +08:00
sunjun
f5fe24b54f sprint_sunjun_631 2022-05-15 12:47:45 +08:00
sunjun
4863551658 sprint_sunjun_631 2022-05-14 21:06:48 +08:00
sunjun
9ad4d27dc4 sprint_sunjun_631 2022-05-14 20:32:54 +08:00
sunjun
e9aab00257 sprint_sunjun_631 2022-05-14 19:39:22 +08:00
sunjun
730561654f sprint_sunjun_631 2022-05-13 05:41:39 +00:00
sunjun
845c84a1eb *sprint_sunjun_631 2022-05-13 02:53:47 +00:00
xieqiyu
89491d97de * Resolve issue#629. 2022-05-13 03:02:26 +08:00
xieqiyu
914f474592 * Code for task#53666. 2022-05-12 22:58:17 +08:00
王怡栋
a9d13faa1a Merge branch 'master' into 'sprint/189_zhouxudong_53651'
# Conflicts:
#   module/execution/js/edit.js
2022-05-12 05:20:13 +00:00
王怡栋
5674160b7e Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666

See merge request easycorp/zentaopms!3353
2022-05-12 05:05:25 +00:00
zhouxudong
f98d82234a * Finish task #53651. 2022-05-12 03:57:23 +00:00