Commit Graph
37838 Commits
Author SHA1 Message Date
liyuchun e8abf792f7 * Fix bug #11939. 2022-04-22 11:21:32 +08:00
liyuchun 7cc557e528 * Fix bug #7008. 2022-04-22 09:01:32 +08:00
孙广明 c37e1ef5b6 Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140

See merge request easycorp/zentaopms!3069
2022-04-22 00:50:58 +00:00
sunjun cce29cd63c *Fixbug_21140 2022-04-22 08:48:03 +08:00
孙广明 951fd2c19f Merge branch 'zry_app' into 'master'
* Fix api for story USR.

See merge request easycorp/zentaopms!3056
2022-04-21 09:21:33 +00:00
孙广明 fa83e638cf Merge branch 'master_xieqiyu_21896' into 'master'
* Fix bug#21896.

See merge request easycorp/zentaopms!3066
2022-04-21 09:07:10 +00:00
李玉春 59108747ce Merge branch 'sprint/tianshujie_18060' into 'master'
Sprint/tianshujie 18060

See merge request easycorp/zentaopms!3061
2022-04-21 08:55:43 +00:00
tianshujie 0a5ef1e4fa * Fix bug #18060. 2022-04-21 16:51:57 +08:00
xieqiyu 4abb324459 * Fix bug#21896. 2022-04-21 16:46:09 +08:00
朱金勇 d17a38d658 Merge branch 'sprint/sunhao/optimize_picker_in_search' into 'master'
* fix picker control not initialized in search form.

See merge request easycorp/zentaopms!3039
2022-04-21 08:37:25 +00:00
朱金勇 2377d27cf2 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #21804.

See merge request easycorp/zentaopms!3065
2022-04-21 08:37:11 +00:00
孙广明 59f717ddb9 * Fix bug #21804. 2022-04-21 16:34:31 +08:00
孙广明 d4f02a3d88 Merge branch 'mayue_fix_bug#19933#21785' into 'master'
* Fix bug #19933#21785.

See merge request easycorp/zentaopms!3064
2022-04-21 08:32:51 +00:00
mayue 5da98433b6 * Fix bug #19933#21785. 2022-04-21 16:30:32 +08:00
王怡栋 f93e474e26 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18934#21853

See merge request easycorp/zentaopms!3063
2022-04-21 08:24:08 +00:00
Zongjun Lan 2414c6d1dc * fix bug #18934 2022-04-21 16:23:16 +08:00
孙广明 1b62b01fe8 Merge branch 'liyuchun_fixbug_20178' into 'master'
* Fix bug #20178.

See merge request easycorp/zentaopms!3060
2022-04-21 08:19:26 +00:00
Zongjun Lan 7e63a02e20 * fix bug #18934 2022-04-21 16:09:34 +08:00
tianshujie ec0faba808 * Fix bug #18060. 2022-04-21 15:59:45 +08:00
liyuchun 6726e65206 * Fix bug #20178. 2022-04-21 15:59:21 +08:00
tianshujie edbc8e5d0b * Fix bug #18060. 2022-04-21 15:52:57 +08:00
王怡栋 89e1854932 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-21 15:39:05 +08:00
王怡栋 7ae35d4a12 * fix bug #21806. 2022-04-21 15:38:33 +08:00
孙广明 3ac0ae876c Merge branch 'mayue_fix_bug21904' into 'master'
* Fix bug #21904.

See merge request easycorp/zentaopms!3059
2022-04-21 07:18:06 +00:00
孙广明 47962dc5b2 Merge branch 'master_xieqiyu_2598' into 'master'
* Fix bug#2598.

See merge request easycorp/zentaopms!3053
2022-04-21 07:15:41 +00:00
mayue 5f5cc8768e * Fix bug #21904. 2022-04-21 15:04:59 +08:00
王怡栋 9f68a5c608 Merge branch 'fixbug' into 'master'
* Fix bug #18266.

See merge request easycorp/zentaopms!3055
2022-04-21 06:55:30 +00:00
孙广明 87517394ec Merge branch 'sprint/fixbug_hufangzhou_11074' into 'master'
* Fix bug #11074.

See merge request easycorp/zentaopms!3058
2022-04-21 06:55:02 +00:00
hufangzhou 2dc575a760 * Fix bug #11074. 2022-04-21 14:53:38 +08:00
李玉春 77f85a3080 Merge branch 'sprint/sunhao/fix_kanban_sort_cards' into 'master'
* fix cards sorting in kanban column not work.

See merge request easycorp/zentaopms!3057
2022-04-21 06:49:05 +00:00
Hao Sun 1bc448da58 * fix cards sorting in kanban column not work. 2022-04-21 14:46:41 +08:00
Zongjun Lan 3b61e47ad8 * fix bug update sql 2022-04-21 14:40:33 +08:00
zhengrunyu 48ffd99733 * Fix api for story USR. 2022-04-21 14:38:38 +08:00
孙广明 63f22116a4 Merge branch 'fixbugs_zhouxin_2296,1832' into 'master'
* Fix bug #2296,#1832.

See merge request easycorp/zentaopms!3054
2022-04-21 05:53:47 +00:00
zhouxin 8ec6de5fb5 * Fix bug #2296,#1832. 2022-04-21 05:50:05 +00:00
tanghucheng 700c706916 * Fix bug #18266. 2022-04-21 05:33:41 +00:00
Zongjun Lan 0678abad71 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-21 13:18:30 +08:00
xieqiyu c87d9a96a5 * Fix bug#2598. 2022-04-21 13:15:49 +08:00
李玉春 5d1b39b4a6 Merge branch 'sprint/fixbug_liumengyi_19143' into 'master'
* Fix bug #19143.

See merge request easycorp/zentaopms!3052
2022-04-21 05:12:22 +00:00
liumengyi 3c053ada91 * Add english lang item. 2022-04-21 13:11:14 +08:00
liumengyi 80bbd19c9d * Fix bug #19143. 2022-04-21 13:00:36 +08:00
李玉春 9240a007d7 Merge branch 'cyy_15292' into 'master'
* Fix bug #15292.

See merge request easycorp/zentaopms!3042
2022-04-21 02:54:01 +00:00
王怡栋 65dac30fdf Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21853

See merge request easycorp/zentaopms!3049
2022-04-21 02:42:23 +00:00
王怡栋 abc8eed00e Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug

See merge request easycorp/zentaopms!3050
2022-04-21 02:41:40 +00:00
孙广明 e4295fdbe5 * Code for workflow bug. 2022-04-21 10:40:56 +08:00
孙广明 7fb3a62058 * Fix workflow bug. 2022-04-21 10:24:25 +08:00
孙广明 57a39efdea * Fix bug #17618. 2022-04-21 10:17:47 +08:00
孙广明 d48e22cad9 * Fix bug #17618. 2022-04-21 10:16:01 +08:00
Zongjun Lan e2def6e71b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-21 10:13:48 +08:00
Zongjun Lan 473d5a6566 * fix bug #21853 2022-04-21 10:13:39 +08:00