Commit Graph
950 Commits
Author SHA1 Message Date
王怡栋 1653df17fd Merge branch 'sprint/master_zhouxudong_24736' into 'master'
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.

See merge request easycorp/zentaopms!4375
2022-07-06 06:24:30 +00:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
liumengyi ead37d6de6 * Fix bug #24843. 2022-07-06 13:43:51 +08: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
zhouxudong 85f7dd9c95 * Finish task #59525. 2022-07-06 01:29:25 +00:00
liumengyi 500302a590 * Fix bug of task #59477. 2022-07-06 09:28:10 +08:00
liumengyi 4324454636 * Fix bug of task #59477. 2022-07-06 08:52:27 +08:00
zhouxudong ddecdf5cb8 * Finish task #59525. 2022-07-06 00:31:05 +00:00
liumengyi 7bb148a48b * Fix bug of task #59477. 2022-07-05 22:17:19 +08:00
liumengyi 57c87e5912 * Finish task #59477. 2022-07-05 13:52:57 +08:00
liumengyi d1f25755f1 * Finish task #59477. 2022-07-05 09:39:55 +08:00
liumengyi c61cc238c0 * Fix bug #24475. 2022-06-28 16:16:51 +08:00
liumengyi cd3956ad1c * Optimize code. 2022-06-28 13:06:38 +08:00
liumengyi 16d62b8a6e * Finish task #58562. 2022-06-28 10:48:25 +08:00
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
mayue 1c64648461 * Optimize code. 2022-06-23 17:29:26 +08:00
mayue 52ff077e79 * Fix bug #24059. 2022-06-23 15:29:59 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
孙广明 ef6f5e0eec * Code for testcase view page display bug style. 2022-06-16 13:15:57 +08:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
wangyuting2 065f5e738a * Finish task #55566. 2022-06-02 11:00:17 +08:00
xieqiyu 5f5f721d19 * Finish task#55631. 2022-06-01 00:26:43 +08:00
leiyong 6c1d71c837 * Finish task#54980. 2022-05-26 03:24:37 +00:00
daitingting 3a3549078f * Remove useless object param. 2022-05-25 01:19:49 +00:00
daitingting e2f7c10296 * Set default value in getFieldControl function, finish task #54954. 2022-05-25 01:03:06 +00:00
xieqiyu 23e2c29c1a * Finish task#54989. 2022-05-24 17:04:09 +08:00
xieqiyu d9bbc81938 * Finish task#54989. 2022-05-24 16:23:54 +08:00
tianshujie 2f751595cc * Resoled issue #640. 2022-05-19 16:25:58 +08:00
wangyidong 8aad51ace3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-18 10:29:11 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
liumengyi b4a34e2ed6 * Fix bug #22585. 2022-05-18 10:10:06 +08:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
孙广明 57e90b8dbc * Fix bug for qiqi. 2022-04-22 14:42:22 +08:00
孙广明 8dec8a485b * Fix bug for qiqi. 2022-04-22 14:31:06 +08:00
孙广明 6509056a9e * Fix bug for qiqi. 2022-04-22 14:27:32 +08:00
tianshujie 0a5ef1e4fa * Fix bug #18060. 2022-04-21 16:51:57 +08:00
tianshujie edbc8e5d0b * Fix bug #18060. 2022-04-21 15:52:57 +08:00
tianshujie 5fa9f0d1a9 * Fix bug #21717. 2022-04-14 15:48:09 +08:00
tianshujie 1ef7a9f6b0 * Fix bug #16607. 2022-04-13 09:45:05 +08:00
tianshujie e1df191578 * Fix bug #17280. 2022-04-12 15:12:45 +08:00
王怡栋 538f831692 Merge branch 'master' into 'sprint/tianshujie_bug16527'
# Conflicts:
#   module/testcase/control.php
#   module/testcase/view/batchedit.html.php
2022-04-12 06:57:23 +00:00
tianshujie a8b051c12b * Fix bug #16527. 2022-04-12 12:58:56 +08:00
孙广明 2b02f4dd38 Merge branch 'fixbug_sunjun_21618' into 'master'
Fixbug sunjun 21618

See merge request easycorp/zentaopms!2859
2022-04-12 01:40:59 +00:00
sunjun 75a70acec3 *Fixbug_sunjun_21618 2022-04-11 14:50:59 +08:00
孙广明 ccd84601f3 Merge branch 'sprint/tianshujie_bug21210' into 'master'
* Fix bug #21210.

See merge request easycorp/zentaopms!2843
2022-04-11 02:22:55 +00:00