Commit Graph
2314 Commits
Author SHA1 Message Date
wangyidong 97392669ff * finish task #8600. 2020-12-09 14:29:23 +08:00
tianshujie98 7ffbc286fa * Finish task #8581. 2020-12-09 13:53:29 +08:00
holan20180123 8620b8471c Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-09 13:49:17 +08:00
holan20180123 95521e44a4 * Finish task #8613. 2020-12-09 13:48:51 +08:00
hufangzhou 48b25d6970 * Finish task#8571, task#8572, task#8582, task#8583, task#8594. 2020-12-09 13:44:04 +08:00
Yagami e1a40daddc * Fix product menu. 2020-12-07 15:07:57 +08:00
leiyong 7aaf8a9014 * Adjust code. 2020-12-07 15:05:19 +08:00
leiyong 6eec4a4a88 * Fix bug. 2020-12-07 08:16:23 +08:00
leiyong 7222a2af85 * Fix bug. 2020-12-03 17:55:42 +08:00
tianshujie98 4e295b2817 * Adjust language file. 2020-12-03 15:28:34 +08:00
leiyong 2df361a5c0 * Adjust language file. 2020-12-03 15:10:24 +08:00
leiyong 542f2a933c * Finish task#8551. 2020-12-01 10:25:49 +08:00
leiyong 8add6bc6f1 * Finish task#8557. 2020-12-01 10:00:17 +08:00
holan20180123 d3f6be0e1a * Finish task #8558. 2020-12-01 09:41:15 +08:00
Yagami abc70f2bbd * Fix code detail. 2020-11-30 17:21:55 +08:00
leiyong a80ae324cb * Finish task#8474. 2020-11-30 10:26:51 +08:00
leiyong 175443edaf * Adjust code. 2020-11-27 16:59:27 +08:00
leiyong d1ff4f8ceb * Modify common lang file. 2020-11-27 15:51:31 +08:00
leiyong 671c4ef57d * Fix product list links. 2020-11-27 14:49:42 +08:00
Yagami 1e7021328a * Finish task #8502. 2020-11-27 14:36:46 +08:00
leiyong 4b13262a15 * Fix bug. 2020-11-27 13:46:33 +08:00
Yagami 79b2e6c830 * Fix scrum menu divider. 2020-11-27 13:35:55 +08:00
holan20180123 111f08ca47 * Modify the login time permission judgment 2020-11-27 11:33:27 +08:00
holan20180123 3ed0fbc7c5 * Finish task #8497. 2020-11-27 11:17:58 +08:00
holan20180123 5f54932ddb Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-27 10:45:02 +08:00
holan20180123 2fdf26bc21 * Finisht task #8497. 2020-11-27 10:27:08 +08:00
leiyong 9ab336bf7d * Adjust the crumbs menu. 2020-11-27 10:07:47 +08:00
hufangzhou 7b866ec815 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-27 09:07:50 +08:00
hufangzhou be37148d14 * Finish task#8454. 2020-11-27 09:05:06 +08:00
Yagami 15ce0b086b * Fix details. 2020-11-26 15:43:46 +08:00
Yagami 584938724b * Merge code. 2020-11-26 14:18:21 +08:00
leiyong e10aed7e7d * The scrum project temporarily hides the trace matrix. 2020-11-26 14:12:15 +08:00
leiyong 4f2775d77a * Adjust the projectstory module. 2020-11-26 13:10:08 +08:00
jajasper 32db97424a * Fix bug #1484 of integrat zdoo by chrome. 2020-11-26 11:32:46 +08:00
tianshujie98 f0a812a946 * Finish task #8501. 2020-11-26 11:13:11 +08:00
holan20180123 eacf05c9cf Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-26 09:32:45 +08:00
holan20180123 4203dcc7ca * Finish task #8497. 2020-11-26 09:32:23 +08:00
qiyu-xie b14202f717 * Add lang. 2020-11-25 17:33:11 +08:00
qiyu-xie 010532a543 * Finish task#8500. 2020-11-25 17:08:13 +08:00
leiyong 61971243e9 * Add projectstory module. 2020-11-25 15:39:25 +08:00
holan20180123 31e3787b42 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 14:30:47 +08:00
holan20180123 0d07b3abae * Finish task #8498. 2020-11-25 14:21:08 +08:00
jajasper 78facc12be * Fix bug of integrated zdoo need set X-Frame to allow-from. 2020-11-25 14:05:50 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
leiyong 5a6f487faa Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 16:49:32 +08:00
leiyong ac5d658933 * Adjust getExecutionPairsByProduct method. 2020-11-24 15:58:26 +08:00
z 3c7da6dc60 * code for task #8496. 2020-11-24 15:38:21 +08:00
leiyong 8f11da1edd * Finish task#8461. 2020-11-24 13:15:27 +08:00
hufangzhou 6d25f07fa8 * Finish task#8467. 2020-11-24 09:08:13 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00