Commit Graph
4318 Commits
Author SHA1 Message Date
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
liumengyi cc8c52ae8d * Fix bug #24611. 2022-06-30 16:44:18 +08:00
孙广明 c4d5027b86 Merge branch 'fixbug_lang' into 'master'
Fixbug lang

See merge request easycorp/zentaopms!4271
2022-06-30 07:10:37 +00:00
sunjun 6f72eb53ce fixbug_lang 2022-06-30 06:51:28 +00:00
xieqiyu 1b338f5cf5 * Fix bug#24216. 2022-06-30 14:09:52 +08:00
sunjun db7d9edd07 fixbug_lang 2022-06-30 01:41:25 +00:00
tianshujie 20c4a2b8b4 * Resolve issue #687. 2022-06-29 13:53:51 +08:00
tianshujie d597775c7e * Finish task #58560. 2022-06-29 08:35:21 +08:00
tianshujie 12fd7102a1 * Finish task #58556. 2022-06-28 17:55:19 +08:00
mayue c1c145e4b7 * Fix bug #24482. 2022-06-28 16:27:10 +08:00
tianshujie 1cacd32453 * Finish task #58560. 2022-06-28 11:27:15 +08:00
tianshujie 3a380aee1d * Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560. 2022-06-28 11:23:20 +08:00
tianshujie 6be5803453 * Delete extra blank lines. 2022-06-28 10:43:33 +08:00
tianshujie 26f37ec09c * Finish task #58560. 2022-06-27 15:38:33 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
wangzemei b11a919ccd * Fix bug #24000 2022-06-21 06:08:36 +00:00
zhouxin 600a10d7ac * Fix bug #23635. 2022-06-17 05:09:13 +00:00
zhouxin a6c7038d6c * Code for review. 2022-06-17 03:19:45 +00:00
wangyidong 182f601ed2 * fix bug #23740. 2022-06-17 10:32:31 +08:00