Commit Graph
41719 Commits
Author SHA1 Message Date
leiyong ea75f32195 * Adjsut CSS. 2022-07-08 01:46:15 +00:00
leiyong 207e5bece6 * Fix bug#24825. 2022-07-07 05:43:12 +00:00
leiyong f1e7a1350d * Fix bug#24812. 2022-07-07 05:40:39 +00:00
王怡栋 10b95d1e48 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4398
2022-07-07 05:10:07 +00:00
xieqiyu ef190dc83e * Code for task#59543. Update create bug and batch create bug. 2022-07-07 11:42:54 +08:00
刘刚 c958da7bf4 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24924.

See merge request easycorp/zentaopms!4405
2022-07-07 03:20:08 +00:00
daitingting 162513b943 * Fix bug #24924. 2022-07-07 03:18:45 +00:00
刘刚 263419df29 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24959.

See merge request easycorp/zentaopms!4403
2022-07-07 03:13:21 +00:00
liuruogu 15d87d68e4 * Fix bug #24959. 2022-07-07 03:12:51 +00:00
liuruogu bf62f6fa75 * Fix bug #24959. 2022-07-07 03:03:59 +00:00
孙广明 d02553620f Merge branch 'srpint213_zg_24853' into 'master'
* Fix bug#24853

See merge request easycorp/zentaopms!4396
2022-07-07 02:54:25 +00:00
孙广明 27959db980 Merge branch 'sprint/213_mayue_bug#24811' into 'master'
* Fix bug #24811.

See merge request easycorp/zentaopms!4402
2022-07-07 02:54:16 +00:00
mayue 8192f8b185 * Fix bug #24811. 2022-07-07 10:52:45 +08:00
孙广明 c540e7002d Merge branch 'sprint/211_tianshujie_58555' into 'master'
Sprint/211 tianshujie 58555

See merge request easycorp/zentaopms!4392
2022-07-07 02:51:51 +00:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
刘刚 ff94cac738 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24898.

See merge request easycorp/zentaopms!4399
2022-07-07 02:36:20 +00:00
daitingting cfc20958d0 * Fix bug #24903. 2022-07-07 02:35:55 +00:00
daitingting a588add16f * Fix bug #24898. 2022-07-07 02:16:18 +00:00
wangyidong 072945f180 * fix for tid. 2022-07-07 10:09:19 +08:00
xieqiyu 157c60bd64 * Code for task#59546. Update unlink story. 2022-07-07 10:04:24 +08:00
孙广明 b5a365422f * Code for pri error. 2022-07-07 09:57:20 +08:00
李玉春 c69b9e32d5 Merge branch 'cyy_gitea' into 'master'
Add Gitea module.

See merge request easycorp/zentaopms!4390
2022-07-07 01:56:40 +00:00
caoyanyi ebbcfd3564 * Modify language. 2022-07-07 09:54:20 +08:00
caoyanyi 9dd1c4454c * Adjust code. 2022-07-07 09:49:40 +08:00
王怡栋 5879801b8b Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.

See merge request easycorp/zentaopms!4395
2022-07-07 01:49:35 +00:00
xieqiyu 75d4bc213c * Code for task#59546. Update batch create story and change story. 2022-07-07 09:49:15 +08:00
liumengyi c8b30d557a * Optimize code for task #59482. 2022-07-07 09:48:17 +08:00
zenggang 270ab7ce6e * Fix bug#24853 2022-07-07 01:47:23 +00:00
caoyanyi e794c59ce1 * Adjust codes. 2022-07-07 09:46:11 +08:00
liumengyi 59bbb4577a * Finish task #59482. 2022-07-07 09:44:33 +08:00
caoyanyi 3ece68c081 * Modify user edit. 2022-07-07 09:42:50 +08:00
tianshujie 40ca319394 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/211_tianshujie_58555 2022-07-07 09:41:09 +08:00
王怡栋 779e95fde9 Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59546. Update create story and copy bug.

See merge request easycorp/zentaopms!4391
2022-07-07 01:40:11 +00:00
liumengyi 3049879a44 * Fix bug of task #59482. 2022-07-07 09:40:07 +08:00
wangyidong ab72e9986c Merge branch 'sprint212_leiyong_task_59528' 2022-07-07 09:38:40 +08:00
王怡栋 e7502f6641 Merge branch 'master' into 'sprint212_leiyong_task_59528'
# Conflicts:
#   module/execution/css/create.css
2022-07-07 01:38:20 +00:00
王怡栋 2ca2192913 Merge branch 'fixbug_report' into 'master'
Fixbug report

See merge request easycorp/zentaopms!4393
2022-07-07 01:36:34 +00:00
刘刚 52da827d60 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24908.

See merge request easycorp/zentaopms!4394
2022-07-07 01:23:55 +00:00
daitingting 3bdeeea0f0 * Fix bug #24908. 2022-07-07 01:12:48 +00:00
caoyanyi e05f1dbf6a * Modify language. 2022-07-07 09:07:57 +08:00
xieqiyu e10272248b * Code for task#59546. Update create story and copy bug. 2022-07-07 09:06:33 +08:00
caoyanyi 1aa80a3989 * Modify tips. 2022-07-07 09:05:21 +08:00
sunjun d9e6914e53 fixbug 2022-07-07 01:04:35 +00:00
孙广明 69fb98ef34 Merge branch 'sprint213_zg' into 'master'
* Adjust cfd style

See merge request easycorp/zentaopms!4388
2022-07-07 00:45:49 +00:00
caoyanyi 99fa5aaae3 * Add gitea module. 2022-07-07 08:29:46 +08:00
sunjun de58643be7 fixbug 2022-07-06 14:33:20 +00:00
zenggang 93da33e08d * Adjust cfd style 2022-07-06 09:38:39 +00:00
王怡栋 3e537ee455 Merge branch 'sprint/211_liumengyi_24910' into 'master'
* Fix bug #24910.

See merge request easycorp/zentaopms!4387
2022-07-06 09:23:47 +00:00
liumengyi 7c7a7689d6 * Fix bug #24910. 2022-07-06 17:23:17 +08:00
liumengyi 92fbca540e * Fix bug #24910. 2022-07-06 17:20:54 +08:00