Commit Graph
2344 Commits
Author SHA1 Message Date
Yagami 830a63c705 * Add lang file. 2020-12-18 11:08:50 +08:00
leiyong 93f96c6652 * Adjust code. 2020-12-18 10:14:47 +08:00
Yagami 66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
leiyong 8e6d6bad63 * Adjust executionCommon to execution->common. 2020-12-18 10:03:32 +08:00
leiyong ea3300acf4 * Replace ->planCommon. 2020-12-17 17:20:12 +08:00
Yagami 915b7533cf * Fix bug. 2020-12-17 13:28:16 +08:00
leiyong ec3ffde99c * Use the defined sprintcommon. 2020-12-17 13:23:52 +08:00
Yagami 7c3a4053aa * Recode story concept. 2020-12-17 10:29:33 +08:00
Yagami ae552beafa * Merge sql. 2020-12-16 16:52:37 +08:00
Yagami 3c2d15a481 * Fix lang. 2020-12-16 16:44:53 +08:00
wangyidong d1b96633f1 * Change for compatible openssl and mcrypt.
* Fix error when no isset canBeChanged var.
2020-12-16 14:51:09 +08:00
leiyong cd5e4e1593 * Adjust code. 2020-12-16 09:04:13 +08:00
leiyong 200410c2bb * Delete PGMView method. 2020-12-14 23:31:13 +08:00
leiyong 7a4947d970 * Adjust code. 2020-12-14 14:47:51 +08:00
wangyidong c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
wangyidong 5dbd8270bb * fix bug #3744. 2020-12-11 17:22:40 +08:00
Yagami 9efabc5d05 * Adjust code. 2020-12-11 16:03:17 +08:00
wangyidong 5eda53df87 * code for bug #3693. 2020-12-11 09:30:43 +08:00
hufangzhou 54bea01825 * Fix bug#3751. 2020-12-11 08:46:41 +08:00
Yagami 3dcd7efbd2 * Fix search menu. 2020-12-10 15:34:26 +08:00
Yagami 81302ef084 * Finish task #8597. 2020-12-10 15:05:33 +08:00
Yagami 3ecbf0262b * Code for task #8597. 2020-12-10 15:05:33 +08:00
holan20180123 5182c4ed3b * Remove search type. 2020-12-10 14:37:36 +08:00
hufangzhou 936647a9d8 * Fix a bug. 2020-12-10 09:58:38 +08:00
Yagami 0924720a8f * Merge code. 2020-12-09 15:36:40 +08:00
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
wangyidong e8f207ffc1 * adjust code. 2020-12-01 10:43:52 +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
jajasper fabd02ef52 * Fix bug #1484 of integrate zdoo. 2020-11-27 17:01:47 +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