Commit Graph
1390 Commits
Author SHA1 Message Date
孙广明 10496fd993 Merge branch 'sprint/master_zhouxudong_16729' into 'master'
* Fix bug from max #16729.

See merge request easycorp/zentaopms!3080
2022-04-22 06:55:14 +00:00
zhouxudong aaffd2788c * Fix bug from max #16729. 2022-04-22 13:07:10 +08:00
王怡栋 b9eab52620 * fix vulnerability. 2022-04-22 10:38:41 +08:00
朱金勇 7df8158405 Merge branch 'sprint/sunhao/fix_avatar_display' into 'master'
* fix issue on show avatar.

See merge request easycorp/zentaopms!3025
2022-04-20 07:47:16 +00:00
xieqiyu 565ea292d3 * Fix bug#21642. 2022-04-20 14:31:47 +08:00
Hao Sun 6dc60ceead * fix issue on show avatar. 2022-04-20 11:31:36 +08:00
liyuchun c5eddbe19b * Fix bug #21565. 2022-04-18 11:49:44 +08:00
xieqiyu 477a2a4162 * Fix bug#19318. 2022-04-15 13:57:35 +08:00
zhouxin 5f11d21fbf * Fix bug #21783. 2022-04-15 03:19:06 +00:00
xieqiyu 5468912f57 * Fix bug#21382. 2022-04-14 15:22:54 +08:00
zenggang 6908956c24 * Fix bug#17082,17990 2022-04-14 06:28:31 +00:00
xieqiyu 22b629b707 * Fix bug#21382. 2022-04-13 13:15:08 +08:00
zhouxin 1571548411 * Fix bug #21654. 2022-04-12 01:34:40 +00:00
zhouxin d79f9f22e4 * Fix bug #21320. 2022-04-11 06:14:00 +00:00
zhouxin 50fe51a2e5 * Fix bug #21320. 2022-04-11 01:18:40 +00:00
liyuchun ff102f75c4 * Fix bug #20986. 2022-04-08 10:07:46 +08:00
zenggang 691cde081b * Fix bug#19960 2022-04-07 03:32:14 +00:00
zenggang 2429bc7f6e * Fix bug#20886,16610 2022-04-07 01:58:09 +00:00
孙广明 1c8f929a0d Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #13324.

See merge request easycorp/zentaopms!2684
2022-04-02 06:49:30 +00:00
孙广明 3718a90a21 Merge branch 'master_xieqiyu_21383' into 'master'
* Fix bug#21383.

See merge request easycorp/zentaopms!2713
2022-04-02 02:19:05 +00:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
xieqiyu 638d4bd8b8 * Fix bug#21383. 2022-04-01 14:40:38 +08:00
tanghucheng b8aec834dd * Fix bug #21296,21336. 2022-04-01 10:56:35 +08:00
liyuchun 4240b563c9 * Fix bug #21061. 2022-04-01 10:27:27 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
Zongjun Lan 7c99a6153d * fix bug gantt 2022-03-29 16:11:21 +08:00
孙广明 04d9e62697 Merge branch 'fixbugs_zhouxin_16707' into 'master'
* Fix bug #16707.

See merge request easycorp/zentaopms!2602
2022-03-29 06:01:15 +00:00
zhouxin 376de6d824 * Fix bug #16707. 2022-03-29 04:28:39 +00:00
zhouxin 603ae3bfdc * Fix bug #16707. 2022-03-29 03:14:50 +00:00
tianshujie a3c6f30f55 * Fix bug #21028,21030. 2022-03-29 09:57:50 +08:00
caoyanyi 3883bc56dc * Adjust code. 2022-03-28 16:44:07 +08:00
caoyanyi d178200fb9 * Fix bug #11655 and add repo create check. 2022-03-28 16:39:58 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
Zongjun Lan 47b88a959d * fix bug classic user edit and batchedit 2022-03-25 10:15:31 +08:00
Zongjun Lan b80761648b * fix bug classic vision 2022-03-25 09:36:56 +08:00
liyuchun 81c04c08e9 * Fix bug #17367. 2022-03-25 09:20:22 +08:00
caoyanyi 0961139ea4 * Fix bug #18017. 2022-03-23 09:14:27 +08:00
王怡栋 f79a07116b Merge branch 'sprint/lite6_lwr_hide_visions' into 'master'
* remove user vision field if there is no other vision available, task #51318, bug #20691.

See merge request easycorp/zentaopms!2407
2022-03-22 03:15:40 +00:00
Wenrui LI 4a36b134cd * fix hidden vision inputs. 2022-03-22 11:06:54 +08:00
Wenrui LI e920e855eb * add hidden vision input if vision is not shown. 2022-03-22 10:51:40 +08:00
Wenrui LI 90ab73d1f7 * use correct id for input errors on batch create, task #51316, bug #20963. 2022-03-22 09:02:40 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
Wenrui LI 450f2d7d89 * remove user vision field if there is no other vision available, task #51318, bug #20691. 2022-03-21 17:06:12 +08:00
王怡栋 24442be3c5 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19287(biz)

See merge request easycorp/zentaopms!2357
2022-03-18 01:58:27 +00:00
zenggang dae974455f * Adjust code 2022-03-18 01:02:35 +00:00
zenggang 414ec1b308 * Finish task#50667,50675 2022-03-17 09:05:02 +00:00
Zongjun Lan ad622ccb02 * fix bug #t 2022-03-17 15:58:35 +08:00
tanghucheng 18cd2a98aa * Adjust for vision name. 2022-03-17 10:24:41 +08:00
tanghucheng 72095bf38a * Fix bug #20803. 2022-03-15 16:31:27 +08:00