Commit Graph
42373 Commits
Author SHA1 Message Date
tianshujie f32443218c * Fix bug #25461. 2022-07-21 09:56:25 +08:00
tianshujie 1f00ba8c03 * Modify the return link for the delete project method. 2022-07-21 09:51:50 +08:00
tianshujie e0537276bd * Delete useless code. 2022-07-21 09:30:35 +08:00
tianshujie 03f9bca910 * Fix bug #25465. 2022-07-21 08:46:07 +08:00
王怡栋 08bc30c893 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4616
2022-07-20 09:29:29 +00:00
王怡栋 c0d3c1da7f Merge branch 'sprint/217_zg_61182' into 'master'
* Finish task#61182,61168

See merge request easycorp/zentaopms!4615
2022-07-20 09:29:07 +00:00
tianshujie 93f70dcf70 * Modify the jump link after saving the created program. 2022-07-20 17:25:25 +08:00
wangyidong 2cf2c96ebd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 17:25:00 +08:00
tianshujie 5b0ada601f * Reformat code. 2022-07-20 17:05:59 +08:00
tianshujie e547bc05a8 * A project cannot be saved successfully for a long time during batch editing. 2022-07-20 17:02:14 +08:00
tianshujie bdab39e7f7 * Fixed an issue where advanced tables cannot be selected entirely. 2022-07-20 16:54:43 +08:00
王怡栋 bcaeed4d82 Merge branch 'sprint/hufangzhou_doc_25510' into 'master'
* Adjust the style for document height.

See merge request easycorp/zentaopms!4614
2022-07-20 08:38:19 +00:00
hufangzhou e5d4bf2ef0 * Adjust the style for document height. 2022-07-20 16:36:26 +08:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
wangyidong ab6ee566e7 * code for task #61191. 2022-07-20 16:14:55 +08:00
王怡栋 1bff7088d1 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4612
2022-07-20 08:08:56 +00:00
tianshujie 68eecb775e * Fix bug #25483. 2022-07-20 16:07:50 +08:00
王怡栋 f4fb9ca204 Merge branch 'sprint/217_liumengyi_61173' into 'master'
* Finish task #61173.

See merge request easycorp/zentaopms!4609
2022-07-20 08:01:12 +00:00
tianshujie c4ab5588af * Fix bug #25483. 2022-07-20 15:59:50 +08:00
liumengyi 9ed05fad25 * Optimize code for task #61173. 2022-07-20 15:59:50 +08:00
tianshujie 05eb3a5422 * Fix bug #25454. 2022-07-20 15:59:28 +08:00
liumengyi d161817441 * Optimize code for task #61173. 2022-07-20 15:56:59 +08:00
王怡栋 e9ed908608 Merge branch 'cyy_mr_create' into 'master'
* Modify protect branch tips.

See merge request easycorp/zentaopms!4607
2022-07-20 06:59:07 +00:00
caoyanyi dcf20546ca * Adjust codes. 2022-07-20 14:28:07 +08:00
王怡栋 d3c3973346 Merge branch 'sprint/hufangzhou_doc' into 'master'
* Finish task #59750.

See merge request easycorp/zentaopms!4608
2022-07-20 06:27:44 +00:00
hufangzhou 9e54c0b55c * Change the if statement to toggleClass. 2022-07-20 14:27:08 +08:00
王怡栋 d349931e82 Merge branch 'sprint/217_liumengyi_61171' into 'master'
* Finish task #61171, #61170.

See merge request easycorp/zentaopms!4610
2022-07-20 06:23:40 +00:00
tianshujie 75ecda8852 * Fix bug #25486. 2022-07-20 14:15:52 +08:00
hufangzhou fab8fedf10 * Adjust the judgment condition to a configuration item. 2022-07-20 14:15:43 +08:00
liumengyi 45eb1e2f99 * Fix bug for task #61171. 2022-07-20 13:54:23 +08:00
孙广明 e8cedee6bb * Code for code error. 2022-07-20 13:49:10 +08:00
孙广明 c5529b23ee * Fix bug #25494. 2022-07-20 13:44:49 +08:00
caoyanyi fc8be7e037 * Modify lang error. 2022-07-20 13:35:49 +08:00
hufangzhou 1085813b49 * Adjust the tips of required fields. 2022-07-20 13:33:52 +08:00
liumengyi ecada98f89 * Fix bug for task #61171. 2022-07-20 13:15:34 +08:00
caoyanyi f8a5428709 * Modify protect branch tips. 2022-07-20 12:07:32 +08:00
tianshujie b59b8b1c39 * Fix bug #25478. 2022-07-20 11:25:11 +08:00
王怡栋 972994bfa0 Merge branch 'cyy_mr' into 'master'
* Modify delete branch after merge.

See merge request easycorp/zentaopms!4605
2022-07-20 03:23:02 +00:00
wangyidong bbb79d5f94 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 10:59:50 +08:00
wangyidong 7542c26998 * code for task #61483. 2022-07-20 10:58:57 +08:00
liumengyi 13eda1d631 * Finish task #61173. 2022-07-20 10:28:01 +08:00
hufangzhou d7c33d2859 * Adjust the height of basic info box. 2022-07-20 10:27:37 +08:00
hufangzhou 1dcf2dcb2c * Code for task #59750. 2022-07-20 10:13:21 +08:00
caoyanyi 809f321445 * Modify delete branch after merge. 2022-07-20 09:59:14 +08:00
王怡栋 70f12a35da Merge branch 'sprint/217_tianshujie_code' into 'master'
* Finish task #61177.

See merge request easycorp/zentaopms!4604
2022-07-20 01:46:08 +00:00
王怡栋 895f8136ec Merge branch 'cyy_mr' into 'master'
* Modify mr review log.

See merge request easycorp/zentaopms!4602
2022-07-20 01:45:46 +00:00
王怡栋 c904507658 Merge branch 'sprint/master_zhouxudong_61110' into 'master'
* Finish task #61110.

See merge request easycorp/zentaopms!4603
2022-07-20 01:45:32 +00:00
tianshujie d225cab26b * Remove spaces. 2022-07-20 09:45:12 +08:00
tianshujie 72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
孙广明 9f1847d55b * Code for code error. 2022-07-20 09:35:30 +08:00