Commit Graph
2939 Commits
Author SHA1 Message Date
xieqiyu 658a187e47 * Fix bug of story and bug action in execution. 2022-07-12 14:05:40 +08:00
wangyidong 43c9570c98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-08 17:36:59 +08:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
孙广明 77ec1c0bac Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59543.

See merge request easycorp/zentaopms!4433
2022-07-08 07:10:47 +00:00
liumengyi f9b24fb48c * Fix bug of task #23123. 2022-07-08 13:52:33 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
xieqiyu 375b0c2a6f * Code for task#59543. 2022-07-08 13:25:39 +08:00
tianshujie 3213065954 * Fix bug #24802. 2022-07-08 13:05:07 +08:00
孙广明 118e1f7854 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4420
2022-07-08 01:20:53 +00:00
tianshujie be1ca95624 * Fix bug #24977. 2022-07-08 08:15:42 +08:00
刘刚 6d59cccaec Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24865.

See merge request easycorp/zentaopms!4419
2022-07-08 00:01:15 +00:00
xieqiyu 38dcc95cb4 * Code for task#59543. 2022-07-07 18:08:59 +08:00
liuruogu 63fe5c2750 * Fix bug #24865. 2022-07-07 09:23:56 +00:00
xieqiyu 2f81269858 * Code for task#59543. 2022-07-07 16:13:55 +08:00
liumengyi e709c4bbda * Finish task #59480, #59481. 2022-07-07 14:12:45 +08:00
王怡栋 10b95d1e48 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4398
2022-07-07 05:10:07 +00:00
xieqiyu ef190dc83e * Code for task#59543. Update create bug and batch create bug. 2022-07-07 11:42:54 +08:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
tianshujie 40ca319394 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/211_tianshujie_58555 2022-07-07 09:41:09 +08:00
王怡栋 779e95fde9 Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59546. Update create story and copy bug.

See merge request easycorp/zentaopms!4391
2022-07-07 01:40:11 +00:00
刘刚 52da827d60 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24908.

See merge request easycorp/zentaopms!4394
2022-07-07 01:23:55 +00:00
daitingting 3bdeeea0f0 * Fix bug #24908. 2022-07-07 01:12:48 +00:00
xieqiyu e10272248b * Code for task#59546. Update create story and copy bug. 2022-07-07 09:06:33 +08:00
tianshujie dc7e0ec546 * Put the functions that add and remove elements in my.full.js. 2022-07-06 16:37:10 +08:00
王怡栋 f25fcc1eb2 Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
#   module/testcase/css/create.css
2022-07-06 06:47:25 +00:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
刘刚 d3174ab36c Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10

See merge request easycorp/zentaopms!4368
2022-07-06 03:07:19 +00:00
王怡栋 29bed0101b Merge branch 'sprint/master_zhouxudong_59525' into 'master'
Sprint/master zhouxudong 59525

See merge request easycorp/zentaopms!4365
2022-07-06 02:17:24 +00:00
zhouxudong bf19599c0e * Finish task #59525. 2022-07-06 02:15:33 +00:00
tianshujie 577b42f32c * Hide required fields in custom forms. 2022-07-06 08:41:20 +08:00
zhouxudong ddecdf5cb8 * Finish task #59525. 2022-07-06 00:31:05 +00:00
tianshujie cdaf164f0a * Fix bug #24752,24747. 2022-07-06 08:26:27 +08:00
daitingting be44e76cb9 * Finish task #59646. 2022-07-05 09:20:47 +00:00
王怡栋 bc00e9f66c Merge branch 'sprint/211_tianshujie_59475' into 'master'
Sprint/211 tianshujie 59475

See merge request easycorp/zentaopms!4353
2022-07-05 08:30:47 +00:00
tianshujie b6c52c441e * Finish task #59475. 2022-07-05 16:01:47 +08:00
tianshujie 987421cc77 * Finish task #59475. 2022-07-05 15:44:09 +08:00
王怡栋 1ab6ed7a95 Merge branch 'sprint/master_zhouxudong_59522' into 'master'
* Finish task #59518 #59522.

See merge request easycorp/zentaopms!4350
2022-07-05 07:36:15 +00:00
tianshujie f186662f35 * Transfer variable. 2022-07-05 15:31:23 +08:00
zhouxudong b9ee65ddfd * Fix bug #24751. 2022-07-05 06:54:04 +00:00
tianshujie 4c4e67f7e8 * Finish task #59475. 2022-07-05 14:08:00 +08:00
zhouxudong 60ddcc7894 * Finish task #59518 #59522. 2022-07-05 05:49:04 +00:00
王怡栋 a6916a73c5 Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527

See merge request easycorp/zentaopms!4326
2022-07-05 02:07:26 +00:00
tianshujie 0da2ce9dd3 * Finish task #59975. 2022-07-05 09:46:34 +08:00
tianshujie 17a8e9dcd5 * Changing the name of a function. 2022-07-05 08:47:45 +08:00
zhouxudong 6003adcd19 * Finish task #59527. 2022-07-05 00:43:34 +00:00
zhouxudong 1c00265c79 * Finish task #59527 #59572. 2022-07-04 07:21:39 +00:00
王怡栋 04b2a5994f Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554

See merge request easycorp/zentaopms!4317
2022-07-04 06:59:21 +00:00
tianshujie 6fc6d25a48 * Finish task #58554. 2022-07-04 14:48:24 +08:00
tianshujie 31ea99dae1 * Finish task #58556. 2022-07-04 14:12:48 +08:00
孙广明 52a588ec90 * Code for kanban error. 2022-07-01 14:38:20 +08:00