Commit Graph
37176 Commits
Author SHA1 Message Date
wangzemei 363c906500 * add kanban setting input limit 2022-09-28 15:05:40 +08:00
wangzemei bcd3d36418 * modify backend logic 2022-09-27 17:10:18 +08:00
wangzemei b25fa909ce * finish front show about task#71075 2022-09-27 11:28:50 +08:00
曹延义 89c84da7fd Merge branch 'master' into sprint/244 2022-09-27 10:07:46 +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
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
王怡栋 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
王怡栋 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
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
曹延义 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
hufangzhou e9408ae4ae * Fix the bug which autofill the title for creating doc. 2022-09-26 08:49:17 +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
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
liuhong ab8e09307d *Update verify duplicate department code before submit. 2022-09-25 07:00:57 +00:00
朱金勇 d3911c77e6 Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5518
2022-09-23 16:05:19 +00:00
王怡栋 7cbc6a53f0 Merge branch 'sprint/241_dyl_70025' into 'master'
Sprint/241 dyl 70025

See merge request easycorp/zentaopms!5531
2022-09-23 09:19:03 +00:00
王怡栋 f07e15a4b4 Merge branch 'master_xieqiyu_27359' into 'master'
* Fix bug#27359.

See merge request easycorp/zentaopms!5530
2022-09-23 09:18:16 +00:00
王怡栋 98690f8a58 Merge branch 'master_xieqiyu_27404' into 'master'
* Fix bug#27404.

See merge request easycorp/zentaopms!5529
2022-09-23 09:17:41 +00:00
xieqiyu eed9d18857 * Fix bug#27359. 2022-09-23 09:02:39 +00:00
xieqiyu 9914478a58 * Fix bug#27404. 2022-09-23 08:54:58 +00:00
王怡栋 ccee584e98 Merge branch 'master_xieqiyu_27408' into 'master'
* Fix bug#27408.

See merge request easycorp/zentaopms!5528
2022-09-23 08:54:46 +00:00
wangzemei ec56b969ee * merge master 2022-09-23 16:51:34 +08:00
dingyongliang b708b328ee * hidden all projects. 2022-09-23 08:48:17 +00:00
王怡栋 e1d6f0ac91 Merge branch 'master_xieqiyu_27453' into 'master'
* Fix bug$27453.

See merge request easycorp/zentaopms!5524
2022-09-23 08:42:34 +00:00
xieqiyu 856703675b * Fix bug#27408. 2022-09-23 08:42:07 +00:00
tianshujie e553730c29 * Finish task #70202. 2022-09-23 16:33:56 +08:00
hufangzhou 952f0395c9 * Add the new version 2022-09-23 16:33:40 +08:00
xieqiyu b7d243f0be * Fix bug$27453. 2022-09-23 08:32:16 +00:00
dingyongliang 4ef4195d34 * center c-confirmed. 2022-09-23 08:30:24 +00:00
dingyongliang 41672b5107 * add icon for program. 2022-09-23 08:26:53 +00:00