Commit Graph
41264 Commits
Author SHA1 Message Date
tianshujie 98b100b6d1 * Add comments. 2022-06-30 13:40:43 +08:00
tianshujie 5a7778acbe * Fixed TAB return error. 2022-06-30 13:37:34 +08:00
王怡栋 7e7147567c Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #24288.

See merge request easycorp/zentaopms!4258
2022-06-30 05:18:33 +00:00
李玉春 ae0722b146 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23945.

See merge request easycorp/zentaopms!4247
2022-06-30 05:18:15 +00:00
王怡栋 531a112d7d Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
Sprint/208 tianshujie fixbug

See merge request easycorp/zentaopms!4259
2022-06-30 05:17:58 +00:00
tianshujie 7528cdfdcf * Fix bug #24554. 2022-06-30 13:16:31 +08:00
liumengyi 6e107a4783 * Fix bug #24288. 2022-06-30 13:15:03 +08:00
王怡栋 baa7851b95 Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #23250.

See merge request easycorp/zentaopms!4257
2022-06-30 05:10:56 +00:00
liumengyi afa237c3ac * Fix bug #23250. 2022-06-30 13:03:04 +08:00
王怡栋 92ff918d26 Merge branch 'sprint/master_fixbug_202207' into 'master'
* fix bug #23954

See merge request easycorp/zentaopms!4254
2022-06-30 04:04:17 +00:00
王怡栋 b900e473e3 Merge branch 'fixbug_api' into 'master'
fixbug_api

See merge request easycorp/zentaopms!4255
2022-06-30 04:04:00 +00:00
sunjun 5166008449 fixbug_api 2022-06-30 03:42:34 +00:00
lanzongjun b953f00253 * fix bug #23954 2022-06-30 11:28:00 +08:00
王怡栋 2668b11469 Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #24288.

See merge request easycorp/zentaopms!4253
2022-06-30 03:24:29 +00:00
王怡栋 33502862c2 Merge branch 'fixbug' into 'master'
* Code for lite html hook.

See merge request easycorp/zentaopms!4250
2022-06-30 03:24:16 +00:00
liumengyi 03b07a3b3a * Fix bug #24288. 2022-06-30 11:23:46 +08:00
王怡栋 a0175bb7b6 Merge branch 'sprint/workflow' into 'master'
* Hide open approval for lite workflow.

See merge request easycorp/zentaopms!4252
2022-06-30 03:23:28 +00:00
tanghucheng c896e5ac6f * Code for lite html hook. 2022-06-30 11:22:53 +08:00
liumengyi fe4aa6c00f * Fix bug #24288. 2022-06-30 11:21:38 +08:00
liumengyi 3d92afa1ae * Fix bug. 2022-06-30 11:20:41 +08:00
wangyuting2 8d43bd7bdc * Hide open approval for lite workflow. 2022-06-30 11:08:16 +08:00
李玉春 6489da0369 Merge branch 'sprint/207_mayue_bug#24580' into 'master'
* Fix bug #24580.

See merge request easycorp/zentaopms!4251
2022-06-30 03:04:10 +00:00
mayue 933694703e * Fix bug #24580. 2022-06-30 11:00:28 +08:00
王怡栋 91c7b02ad8 Merge branch 'sprint/209_hufangzhou_24585' into 'master'
* Fix bug #24585.

See merge request easycorp/zentaopms!4249
2022-06-30 02:57:52 +00:00
王怡栋 2ef7eb192a Merge branch 'sprint209_adjust_code' into 'master'
Sprint209 adjust code

See merge request easycorp/zentaopms!4248
2022-06-30 02:57:33 +00:00
王怡栋 94a88ee9e1 Merge branch 'fixbug' into 'master'
* Fix bug #24542.

See merge request easycorp/zentaopms!4246
2022-06-30 02:56:29 +00:00
王怡栋 31235c9bc0 Merge branch 'sprint/209_hufangzhou_24545' into 'master'
* Fix bug #24545.

See merge request easycorp/zentaopms!4245
2022-06-30 02:56:06 +00:00
王怡栋 48bf110630 Merge branch 'master_xieqiyu_24275' into 'master'
* Fix bug#24275.

See merge request easycorp/zentaopms!4244
2022-06-30 02:55:36 +00:00
tianshujie 8fbf4148c4 * Fix bug #24573. 2022-06-30 10:55:05 +08:00
hufangzhou f13b0db32e * Fix bug #24585. 2022-06-30 10:44:46 +08:00
xieqiyu 678d8ae3d3 * Code for task#58578. 2022-06-30 10:33:20 +08:00
xieqiyu 38ba859322 * Code for task#58578. 2022-06-30 10:28:38 +08:00
李玉春 46a88b04d3 Merge branch 'bug_24222' into 'master'
* Fix bug #24222.

See merge request easycorp/zentaopms!4231
2022-06-30 02:26:33 +00:00
liyuchun 6dd69c055a * Fix bug #23945. 2022-06-30 02:21:03 +00:00
tianshujie c265149f88 * Fix bug #24586. 2022-06-30 10:19:52 +08:00
tanghucheng 384cd2d15a * Fix bug #24542. 2022-06-30 10:12:56 +08:00
xieqiyu afa1631a35 * Code for task#58578. Delete name. 2022-06-30 10:09:32 +08:00
hufangzhou cf73860013 * Fix bug #24545. 2022-06-30 10:09:19 +08:00
孙广明 7a80448220 * Code for multi task. 2022-06-30 09:51:35 +08:00
xieqiyu d641d96641 * Fix bug#24275. 2022-06-30 09:44:43 +08:00
孙广明 793a4ec698 * Code for multi task assignedTo. 2022-06-30 09:41:33 +08:00
王怡栋 0f54a5a7cc Merge branch 'master_xieqiyu_23990' into 'master'
* Fix bug#23990.

See merge request easycorp/zentaopms!4241
2022-06-30 01:39:43 +00:00
孙广明 b1b9290fd7 Merge branch 'sprint/207_mayue_task#58767' into 'master'
* Adjust some show issue.

See merge request easycorp/zentaopms!4243
2022-06-30 01:39:20 +00:00
王怡栋 0a63ae8609 Merge branch 'spring/master_guofeilong_24480' into 'master'
* fix indentation problem in index.en.css

See merge request easycorp/zentaopms!4240
2022-06-30 01:39:18 +00:00
王怡栋 a9b14f9c2a Merge branch 'master_fixbug' into 'master'
* Fix bug #24570.

See merge request easycorp/zentaopms!4242
2022-06-30 01:39:02 +00:00
tanghucheng 4074e9fbae * Fix bug #24570. 2022-06-30 09:37:25 +08:00
mayue 4298ec0f98 * Adjust some show issue. 2022-06-30 09:35:55 +08:00
孙广明 8051dc887e Merge branch 'master_xieqiyu_24370' into 'master'
Master xieqiyu 24370

See merge request easycorp/zentaopms!4233
2022-06-30 01:35:47 +00:00
xieqiyu 48e9a8fdad * Fix bug#23990. 2022-06-30 09:31:58 +08:00
guofeilong a99820b192 * fix indentation problem in index.en.css 2022-06-30 01:29:28 +00:00