Commit Graph

36140 Commits

Author SHA1 Message Date
朱金勇
297a9969dc Merge branch 'sprint/scx_api' into 'master'
*Task batchCreate API.

See merge request easycorp/zentaopms!2420
2022-03-22 07:38:53 +00:00
zhouxin
cebd0a33d5 Fix bug #13855. 2022-03-22 07:38:24 +00:00
朱金勇
743f6b685a Merge branch 'sprint/scx_estimate' into 'master'
*Get task estimates.;

See merge request easycorp/zentaopms!2441
2022-03-22 07:38:04 +00:00
songchenxuan
af7aa5422e *Code format. 2022-03-22 15:36:29 +08:00
zenggang
04652c0e65 * Adjust code 2022-03-22 07:34:17 +00:00
songchenxuan
6d9a115f6f *Code format. 2022-03-22 15:29:25 +08:00
孙华伟
fb6de8f7e6 *Optimize the code. 2022-03-22 15:27:36 +08:00
mayue
4b4b04f19b * Optimize code. 2022-03-22 15:21:34 +08:00
liyang
29375797df * update dept. 2022-03-22 15:21:25 +08:00
tianshujie
ccf11069cb * Fix bug #20975. 2022-03-22 15:20:47 +08:00
sunjun
3e310f632f fixbug#17627 2022-03-22 15:18:35 +08:00
孙华伟
0816a49ce2 *Fix bug#17397 2022-03-22 15:18:08 +08:00
孙广明
de5f46d9ff Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2444
2022-03-22 07:16:10 +00:00
tianshujie
27ee0c1d3d * Fix bug #20918. 2022-03-22 15:15:04 +08:00
zenggang
784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
sunjun
5dc4afbf0c fixbug #17627 2022-03-22 15:09:46 +08:00
sunjun
7d85a0d00a fixbug #17627 2022-03-22 15:05:08 +08:00
songchenxuan
5acd5eba4a *Code format. 2022-03-22 15:01:39 +08:00
liumengyi
d9d2eea3b9 * Add auto test of bug. 2022-03-22 15:01:20 +08:00
李玉春
f7b4ea2ac6 Merge branch 'sprint/master_zhouxudong_16070' into 'master'
* Fix bug #16070.

See merge request easycorp/zentaopms!2443
2022-03-22 06:55:47 +00:00
zhouxudong
a643044137 * Fix bug #16070. 2022-03-22 14:53:08 +08:00
mayue
c86f396201 * Fix bug #21052. 2022-03-22 14:52:37 +08:00
zhouxin
30523ec374 Fix bug #17943. 2022-03-22 06:48:55 +00:00
songchenxuan
77674cb969 *Code format. 2022-03-22 14:47:49 +08:00
tianshujie
69e1f67fbd * Fix bug #21054. 2022-03-22 14:32:52 +08:00
songchenxuan
4314fb37e5 *Routes. 2022-03-22 14:30:20 +08:00
songchenxuan
9090ad8584 *Get task estimates.; 2022-03-22 14:28:47 +08:00
liyuchun
b1ed52dd44 * Fix bug #17333. 2022-03-22 14:22:33 +08:00
liyuchun
166cda1186 * Fix bug #17235. 2022-03-22 14:12:44 +08:00
tianshujie
56c777f843 * Fix bug #17668. 2022-03-22 14:10:13 +08:00
朱金勇
f523d8f121 Merge branch 'sgm_storytest' into 'master'
* Add story test and fix bug.

See merge request easycorp/zentaopms!2439
2022-03-22 06:09:37 +00:00
孙广明
fd5d14033a * Add story test and fix bug. 2022-03-22 14:07:42 +08:00
孙广明
9999bad8bb Merge branch 'autotest_ly' into 'master'
add data of test

See merge request easycorp/zentaopms!2438
2022-03-22 06:06:52 +00:00
孙广明
88f1cd03d5 Merge branch 'fixbug_zhouxin_17415' into 'master'
Fix bug #17415.

See merge request easycorp/zentaopms!2436
2022-03-22 06:06:31 +00:00
liyang
2d93fb840b add data of relation 2022-03-22 14:02:51 +08:00
mayue
c09b24adbd * Fix bug #20098. 2022-03-22 13:50:19 +08:00
李玉春
2b1fee6181 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2433
2022-03-22 05:43:55 +00:00
李玉春
0babd13202 Merge branch 'app_cyy_bug' into 'master'
* Modify story create error.

See merge request easycorp/zentaopms!2437
2022-03-22 05:40:57 +00:00
tianshujie
129c55db39 * Delete useless judgment conditions. 2022-03-22 13:40:43 +08:00
caoyanyi
515de66bdc * Adjust code. 2022-03-22 13:40:23 +08:00
liyang
e0258738d3 add data of test 2022-03-22 13:38:37 +08:00
caoyanyi
1d68afd421 * Modify story create error. 2022-03-22 13:34:37 +08:00
tianshujie
303c546348 * Fix bug #20915. 2022-03-22 13:25:13 +08:00
王怡栋
25f329403f Merge branch 'sprint/lite6_lwr_task_create_from_kanban_styles' into 'master'
* fix chosen floating upon modal header on task create, task #51325, bug #20701.

See merge request easycorp/zentaopms!2434
2022-03-22 05:20:33 +00:00
李玉春
e811292dc9 Merge branch 'sprint/master_zhoxudong_14090' into 'master'
Sprint/master zhoxudong 14090

See merge request easycorp/zentaopms!2435
2022-03-22 05:12:46 +00:00
zhouxin
cc2704e1d0 Fix bug #17415. 2022-03-22 05:10:45 +00:00
zhouxudong
b65da66453 * Fix bug #14090. 2022-03-22 13:09:47 +08:00
tianshujie
1004f727ae * Modify language item. 2022-03-22 12:35:34 +08:00
zhouxudong
67045f3041 *Fix bug #14090. 2022-03-22 11:28:44 +08:00
Wenrui LI
5eae11358f * fix chosen floating upon modal header on task create, task #51325, bug #20701. 2022-03-22 11:26:21 +08:00