Commit Graph
44941 Commits
Author SHA1 Message Date
hufangzhou d64d98cb16 * Fixed an issue where submodules could not be obtained. 2022-09-20 13:40:13 +08:00
孙广明 995653a760 Merge branch 'mayue_fix_bug#27535' into 'master'
* Fix bug #27535.

See merge request easycorp/zentaopms!5406
2022-09-19 09:24:09 +00:00
孙广明 9dca9eb0e1 Merge branch 'feedback_zhouxin_254' into 'master'
* Solve feedback #254.

See merge request easycorp/zentaopms!5413
2022-09-19 09:23:18 +00:00
zhouxin 55dd069752 * Solve feedback #254. 2022-09-19 16:58:56 +08:00
李玉春 a2a62c58a7 Merge branch 'ta_liyang' into 'master'
* Fix user password.

See merge request easycorp/zentaopms!5403
2022-09-19 07:57:36 +00:00
liyang 5d61e777bd * Fix user password. 2022-09-19 07:36:19 +00:00
李玉春 b79de55fc6 Merge branch 'cyy_bug_import' into 'master'
* Modify bug import.

See merge request easycorp/zentaopms!5398
2022-09-19 06:22:19 +00:00
李玉春 e5b693af5e Merge branch 'dht_unittest' into 'master'
* Fix set null qusetion.

See merge request easycorp/zentaopms!5386
2022-09-19 06:21:47 +00:00
曹延义 4b5987fd29 * Modify bug import. 2022-09-19 14:17:13 +08:00
mayue f206391ee6 * Fix bug #27535. 2022-09-19 13:54:34 +08:00
wangyidong 47a855e35f Merge branch 'sprint/wangyidong_bug' 2022-09-19 13:48:27 +08:00
王怡栋 a86c5da4fe Merge branch 'feedback_835' into 'master'
* Code for feedback#835

See merge request easycorp/zentaopms!5355
2022-09-19 05:43:09 +00:00
王怡栋 e067e74363 Merge branch 'feedback_878' into 'master'
* Code for feedback#878

See merge request easycorp/zentaopms!5316
2022-09-19 05:38:18 +00:00
王怡栋 fea946a6d0 Merge branch 'master_xieqiyu_27528' into 'master'
* Fix bug#27528.

See merge request easycorp/zentaopms!5384
2022-09-19 05:37:47 +00:00
王怡栋 ecdce29687 Merge branch 'master_liuhong_27291' into 'master'
Master liuhong 27291

See merge request easycorp/zentaopms!5385
2022-09-19 05:37:25 +00:00
王怡栋 0801b4a668 Merge branch 'master_liuhong_27183' into 'master'
Master liuhong 27183

See merge request easycorp/zentaopms!5388
2022-09-19 05:36:46 +00:00
liuhong 624c000f7d *Fix bug #27183 for newline when kanban create task. 2022-09-19 02:15:34 +00:00
denghongtao 86f4412952 * Fix set null qusetion. 2022-09-19 00:57:08 +00:00
liuhong c3a1bedeef *Fix bug #27291. 2022-09-19 00:27:43 +00:00
xieqiyu 104787503b * Fix bug#27528. 2022-09-19 00:19:56 +00:00
liuhong 3c27ea607f *Fix bug #27291 for show duplicate requirements. 2022-09-18 13:21:03 +00:00
wangyidong 494db5c359 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-16 15:00:51 +08:00
wangyidong d6f395cc1b * fix bug #27012. 2022-09-16 15:00:21 +08:00
孙广明 2a55eacdb3 Merge branch 'lyk_37132' into 'master'
* Finish story #37132.

See merge request easycorp/zentaopms!5378
2022-09-16 06:32:22 +00:00
liuyongkai ab91716607 * Finish story #37132. 2022-09-16 06:18:03 +00:00
李玉春 2976f5ce58 Merge branch 'sprint/238_dyl_27487' into 'master'
* bug #27487, adjust the button position.

See merge request easycorp/zentaopms!5364
2022-09-16 05:38:18 +00:00
李玉春 20aa21b4d5 Merge branch 'sprint/wangzemei/27511' into 'master'
* Fix bug 27511

See merge request easycorp/zentaopms!5370
2022-09-16 05:37:47 +00:00
李玉春 96436e45c7 Merge branch 'sprint/wangzemei/27483' into 'master'
* fix bug 27483

See merge request easycorp/zentaopms!5365
2022-09-16 05:36:45 +00:00
wangzemei d43547072d * Fix bug 27511 2022-09-16 03:21:57 +00:00
wangzemei df61c94ba1 * fix bug 27483 2022-09-16 02:20:52 +00:00
孙广明 b6b3c5d015 Merge branch 'lyk_35042' into 'master'
* Finish story 35042.

See merge request easycorp/zentaopms!5340
2022-09-16 00:44:50 +00:00
李玉春 3597c9cdd6 Merge branch 'sprint/238_tianshujie_fixbug' into 'master'
* Fixed Kanban not loading.

See merge request easycorp/zentaopms!5354
2022-09-15 09:10:44 +00:00
李玉春 9d4c97fd59 Merge branch 'sprint/238_wangzemei_68935' into 'master'
Sprint/238 wangzemei 68935

See merge request easycorp/zentaopms!5357
2022-09-15 09:10:20 +00:00
wangzemei ea779aab36 * modify count 2022-09-15 09:07:39 +00:00
wangzemei eed29fef1f * modify judge 2022-09-15 09:02:32 +00:00
wangzemei ea750ec99e * add dividing judge 2022-09-15 08:32:48 +00:00
zenggang 0dcf0dfa0d * Code for feedback#835 2022-09-15 07:41:47 +00:00
tianshujie 29328baa42 * Fixed Kanban not loading. 2022-09-15 15:38:34 +08:00
wangzemei 13c738817b * add dividing judge 2022-09-15 07:01:59 +00:00
dingyongliang d95bc9126c * bug #27487, adjust the button position. 2022-09-15 06:55:07 +00:00
wangzemei cfe34d7760 * add judge 2022-09-15 06:45:02 +00:00
wangzemei 5b04709721 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68935 2022-09-15 06:11:28 +00:00
wangzemei f25ff4605b * Finish #68935 2022-09-15 06:10:54 +00:00
李玉春 38e07b27af Merge branch 'sprint/238' into 'master'
Sprint/238

See merge request easycorp/zentaopms!5347
2022-09-15 06:00:45 +00:00
liuyongkai 5bdea0af1d * Finish stroy 35042. 2022-09-15 05:57:31 +00:00
liuyongkai ca2e0e7749 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-15 03:22:48 +00:00
liuyongkai 18c3f1637f * Finish story 35042. 2022-09-15 03:14:23 +00:00
wangyidong 80428dd470 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-15 10:49:55 +08:00
wangyidong a497bafb9f * fix bug. 2022-09-15 10:49:40 +08:00
王怡栋 701364bea5 Merge branch 'sprint/238_dyl_68929' into 'sprint/238'
* tash #68929, center the kanban title.

See merge request easycorp/zentaopms!5335
2022-09-15 02:47:55 +00:00