Commit Graph
386 Commits
Author SHA1 Message Date
zenggang 6c48f5ec97 * Finish task#67260 2022-08-30 06:39:36 +00:00
zenggang 062af71ff8 * Fix sprint231 bugs 2022-08-29 07:23:32 +00:00
曾刚 72194dcc1a * Fix bug#26939 2022-08-29 02:55:19 +00:00
liuhong 18f392ac88 *Fix bug #66222. 2022-08-26 01:48:39 +00:00
liuhong 63fa2567dc *Fix bug #66222. 2022-08-25 22:22:37 +00:00
zenggang 73c8091a82 * Finish task#65782,65779 2022-08-24 03:24:03 +00:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
王怡栋 5ec5c071f3 Merge branch 'sprint/220_tianshujie_fixbug' into 'master'
Sprint/220 tianshujie fixbug

See merge request easycorp/zentaopms!4707
2022-07-28 05:47:21 +00:00
tianshujie dbcb3c9f1b * Fix bug #25465. 2022-07-28 13:44:04 +08:00
tianshujie fd1868a287 * Fix bug #25465. 2022-07-27 16:22:07 +08:00
chaideqing 9fc68cfe73 * bug view remove toTask in xuanxuan 2022-07-26 16:39:39 +08:00
liyuchun fc61e1c142 * Fix bug #25251. 2022-07-15 06:49:47 +00:00
李玉春 51b2242326 Liyuchun fixbug 2022-07-15 03:14:43 +00: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
liuruogu 63fe5c2750 * Fix bug #24865. 2022-07-07 09:23:56 +00:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +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
tianshujie 577b42f32c * Hide required fields in custom forms. 2022-07-06 08:41:20 +08:00
tianshujie f186662f35 * Transfer variable. 2022-07-05 15:31:23 +08:00
tianshujie 4c4e67f7e8 * Finish task #59475. 2022-07-05 14:08:00 +08:00
tianshujie 17a8e9dcd5 * Changing the name of a function. 2022-07-05 08:47:45 +08: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
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 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
zhouxin a6c7038d6c * Code for review. 2022-06-17 03:19:45 +00:00
孙广明 5c1f32c3d9 Merge branch 'sprint_194' into 'master'
sprint_194 add project in batchcreate view

See merge request easycorp/zentaopms!3876
2022-06-13 02:06:00 +00:00
sunjun 385e4b23e3 sprint_194 2022-06-13 02:05:02 +00:00
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
sunjun a69d10d9db sprint_194 add project in batchcreate view 2022-06-10 06:36:12 +00:00
孙广明 82f09dcb51 Merge branch 'master_xieqiyu_23154' into 'master'
* Fix bug#23154.

See merge request easycorp/zentaopms!3731
2022-06-02 09:43:11 +00:00
zhouxudong 0e6fc10f0b * Fix bug #23111. 2022-06-02 05:24:18 +00:00
xieqiyu 1d2ca05e50 * Fix bug#23154. 2022-06-02 03:54:17 +08:00
sunjun 1c8db1da3a fixbug_sunjun_22531 2022-06-01 09:14:12 +00:00
孙华伟 ab396ef809 *Optimize the code. 2022-05-26 11:14:50 +08:00
孙华伟 c43322977f *Fix bug #22900. 2022-05-26 11:07:01 +08:00
王怡栋 7466f08e23 Merge branch 'sprint/193_hufangzhou_54996' into 'master'
* Finish task #54996.

See merge request easycorp/zentaopms!3581
2022-05-25 07:09:51 +00:00
hufangzhou 47151034b0 * Finish task #54996. 2022-05-25 11:21:49 +08:00
sunjun 532ed847f3 fixbug_sunjun 2022-05-25 03:07:59 +00:00
sunjun ca20a35a26 sprint_sunjun_55259 2022-05-25 01:34:10 +00:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
mayue ba0ddd3ca3 * Fix bug #22069. 2022-04-28 06:58:12 +00:00
mayue aeda6fbe78 * Fix bug #22064#22065. 2022-04-28 06:43:05 +00: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