Commit Graph
77 Commits
Author SHA1 Message Date
李玉春 9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
2022-03-29 00:50:37 +00:00
sunjun 0ce312f107 *Fixbug #13852 2022-03-28 17:02:25 +08:00
sunjun 487c2a6694 *Fixbug #13852 2022-03-28 13:43:53 +08:00
tianshujie 7c46d9c61d * Fix bug #17291. 2022-03-25 12:51:59 +08:00
sunjun 43bfd5a4c1 *Fixbug 21115 2022-03-24 16:52:03 +08:00
tianshujie 64cac6374b * The plan is blank when switching branches. 2021-12-01 16:39:10 +08:00
tianshujie f4d1a727a7 * Finish task #45084,44994,44993. 2021-11-27 17:41:42 +08:00
tianshujie 7802bc6a47 * Fix bug #16541. 2021-11-22 16:01:31 +08:00
tianshujie 70f8e0d320 * Fix execution and project linked product prompt issues. 2021-11-19 08:44:53 +08:00
tianshujie 9e622a2995 * Merge conflicts. 2021-11-09 16:27:06 +08:00
tianshujie 5ab6fe77c2 * Modify code logic. 2021-11-09 14:21:17 +08:00
tianshujie eedcc1aed5 * Modify code logic. 2021-11-09 10:28:16 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
tianshujie 69743fa3a4 * Fix bug #15698. 2021-10-21 08:32:55 +08:00
zenggang d3ffc97d41 * Fix bug#14927 and Finish task#42423,42420,42419 2021-09-08 13:52:53 +08:00
zenggang e343a14e23 * Fix bug#14927 2021-09-07 21:50:03 +08:00
zenggang 8a1163e37d * Fix bug#13883 2021-09-03 14:40:24 +08:00
holan20180123 f00d94cf42 * Fix bug #12325. 2021-04-26 14:48:23 +08:00
qiyu-xie eaa1460654 * Modify the name of the tr. 2021-04-15 14:53:38 +08:00
qiyu-xie 416f9d23d5 * Fix bug#11181. 2021-03-30 11:12:13 +08:00
zhujinyong 426e118db1 * Ajdust project/program module. 2021-03-05 16:09:31 +08:00
Yagami 76cb3cee0b * Divide program/project/execution. 2021-03-03 17:45:28 +08:00
zhujinyong 76baa276fd * Adjust program and project module. 2021-03-03 14:52:12 +08:00
Yagami 460947ebce * Change toString to zui function. 2020-11-18 15:33:23 +08:00
leiyong 0909592ea1 * Adjust whitelist setting logic. 2020-10-28 09:14:38 +08:00
hufangzhou 8dbf4ff9f5 * Finish task#8156: Optimize the structure of the code. 2020-10-12 16:35:31 +08:00
hufangzhou d7a1941b7f * Fix bug #3491: Assign value to the manage products by the different request type. 2020-10-12 11:09:03 +08:00
Yagami b7326b28ef *Fix bug edit project loadPlan. 2018-07-11 13:30:02 +08:00
liugang b3aaab4f0c * Finish task #4598 2018-07-04 17:05:53 +08:00
Catouse 9995fdec6c * support show some data view with datatable. 2018-06-23 20:02:57 +08:00
Catouse 0fb591c691 * improve UI of project/create form. 2018-05-14 18:28:14 +08:00
Catouse d67a6ca6b1 * improve UI of task list views. 2018-05-08 19:25:05 +08:00
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
daitingting 5de96f44d6 * Adjust codes. 2018-04-19 17:52:47 +08:00
daitingting 209da90793 * Adjust style. 2018-04-19 16:44:34 +08:00
daitingting 290c5248e6 * Rewrite edit file of project. 2018-04-18 16:26:52 +08:00
daitingting 4fa2e55f41 * Rewrite create file of project. 2018-04-18 15:40:22 +08:00
Catouse f6e84c6dfb * fix bug #1432 and finish task #3689. 2018-03-19 15:21:27 +08:00
wangyidong ef781fae09 * finish task #3728. 2018-03-16 16:32:55 +08:00
wangyidong 809c8d5eb2 * finish task #3727. 2018-03-16 15:51:14 +08:00
滔哥 a5e2e4a6e6 * Fix bug. 2018-01-10 09:51:56 +08:00
滔哥 70f18180d2 * Task#3576 2018-01-10 08:33:18 +08:00
wangyidong 44bc56562f * finish task #3395. 2017-12-18 14:36:24 +08:00
Catouse 78b4295e65 * finish task #3342. 2017-11-10 17:04:44 +08:00
滔哥 0dc610f36b * fix score and child task bug 2017-11-03 00:27:58 +08:00
滔哥 08a528f85b "fix debug level 2" 2017-10-20 16:24:50 +08:00
滔哥 1f102d851d "Task list add btn" 2017-10-20 15:11:27 +08:00
wangyidong 4636f763a2 * finish task #3170. 2017-08-14 14:31:10 +08:00
wangyidong ef2cc89e5a * fix bug #1002. 2017-02-14 13:38:24 +08:00
chenfeiCF 7261dc6c54 * finish task #2864. 2017-01-09 13:07:11 +08:00