Commit Graph
45158 Commits
Author SHA1 Message Date
曹延义 5bb453c851 * Code for task #70489. 2022-09-27 16:00:13 +08:00
曹延义 79009a9d80 * Modify checkbox display. 2022-09-27 15:52:29 +08:00
曹延义 f133837589 * Hide left border. 2022-09-27 15:52:11 +08:00
李玉春 af0256eecb Merge branch 'sprint/cyy_task' into 'sprint/244'
* Modify language.

See merge request easycorp/zentaopms!5554
2022-09-27 05:25:12 +00:00
曹延义 c9f757c635 * Adjust code. 2022-09-27 13:23:37 +08:00
曹延义 ff8f0ebbea * Modify project title. 2022-09-27 10:37:54 +08:00
曹延义 89c84da7fd Merge branch 'master' into sprint/244 2022-09-27 10:07:46 +08:00
曹延义 f74af95c5e * Adjust code. 2022-09-27 10:04:34 +08:00
曹延义 0911d16112 * Code for task #70495. 2022-09-27 09:59:14 +08:00
sunguangming 142f758c46 * Fix task view bug. 2022-09-27 09:30:33 +08:00
王怡栋 6c1872201a Merge branch 'fixbug' into 'master'
* Fix bug for bug export.

See merge request easycorp/zentaopms!5556
2022-09-27 00:51:11 +00:00
王怡栋 3e9725dd4d Merge branch 'sprint/hufangzhou_feedback_963' into 'master'
* Handle feedback #963.

See merge request easycorp/zentaopms!5538
2022-09-27 00:50:47 +00:00
hufangzhou 6c971a35c8 * Adjust the code. 2022-09-27 08:50:09 +08:00
tanghucheng 2ac544b181 * Fix bug for bug export. 2022-09-27 08:45:07 +08:00
王怡栋 718c35a9cd Merge branch 'case_patchedit' into 'master'
* Fix case batchedit.

See merge request easycorp/zentaopms!5522
2022-09-27 00:42:09 +00:00
李玉春 458c59dd42 Merge branch 'sprint/wangzemei/fix_27935' into 'master'
fix bug: 27935 & 27961 & 27955 &27932

See merge request easycorp/zentaopms!5555
2022-09-27 00:35:32 +00:00
曹延义 30973efa6a * Modify language. 2022-09-27 08:31:42 +08:00
wangzemei 3b79c8a74d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/fix_27935 2022-09-27 08:30:51 +08:00
wangzemei f10edf6adc * fix bug #27955 2022-09-27 08:30:38 +08:00
王怡栋 940fe22063 Merge branch 'master_freeback_5317' into 'master'
*Update verify duplicate department code before submit.

See merge request easycorp/zentaopms!5533
2022-09-27 00:27:02 +00:00
李玉春 0c716d8251 Merge branch 'sprint/cyy_task' into 'sprint/244'
Sprint/cyy task

See merge request easycorp/zentaopms!5551
2022-09-27 00:26:56 +00:00
王怡栋 51d8ba9d4d Merge branch 'sprint/hufangzhou_template' into 'master'
* Fix the bug which autofill the title for creating doc.

See merge request easycorp/zentaopms!5537
2022-09-27 00:26:35 +00:00
王怡栋 820f85cdd0 Merge branch 'bug_27927' into 'master'
* Fix bug#27927

See merge request easycorp/zentaopms!5541
2022-09-27 00:24:46 +00:00
王怡栋 0b2ed9110f Merge branch 'master_27970' into 'master'
*Fix bug #27970.

See merge request easycorp/zentaopms!5553
2022-09-27 00:14:51 +00:00
liuhong 55700db5f3 *Fix bug #27970. 2022-09-26 13:39:56 +00:00
wangzemei 72b7dba0c7 * fix bug 27935 & 27961 2022-09-26 17:52:55 +08:00
李玉春 d57ed6e651 Merge branch 'sprint/tianshujie_27949' into 'master'
* Fix bug #27949.

See merge request easycorp/zentaopms!5550
2022-09-26 09:03:00 +00:00
tianshujie fa4fee7fbb * Fix bug #27949. 2022-09-26 16:54:36 +08:00
孙广明 09f4edd61f Merge branch 'liyuchun_fixbug_27962' into 'master'
* Fix bug #27962.

See merge request easycorp/zentaopms!5549
2022-09-26 08:52:24 +00:00
liyuchun 6a60c85dc8 * Fix bug #27962. 2022-09-26 16:50:58 +08:00
sunguangming ac8f6c9413 * Code for task effort bug. 2022-09-26 14:50:04 +08:00
曹延义 f23e60374f * Code for task #70490. 2022-09-26 14:01:25 +08:00
zenggang 282c148704 * Fix bug#27927 2022-09-26 04:06:07 +00:00
曹延义 288fcede9d * Code for task #70485. 2022-09-26 11:48:27 +08:00
李玉春 8e1b4f7819 Merge branch 'sprint/wangzemei/green_flower' into 'master'
* add green theme flower

See merge request easycorp/zentaopms!5540
2022-09-26 03:24:10 +00:00
wangzemei 8596c89ebe * add green theme flower 2022-09-26 11:20:40 +08:00
曹延义 b5e9d3e5ba * Code for task #70502. 2022-09-26 11:10:15 +08:00
曹延义 3f357a3799 * Code for task #70484. 2022-09-26 10:37:39 +08:00
hufangzhou 7a3e44d499 * Handle feedback #963. 2022-09-26 10:22:39 +08:00
李玉春 eb56ce4fbc Merge branch 'sprint/241_tianshujie_bug' into 'master'
Sprint/241 tianshujie bug

See merge request easycorp/zentaopms!5526
2022-09-26 00:57:39 +00:00
zenggang 3e6d59be07 * Adjust code 2022-09-26 00:57:32 +00:00
李玉春 6ec4879cd9 Merge branch 'sprint/241_wangzemei_fix' into 'master'
* fix style

See merge request easycorp/zentaopms!5536
2022-09-26 00:50:30 +00:00
hufangzhou e9408ae4ae * Fix the bug which autofill the title for creating doc. 2022-09-26 08:49:17 +08:00
wangzemei 483a8e4c96 * fix style 2022-09-26 08:45:23 +08:00
王怡栋 a728c2e90c Merge branch 'fixbug' into 'master'
* Fix bug #27891,27610.

See merge request easycorp/zentaopms!5535
2022-09-26 00:38:39 +00:00
tanghucheng 142da875c3 * Fix bug #27891,27610. 2022-09-26 08:36:57 +08:00
李玉春 080972f771 Merge branch 'sprint/241_wangzemei_27863' into 'master'
* modify style about green

See merge request easycorp/zentaopms!5534
2022-09-26 00:29:36 +00:00
wangzemei 13d7e26a87 * modify style about green 2022-09-26 08:26:19 +08:00
tianshujie 3a9b2c4952 * Modify the SQL. 2022-09-26 08:12:53 +08:00
tianshujie e82f1f6d6a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_bug 2022-09-26 08:12:31 +08:00