Commit Graph
436 Commits
Author SHA1 Message Date
zhouxudong 7a34334374 * Fix bug. 2022-08-04 05:50:24 +00:00
王怡栋 c80090ff79 Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix bug#25998,26017,23426

See merge request easycorp/zentaopms!4783
2022-08-04 03:56:58 +00:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong 4ac799f1d5 * Update Code. 2022-08-04 02:59:02 +00:00
zenggang 9314b23885 * Fix bug#25998,26017 2022-08-04 02:48:29 +00:00
zhouxudong ace4fde7a8 * Finish task #62850. 2022-08-04 01:48:56 +00:00
zhouxudong 9f26275965 * Finish task #62850. 2022-08-04 01:27:07 +00:00
zhouxudong 545f58f944 * Finish task #62850. 2022-08-03 09:25:08 +00:00
zenggang 3a9f4d8ada * Fix bug#25897,22882 2022-08-03 07:16:28 +00:00
zenggang bc8dfbbe7a * Adjust code 2022-08-03 01:43:58 +00:00
zhouxudong 6a784fdfda * Finish task #62850. 2022-08-02 08:50:16 +00:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
zhouxudong 2b3121cd21 * Finish task #62850. 2022-08-02 07:26:14 +00:00
zhouxudong 364a5009f4 * Finish task #62850. 2022-08-02 07:21:03 +00:00
孙广明 083ebb7f29 * Fix stage-task tree list bug. 2022-07-14 13:29:23 +08:00
tianshujie ace5265a11 * Fix bug #25206. 2022-07-14 09:36:42 +08:00
孙广明 b9a6b4a2cc * Code for execution list order. 2022-07-13 14:45:04 +08:00
sunjun cf11a3a4fe fixConflict_24687 2022-07-13 05:31:43 +00:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 bd9700212c * Finish task #59706. 2022-07-12 22:48:07 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
王怡栋 e9809af13a Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
#   www/js/my.full.js
2022-07-11 07:10:23 +00:00
hufangzhou 3f2b98e71c * Move the functions to my.full.js file. 2022-07-11 15:03:40 +08:00
hufangzhou 21dbff52ca * Rename method names. 2022-07-11 14:57:43 +08:00
hufangzhou 2993ba53f8 * Finish task #59535. 2022-07-11 14:41:09 +08:00
liumengyi e709c4bbda * Finish task #59480, #59481. 2022-07-07 14:12:45 +08:00
liyuchun 9771037534 * Fix bug #24312. 2022-07-01 00:42:44 +00:00
Hao Sun 834689d226 * bug #23877, fix user picker not work as expected. 2022-06-17 04:04:28 +00:00
xieqiyu d0ac2813ec * Fix bug#23725. 2022-06-17 09:55:30 +08:00
Hao Sun 86b1c3f82d * support for update picker options in select project member. 2022-06-14 08:33:12 +00:00
tianshujie 3d9012cfca * Finish task #57098. 2022-06-14 13:18:52 +08:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
hufangzhou 9f1ac822bf * Adjust the code. 2022-05-20 18:55:46 +08:00
mayue 99b0f22baa * Fix bug #22632. 2022-05-20 09:10:22 +00:00
孙广明 57a7f0bcef Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* task #54187, optimize kanban with a lot of cards with virtualList.

See merge request easycorp/zentaopms!3511
2022-05-19 07:43:19 +00:00
zhouxin 83248ea9f7 * Fix bug #22651,#22645. 2022-05-19 05:52:24 +00:00
Hao Sun 4d895c53f4 * task #54187, optimize kanbans with virtual scroll list. 2022-05-19 05:10:32 +00:00
Zongjun Lan 7e63a02e20 * fix bug #18934 2022-04-21 16:09:34 +08:00
孙华伟 dcfe09867f *Fix bug#18898. 2022-04-19 15:17:50 +08:00
Hao Sun e1a11341c6 * refactor: format. 2022-04-18 10:34:14 +08:00
Hao Sun af43ca6bb3 * bug #6910, optimize helper "text-limit" and support for displaying html. 2022-04-18 10:25:28 +08:00
tianshujie 27b6817c2c * Fix bug #17551. 2022-04-14 17:11:36 +08:00
tianshujie 90a1fea2d8 * Fix bug #17551. 2022-04-13 13:35:02 +08:00
tianshujie 4503f0b9d8 * Fix bug #12208. 2022-04-01 15:50:34 +08:00
tianshujie 1d91f13687 * Fix bug #17551. 2022-03-31 14:22:35 +08:00
李玉春 9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
2022-03-29 00:50:37 +00:00
sunjun 0ce312f107 *Fixbug #13852 2022-03-28 17:02:25 +08:00
sunjun 487c2a6694 *Fixbug #13852 2022-03-28 13:43:53 +08:00